From f3195be73291effc55c3e35e623b82953cf1fc02 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 11 八月 2023 17:59:10 +0800
Subject: [PATCH] update 优化 整体代码结构
---
src/components/BuildCode/render.vue | 4
src/assets/styles/index.scss | 3
src/plugins/download.ts | 6 +-
src/views/system/dept/index.vue | 2
src/api/system/client/types.ts | 3 -
src/utils/request.ts | 6 +-
src/assets/styles/element-ui.scss | 6 -
src/api/system/user/index.ts | 4
src/views/system/user/index.vue | 1
src/layout/components/InnerLink/index.vue | 2
vite/plugins/unocss.ts | 2
.eslintrc.js | 2
src/utils/validate.ts | 2
src/router/index.ts | 1
.prettierrc.cjs | 82 +++++++++++++-------------
src/api/tool/gen/index.ts | 4
16 files changed, 62 insertions(+), 68 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index b6b10a6..a1b32e3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -30,7 +30,7 @@
extendDefaults: true,
types: {
'{}': false,
- 'Function': false
+ Function: false
}
}
]
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
index 2b49e6f..61d2d92 100644
--- a/.prettierrc.cjs
+++ b/.prettierrc.cjs
@@ -2,45 +2,45 @@
* 浠ｇ爜鏍煎紡鍖栭厤缃�
*/
module.exports = {
- // 涓�琛屾渶澶氬灏戜釜瀛楃
- printWidth: 150,
- // 鎸囧畾姣忎釜缂╄繘绾у埆鐨勭┖鏍兼暟
- tabWidth: 2,
- // 浣跨敤鍒惰〃绗﹁�屼笉鏄┖鏍肩缉杩涜
- useTabs: false,
- // 鍦ㄨ鍙ユ湯灏炬槸鍚﹂渶瑕佸垎鍙�
- semi: true,
- // 鏄惁浣跨敤鍗曞紩鍙�
- singleQuote: true,
- // 鏇存敼寮曠敤瀵硅薄灞炴�х殑鏃堕棿 鍙�夊��"<as-needed|consistent|preserve>"
- quoteProps: 'as-needed',
- // 鍦↗SX涓娇鐢ㄥ崟寮曞彿鑰屼笉鏄弻寮曞彿
- jsxSingleQuote: false,
- // 澶氳鏃跺敖鍙兘鎵撳嵃灏鹃殢閫楀彿銆傦紙渚嬪锛屽崟琛屾暟缁勬案杩滀笉浼氬嚭鐜伴�楀彿缁撳熬銆傦級 鍙�夊��"<none|es5|all>"锛岄粯璁one
- trailingComma: 'none',
- // 鍦ㄥ璞℃枃瀛椾腑鐨勬嫭鍙蜂箣闂存墦鍗扮┖鏍�
- bracketSpacing: true,
- // jsx 鏍囩鐨勫弽灏栨嫭鍙烽渶瑕佹崲琛�
- jsxBracketSameLine: false,
- embeddedLanguageFormatting: 'off',
- // 鍦ㄥ崟鐙殑绠ご鍑芥暟鍙傛暟鍛ㄥ洿鍖呮嫭鎷彿 always锛�(x) => x \ avoid锛歺 => x
- arrowParens: 'always',
- // 杩欎袱涓�夐」鍙敤浜庢牸寮忓寲浠ョ粰瀹氬瓧绗﹀亸绉婚噺锛堝垎鍒寘鎷拰涓嶅寘鎷級寮�濮嬪拰缁撴潫鐨勪唬鐮�
- rangeStart: 0,
- rangeEnd: Infinity,
- // 鎸囧畾瑕佷娇鐢ㄧ殑瑙ｆ瀽鍣紝涓嶉渶瑕佸啓鏂囦欢寮�澶寸殑 @prettier
- requirePragma: false,
- // 涓嶉渶瑕佽嚜鍔ㄥ湪鏂囦欢寮�澶存彃鍏� @prettier
- insertPragma: false,
- // 浣跨敤榛樿鐨勬姌琛屾爣鍑� always\never\preserve
- proseWrap: 'preserve',
- // 鎸囧畾HTML鏂囦欢鐨勫叏灞�绌烘牸鏁忔劅搴� css\strict\ignore
- htmlWhitespaceSensitivity: 'css',
- // Vue鏂囦欢鑴氭湰鍜屾牱寮忔爣绛剧缉杩�
- vueIndentScriptAndStyle: false,
- // 鍦� windows 鎿嶄綔绯荤粺涓崲琛岀閫氬父鏄洖杞� (CR) 鍔犳崲琛屽垎闅旂 (LF)锛屼篃灏辨槸鍥炶溅鎹㈣(CRLF)锛�
- // 鐒惰�屽湪 Linux 鍜� Unix 涓彧浣跨敤绠�鍗曠殑鎹㈣鍒嗛殧绗� (LF)銆�
- // 瀵瑰簲鐨勬帶鍒跺瓧绗︿负 "\n" (LF) 鍜� "\r\n"(CRLF)銆俛uto鎰忎负淇濇寔鐜版湁鐨勮灏�
- // 鎹㈣绗︿娇鐢� lf 缁撳熬鏄� 鍙�夊��"<auto|lf|crlf|cr>"
- endOfLine: 'auto'
+ // 涓�琛屾渶澶氬灏戜釜瀛楃
+ printWidth: 150,
+ // 鎸囧畾姣忎釜缂╄繘绾у埆鐨勭┖鏍兼暟
+ tabWidth: 2,
+ // 浣跨敤鍒惰〃绗﹁�屼笉鏄┖鏍肩缉杩涜
+ useTabs: false,
+ // 鍦ㄨ鍙ユ湯灏炬槸鍚﹂渶瑕佸垎鍙�
+ semi: true,
+ // 鏄惁浣跨敤鍗曞紩鍙�
+ singleQuote: true,
+ // 鏇存敼寮曠敤瀵硅薄灞炴�х殑鏃堕棿 鍙�夊��"<as-needed|consistent|preserve>"
+ quoteProps: 'as-needed',
+ // 鍦↗SX涓娇鐢ㄥ崟寮曞彿鑰屼笉鏄弻寮曞彿
+ jsxSingleQuote: false,
+ // 澶氳鏃跺敖鍙兘鎵撳嵃灏鹃殢閫楀彿銆傦紙渚嬪锛屽崟琛屾暟缁勬案杩滀笉浼氬嚭鐜伴�楀彿缁撳熬銆傦級 鍙�夊��"<none|es5|all>"锛岄粯璁one
+ trailingComma: 'none',
+ // 鍦ㄥ璞℃枃瀛椾腑鐨勬嫭鍙蜂箣闂存墦鍗扮┖鏍�
+ bracketSpacing: true,
+ // jsx 鏍囩鐨勫弽灏栨嫭鍙烽渶瑕佹崲琛�
+ jsxBracketSameLine: false,
+ embeddedLanguageFormatting: 'off',
+ // 鍦ㄥ崟鐙殑绠ご鍑芥暟鍙傛暟鍛ㄥ洿鍖呮嫭鎷彿 always锛�(x) => x \ avoid锛歺 => x
+ arrowParens: 'always',
+ // 杩欎袱涓�夐」鍙敤浜庢牸寮忓寲浠ョ粰瀹氬瓧绗﹀亸绉婚噺锛堝垎鍒寘鎷拰涓嶅寘鎷級寮�濮嬪拰缁撴潫鐨勪唬鐮�
+ rangeStart: 0,
+ rangeEnd: Infinity,
+ // 鎸囧畾瑕佷娇鐢ㄧ殑瑙ｆ瀽鍣紝涓嶉渶瑕佸啓鏂囦欢寮�澶寸殑 @prettier
+ requirePragma: false,
+ // 涓嶉渶瑕佽嚜鍔ㄥ湪鏂囦欢寮�澶存彃鍏� @prettier
+ insertPragma: false,
+ // 浣跨敤榛樿鐨勬姌琛屾爣鍑� always\never\preserve
+ proseWrap: 'preserve',
+ // 鎸囧畾HTML鏂囦欢鐨勫叏灞�绌烘牸鏁忔劅搴� css\strict\ignore
+ htmlWhitespaceSensitivity: 'css',
+ // Vue鏂囦欢鑴氭湰鍜屾牱寮忔爣绛剧缉杩�
+ vueIndentScriptAndStyle: false,
+ // 鍦� windows 鎿嶄綔绯荤粺涓崲琛岀閫氬父鏄洖杞� (CR) 鍔犳崲琛屽垎闅旂 (LF)锛屼篃灏辨槸鍥炶溅鎹㈣(CRLF)锛�
+ // 鐒惰�屽湪 Linux 鍜� Unix 涓彧浣跨敤绠�鍗曠殑鎹㈣鍒嗛殧绗� (LF)銆�
+ // 瀵瑰簲鐨勬帶鍒跺瓧绗︿负 "\n" (LF) 鍜� "\r\n"(CRLF)銆俛uto鎰忎负淇濇寔鐜版湁鐨勮灏�
+ // 鎹㈣绗︿娇鐢� lf 缁撳熬鏄� 鍙�夊��"<auto|lf|crlf|cr>"
+ endOfLine: 'auto'
};
diff --git a/src/api/system/client/types.ts b/src/api/system/client/types.ts
index e67f95f..d7cb926 100644
--- a/src/api/system/client/types.ts
+++ b/src/api/system/client/types.ts
@@ -43,7 +43,6 @@
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
status: string;
-
}
export interface ClientForm extends BaseEntity {
@@ -91,7 +90,6 @@
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
status?: string;
-
}
export interface ClientQuery extends PageQuery {
@@ -134,5 +132,4 @@
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
status?: string;
-
}
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index f00a0e3..d0a4b5a 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -175,8 +175,8 @@
*/
export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]> => {
return request({
- url: "/system/user/list/dept/" + deptId,
- method: "get"
+ url: '/system/user/list/dept/' + deptId,
+ method: 'get'
});
};
diff --git a/src/api/tool/gen/index.ts b/src/api/tool/gen/index.ts
index 1aaa7b2..b91df6a 100644
--- a/src/api/tool/gen/index.ts
+++ b/src/api/tool/gen/index.ts
@@ -37,7 +37,7 @@
};
// 瀵煎叆琛�
-export const importTable = (data: { tables: string, dataName: string }) => {
+export const importTable = (data: { tables: string; dataName: string }) => {
return request({
url: '/tool/gen/importTable',
method: 'post',
@@ -83,4 +83,4 @@
url: '/tool/gen/getDataNames',
method: 'get'
});
-};
\ No newline at end of file
+};
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index bf6cdf7..43c093c 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -78,8 +78,6 @@
overflow-x: hidden;
}
-
-
// refine element ui upload
.upload-container {
.el-upload {
@@ -109,10 +107,10 @@
box-sizing: content-box;
}
-.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow {
+.el-menu--collapse > div > .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
display: none;
}
.el-dropdown .el-dropdown-link {
color: var(--el-color-primary) !important;
-}
\ No newline at end of file
+}
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index e31ea97..48865fb 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -26,7 +26,8 @@
box-sizing: border-box;
}
-html.dark .svg-icon, html.dark svg {
+html.dark .svg-icon,
+html.dark svg {
fill: var(--el-text-color-regular);
}
diff --git a/src/components/BuildCode/render.vue b/src/components/BuildCode/render.vue
index 5693ed8..62f3d86 100644
--- a/src/components/BuildCode/render.vue
+++ b/src/components/BuildCode/render.vue
@@ -4,11 +4,11 @@
const props = defineProps({
formJson: {
type: [String, Object],
- default: {}
+ default: ""
},
formData: {
type: [String, Object],
- default: {}
+ default: ""
},
isView: {
type: Boolean,
diff --git a/src/layout/components/InnerLink/index.vue b/src/layout/components/InnerLink/index.vue
index 31050fd..fa2869c 100644
--- a/src/layout/components/InnerLink/index.vue
+++ b/src/layout/components/InnerLink/index.vue
@@ -15,4 +15,4 @@
}
});
const height = ref(document.documentElement.clientHeight - 94.5 + "px");
-</script>
\ No newline at end of file
+</script>
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 25f0e35..ef66b3a 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -3,7 +3,7 @@
import errorCode from '@/utils/errorCode';
import { blobValidate } from '@/utils/ruoyi';
import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
-import { globalHeaders } from "@/utils/request";
+import { globalHeaders } from '@/utils/request';
const baseURL = import.meta.env.VITE_APP_BASE_API;
let downloadLoadingInstance: LoadingInstance;
@@ -16,7 +16,7 @@
method: 'get',
url: url,
responseType: 'blob',
- headers: globalHeaders(),
+ headers: globalHeaders()
});
const isBlob = blobValidate(res.data);
if (isBlob) {
@@ -40,7 +40,7 @@
method: 'get',
url: url,
responseType: 'blob',
- headers: globalHeaders(),
+ headers: globalHeaders()
});
const isBlob = blobValidate(res.data);
if (isBlob) {
diff --git a/src/router/index.ts b/src/router/index.ts
index d6aefe9..6c56cd3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -181,5 +181,4 @@
}
});
-
export default router;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 4ade2f4..ed67713 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -16,10 +16,10 @@
export const isRelogin = { show: false };
export const globalHeaders = () => {
return {
- Authorization: "Bearer " + getToken(),
+ Authorization: 'Bearer ' + getToken(),
clientid: import.meta.env.VITE_APP_CLIENT_ID
- }
-}
+ };
+};
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index f2da87b..4d57894 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -68,7 +68,7 @@
*/
export const validEmail = (email: string) => {
const reg =
- /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+ /^(([^<>()\]\\.,;:\s@"]+(\.[^<>()\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return reg.test(email);
};
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 75f2843..ab7ecbb 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -116,7 +116,7 @@
<el-form-item label="閮ㄩ棬鐘舵��">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
- }}</el-radio>
+ }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9d2fcdd..9a6d82c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -299,7 +299,6 @@
<script setup name="User" lang="ts">
import api from "@/api/system/user"
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
-import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import { DeptVO } from "@/api/system/dept/types";
import { RoleVO } from "@/api/system/role/types";
diff --git a/vite/plugins/unocss.ts b/vite/plugins/unocss.ts
index 8d4e012..76585c7 100644
--- a/vite/plugins/unocss.ts
+++ b/vite/plugins/unocss.ts
@@ -9,6 +9,6 @@
'panel-title':
'pb-[5px] font-sans leading-[1.1] font-medium text-base text-[#6379bb] border-b border-b-solid border-[var(--el-border-color-light)] mb-5 mt-0'
},
- hmrTopLevelAwait: false, // unocss榛樿鏄痶rue锛屼綆鐗堟湰娴忚鍣ㄦ槸涓嶆敮鎸佺殑锛屽惎鍔ㄥ悗浼氭姤閿�
+ hmrTopLevelAwait: false // unocss榛樿鏄痶rue锛屼綆鐗堟湰娴忚鍣ㄦ槸涓嶆敮鎸佺殑锛屽惎鍔ㄥ悗浼氭姤閿�
});
};
--
Gitblit v1.9.3