代码优化

mkppo · mkppo · commit 9fa1c73485c1 · 2021-12-08T11:38:50.000+08:00
diff --git a/.prettierrc b/.prettierrc
@@ -2,7 +2,6 @@
 	"tabWidth": 4,
 	"useTabs": true,
 	"semi": true,
-	"jsxBracketSameLine": true,
 	"singleQuote": false,
 	"printWidth": 100,
 	"trailingComma": "none"
diff --git a/build/plugins/cool.ts b/build/plugins/cool.ts
@@ -53,21 +53,25 @@ const handler = {
 			return d;
 		});
 
-		const d = {
+		const d: any = {
 			table: {
 				label,
 				dict: list
 			},
 			form: {
 				label,
-				value: list[0]?.value,
 				component: {
 					name: "",
 					options: list
 				}
 			}
 		};
 
+		// 默认值
+		if (list[0]) {
+			d.form.value = list[0].value;
+		}
+
 		// 匹配组件
 		d.form.component.name = arr.length > 4 ? "el-select" : "el-radio-group";
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "front-next",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"scripts": {
 		"dev": "vite --host",
 		"build": "vite build",
@@ -13,20 +13,15 @@
 		"array.prototype.flat": "^1.2.4",
 		"axios": "^0.21.1",
 		"clipboard": "^2.0.8",
-		"clone-deep": "^4.0.1",
 		"codemirror": "^5.62.0",
 		"core-js": "^3.6.5",
 		"echarts": "^5.0.2",
 		"element-plus": "^1.1.0-beta.20",
 		"file-saver": "^2.0.5",
-		"glob": "^7.1.6",
 		"js-beautify": "^1.13.5",
-		"merge": "^2.1.1",
-		"merge-deep": "^3.0.3",
 		"mitt": "^2.1.0",
 		"mockjs": "^1.1.0",
 		"nprogress": "^0.2.0",
-		"qrcode": "^1.4.4",
 		"quill": "^1.3.7",
 		"socket.io-client": "^4.1.2",
 		"store": "^2.0.12",
diff --git a/src/assets/css/element.scss b/src/assets/css/element.scss
@@ -23,10 +23,9 @@ $--colors: (
 );
 
 @forward "element-plus/theme-chalk/src/common/var.scss" with (
-    $colors: $--colors,
+	$colors: $--colors
 );
 
-
 :export {
 	colorPrimary: $color-primary;
 	colorSuccess: $color-success;
diff --git a/src/cool/core/service/index.ts b/src/cool/core/service/index.ts
@@ -129,8 +129,6 @@ function useEps() {
 				});
 			}
 
-			console.log(service);
-
 			return res;
 		})
 		.catch((err: string) => {
diff --git a/src/cool/modules/base/components/dept/move.tsx b/src/cool/modules/base/components/dept/move.tsx
@@ -97,7 +97,8 @@ export default defineComponent({
 										border: "1px solid #eee",
 										borderRadius: "3px",
 										padding: "2px"
-									}}>
+									}}
+								>
 									<el-tree
 										data={ctx.list}
 										props={{
@@ -107,7 +108,8 @@ export default defineComponent({
 										highlight-current
 										onNodeClick={(e: any) => {
 											scope["dept"] = e;
-										}}></el-tree>
+										}}
+									></el-tree>
 								</div>
 							);
 						}
diff --git a/src/cool/modules/base/components/dept/tree.vue b/src/cool/modules/base/components/dept/tree.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, onMounted, ref } from "vue";
+import { defineComponent, onMounted, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { ContextMenu } from "@cool-vue/crud";
 import { useCool } from "/@/cool";
@@ -84,7 +84,7 @@ export default defineComponent({
 	emits: ["list-change", "row-click", "user-add"],
 
 	setup(props, { emit }) {
-		const { refs, setRefs } = useCool();
+		const { refs, setRefs, service } = useCool();
 
 		// 树形列表
 		const list = ref<any[]>([]);
@@ -95,9 +95,6 @@ export default defineComponent({
 		// 是否能拖动
 		const isDrag = ref<boolean>(false);
 
-		// 请求服务
-		const service = inject<any>("service");
-
 		// 允许托的规则
 		function allowDrag({ data }: any) {
 			return data.parentId;
diff --git a/src/cool/modules/base/components/menu/quick.vue b/src/cool/modules/base/components/menu/quick.vue
@@ -6,10 +6,9 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { useModule } from "/@/cool";
 import { last, isEmpty } from "/@/cool/utils";
 import { ElMessage } from "element-plus";
-import { useCool } from "/@/cool/core";
+import { useCool } from "/@/cool";
 
 export default defineComponent({
 	name: "cl-menu-quick",
diff --git a/src/cool/modules/base/components/menu/slider/index.tsx b/src/cool/modules/base/components/menu/slider/index.tsx
@@ -110,7 +110,8 @@ export default defineComponent({
 						background-color="transparent"
 						collapse-transition={false}
 						collapse={ctx.browser.isMini ? false : ctx.menuCollapse}
-						onSelect={ctx.toView}>
+						onSelect={ctx.toView}
+					>
 						{children}
 					</el-menu>
 				</div>
diff --git a/src/cool/modules/base/components/menu/tree.vue b/src/cool/modules/base/components/menu/tree.vue
@@ -38,7 +38,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, inject, onMounted, ref, watch } from "vue";
+import { computed, defineComponent, onMounted, ref, watch } from "vue";
+import { useCool } from "/@/cool";
 import { deepTree } from "/@/cool/utils";
 
 export default defineComponent({
@@ -52,7 +53,7 @@ export default defineComponent({
 
 	setup(props, { emit }) {
 		// 请求服务
-		const service = inject<any>("service");
+		const { service } = useCool();
 
 		// 关键字
 		const keyword = ref<string>("");
diff --git a/src/cool/modules/base/components/role/perms.vue b/src/cool/modules/base/components/role/perms.vue
@@ -24,9 +24,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, onMounted, ref, watch } from "vue";
+import { defineComponent, onMounted, ref, watch } from "vue";
 import { ElMessage } from "element-plus";
 import { deepTree } from "/@/cool/utils";
+import { useCool } from "/@/cool";
 
 export default defineComponent({
 	name: "cl-role-perms",
@@ -42,7 +43,7 @@ export default defineComponent({
 	emits: ["update:modelValue"],
 
 	setup(props, { emit }) {
-		const service = inject<any>("service");
+		const { service } = useCool();
 
 		// 树形列表
 		const list = ref<any[]>([]);
diff --git a/src/cool/modules/base/components/role/select.vue b/src/cool/modules/base/components/role/select.vue
@@ -5,7 +5,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, onMounted, ref, watch } from "vue";
+import { defineComponent, onMounted, ref, watch } from "vue";
+import { useCool } from "/@/cool";
 import { isArray } from "/@/cool/utils";
 
 export default defineComponent({
@@ -20,7 +21,7 @@ export default defineComponent({
 
 	setup(props, { emit }) {
 		// 请求服务
-		const service = inject<any>("service");
+		const { service } = useCool();
 
 		// 数据列表
 		const list = ref<any[]>([]);
diff --git a/src/cool/modules/base/components/switch/index.vue b/src/cool/modules/base/components/switch/index.vue
@@ -27,7 +27,7 @@
 <script lang="ts">
 import { ElMessage } from "element-plus";
 import { defineComponent, inject, ref, watch } from "vue";
-import { useCool } from "/@/cool/core";
+import { useCool } from "/@/cool";
 
 export default defineComponent({
 	name: "cl-switch",
diff --git a/src/cool/modules/base/pages/login/components/captcha.vue b/src/cool/modules/base/pages/login/components/captcha.vue
@@ -6,16 +6,17 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, ref } from "vue";
+import { defineComponent, ref } from "vue";
 import { ElMessage } from "element-plus";
+import { useCool } from "/@/cool";
 
 export default defineComponent({
 	emits: ["update:modelValue", "change"],
 
 	setup(_, { emit }) {
+		const { service } = useCool();
 		const base64 = ref("");
 		const svg = ref("");
-		const service = inject<any>("service");
 
 		const refresh = () => {
 			service.base.open
diff --git a/src/cool/modules/base/pages/login/index.vue b/src/cool/modules/base/pages/login/index.vue
@@ -57,8 +57,7 @@
 import { defineComponent, reactive, ref } from "vue";
 import { ElMessage } from "element-plus";
 import Captcha from "./components/captcha.vue";
-import { useCool } from "/@/cool";
-import { useEps } from "/@/cool/core";
+import { useEps, useCool } from "/@/cool";
 
 export default defineComponent({
 	cool: {
diff --git a/src/cool/modules/base/views/param.vue b/src/cool/modules/base/views/param.vue
@@ -101,7 +101,9 @@ export default defineComponent({
 
 		// 新增编辑配置
 		const upsert = reactive<Upsert>({
-			width: "1000px",
+			dialog: {
+				width: "1000px"
+			},
 
 			items: [
 				{
diff --git a/src/cool/modules/base/views/role.vue b/src/cool/modules/base/views/role.vue
@@ -23,13 +23,14 @@
 
 <script lang="ts">
 import { CrudLoad, Table, Upsert } from "@cool-vue/crud/types";
-import { defineComponent, inject, reactive } from "vue";
+import { defineComponent, reactive } from "vue";
+import { useCool } from "/@/cool";
 
 export default defineComponent({
 	name: "sys-role",
 
 	setup() {
-		const service = inject<any>("service");
+		const { service } = useCool();
 
 		// 表单值
 		const form = reactive<any>({
@@ -38,7 +39,9 @@ export default defineComponent({
 
 		// 新增、编辑配置
 		const upsert = reactive<Upsert>({
-			width: "800px",
+			dialog: {
+				width: "800px"
+			},
 
 			items: [
 				{
diff --git a/src/cool/modules/base/views/user.vue b/src/cool/modules/base/views/user.vue
@@ -88,7 +88,7 @@
 
 						<cl-upsert
 							:ref="setRefs('upsert')"
-							:items="upsert.items"
+							v-bind="upsert"
 							:on-submit="onUpsertSubmit"
 						/>
 					</cl-crud>
@@ -210,6 +210,10 @@ export default defineComponent({
 
 		// 新增、编辑配置
 		const upsert = reactive<Upsert>({
+			dialog: {
+				width: "800px"
+			},
+
 			items: [
 				{
 					prop: "headImg",
diff --git a/src/cool/modules/task/components/cron/index.tsx b/src/cool/modules/task/components/cron/index.tsx
@@ -63,7 +63,8 @@ export default defineComponent({
 			<el-popover
 				visible={ctx.visible}
 				disabled={ctx.disabled || ctx.readonly}
-				width="600px"></el-popover>
+				width="600px"
+			></el-popover>
 		);
 
 		return (
@@ -89,7 +90,8 @@ export default defineComponent({
 									readonly={ctx.readonly}
 									v-model={ctx.cron}
 									placeholder={ctx.placeholder}
-									onClick={ctx.open}></el-input>
+									onClick={ctx.open}
+								></el-input>
 							);
 						}
 					}
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
@@ -26,11 +26,6 @@ declare module "vuedraggable/src/vuedraggable" {
 	export default d;
 }
 
-declare module "clone-deep" {
-	function CloneDeep(data: any): any;
-	export default CloneDeep;
-}
-
 declare module "store" {
 	export function set(key: string, value: any): void;
 	export function get(key: string): any;
diff --git a/vite.config.ts b/vite.config.ts
@@ -17,7 +17,8 @@ export default (): UserConfig => {
 	// 请求代理地址
 	const proxy = {
 		"/dev": {
-			target: "http://127.0.0.1:8001",
+			// target: "http://127.0.0.1:8001",
+			target: "http://rjjgeibqc2.localtunnel-cool.cool-js.cloud",
 			changeOrigin: true,
 			rewrite: (path: string) => path.replace(/^\/dev/, "")
 		},
@@ -54,7 +55,7 @@ export default (): UserConfig => {
 			}
 		},
 		server: {
-			port: 9000,
+			port: 9100,
 			proxy,
 			hmr: {
 				overlay: true
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,6 @@ function useEps() {`
`129`	`129`	`});`
`130`	`130`	`}`
`131`	`131`
`132`		`- console.log(service);`
`133`		`-`
`134`	`132`	`return res;`
`135`	`133`	`})`
`136`	`134`	`.catch((err: string) => {`