diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index 7b7b93f..d1d8ff8 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -96,6 +96,6 @@ export function syncTenantPackage(tenantId: string | number, packageId: string | export function syncTenantDict() { return request({ url: '/system/tenant/syncTenantDict', - method: 'get', + method: 'get' }); } diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 220e4ac..5dd573d 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -1,4 +1,3 @@ - .el-collapse { .collapse__title { font-weight: 600; diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 92fc34d..36a8df6 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -20,7 +20,7 @@ --bpmn-panel-bar-background-color: #f5f7fa; // ele - --brder-color: #e8e8e8 + --brder-color: #e8e8e8; } html.dark { --menuBg: #1d1e1f; @@ -42,25 +42,25 @@ html.dark { --el-color-primary-light-9: #262727; } // vxe-table 主题 - --vxe-font-color: #98989E; - --vxe-primary-color: #2C7ECF; - --vxe-icon-background-color: #98989E; - --vxe-table-font-color: #98989E; + --vxe-font-color: #98989e; + --vxe-primary-color: #2c7ecf; + --vxe-icon-background-color: #98989e; + --vxe-table-font-color: #98989e; --vxe-table-resizable-color: #95969a; - --vxe-table-header-background-color: #28282A; + --vxe-table-header-background-color: #28282a; --vxe-table-body-background-color: #151518; --vxe-table-background-color: #4a5663; --vxe-table-border-width: 1px; - --vxe-table-border-color: #37373A; - --vxe-toolbar-background-color: #37373A; + --vxe-table-border-color: #37373a; + --vxe-toolbar-background-color: #37373a; // 工作流 - --bpmn-panel-border: #37373A; - --bpmn-panel-box-shadow: #37373A; - --bpmn-panel-bar-background-color: #37373A; + --bpmn-panel-border: #37373a; + --bpmn-panel-box-shadow: #37373a; + --bpmn-panel-bar-background-color: #37373a; // ele - --brder-color: #37373A + --brder-color: #37373a; } // base color diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 184f41c..a8b2f68 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -28,16 +28,16 @@ const getBreadcrumb = () => { const pathList = route.path.match(reg).map((item, index) => { if (index !== 0) item = item.slice(1); return item; - }) + }); getMatched(pathList, permissionStore.defaultRoutes, matched); } else { - matched = route.matched.filter(item => item.meta && item.meta.title); + matched = route.matched.filter((item) => item.meta && item.meta.title); } // 判断是否为首页 if (!isDashboard(matched[0])) { matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched); } - levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false); + levelList.value = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false); }; const findPathNum = (str, char = '/') => { let index = str.indexOf(char); @@ -49,7 +49,7 @@ const findPathNum = (str, char = '/') => { return num; }; const getMatched = (pathList, routeList, matched) => { - let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]); + let data = routeList.find((item) => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]); if (data) { matched.push(data); if (data.children && pathList.length) { diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue index d19fb5f..e366ea0 100644 --- a/src/components/Process/multiInstanceUser.vue +++ b/src/components/Process/multiInstanceUser.vue @@ -41,7 +41,7 @@ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bfe339e..6ac2f14 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -98,7 +98,7 @@ import { getTenantList } from '@/api/login'; import { dynamicClear, dynamicTenant } from '@/api/system/tenant'; import { TenantVO } from '@/api/types'; import notice from './notice/index.vue'; -import router from "@/router"; +import router from '@/router'; const appStore = useAppStore(); const userStore = useUserStore(); @@ -170,7 +170,7 @@ const logout = async () => { query: { redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/') } - }) + }); }); }; diff --git a/src/layout/index.vue b/src/layout/index.vue index ce47a30..207a470 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -27,7 +27,7 @@ import { AppMain, Navbar, Settings, TagsView } from './components'; import useAppStore from '@/store/modules/app'; import useSettingsStore from '@/store/modules/settings'; import { initWebSocket } from '@/utils/websocket'; -import { initSSE } from "@/utils/sse"; +import { initSSE } from '@/utils/sse'; const settingsStore = useSettingsStore(); const theme = computed(() => settingsStore.theme); diff --git a/src/plugins/tab.ts b/src/plugins/tab.ts index 86421a8..4b44dc6 100644 --- a/src/plugins/tab.ts +++ b/src/plugins/tab.ts @@ -1,5 +1,5 @@ import router from '@/router'; -import {RouteLocationMatched, RouteLocationNormalized, RouteLocationRaw} from 'vue-router'; +import { RouteLocationMatched, RouteLocationNormalized, RouteLocationRaw } from 'vue-router'; import useTagsViewStore from '@/store/modules/tagsView'; export default { diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts index 9756ac2..b6cf434 100644 --- a/src/store/modules/tagsView.ts +++ b/src/store/modules/tagsView.ts @@ -31,7 +31,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { const delIframeView = (view: RouteLocationNormalized): Promise => { return new Promise((resolve) => { iframeViews.value = iframeViews.value.filter((item: RouteLocationNormalized) => item.path !== view.path); - resolve([...iframeViews.value as RouteLocationNormalized[]]); + resolve([...(iframeViews.value as RouteLocationNormalized[])]); }); }; const addVisitedView = (view: RouteLocationNormalized): void => { @@ -54,7 +54,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { delCachedView(view); } resolve({ - visitedViews: [...visitedViews.value as RouteLocationNormalized[]], + visitedViews: [...(visitedViews.value as RouteLocationNormalized[])], cachedViews: [...cachedViews.value] }); }); @@ -68,7 +68,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { break; } } - resolve([...visitedViews.value as RouteLocationNormalized[]]); + resolve([...(visitedViews.value as RouteLocationNormalized[])]); }); }; const delCachedView = (view?: RouteLocationNormalized): Promise => { @@ -92,7 +92,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { delOthersVisitedViews(view); delOthersCachedViews(view); resolve({ - visitedViews: [...visitedViews.value as RouteLocationNormalized[]], + visitedViews: [...(visitedViews.value as RouteLocationNormalized[])], cachedViews: [...cachedViews.value] }); }); @@ -103,7 +103,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { visitedViews.value = visitedViews.value.filter((v: RouteLocationNormalized) => { return v.meta?.affix || v.path === view.path; }); - resolve([...visitedViews.value as RouteLocationNormalized[]]); + resolve([...(visitedViews.value as RouteLocationNormalized[])]); }); }; const delOthersCachedViews = (view: RouteLocationNormalized): Promise => { @@ -124,7 +124,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { delAllVisitedViews(); delAllCachedViews(); resolve({ - visitedViews: [...visitedViews.value as RouteLocationNormalized[]], + visitedViews: [...(visitedViews.value as RouteLocationNormalized[])], cachedViews: [...cachedViews.value] }); }); @@ -132,7 +132,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { const delAllVisitedViews = (): Promise => { return new Promise((resolve) => { visitedViews.value = visitedViews.value.filter((tag: RouteLocationNormalized) => tag.meta?.affix); - resolve([...visitedViews.value as RouteLocationNormalized[]]); + resolve([...(visitedViews.value as RouteLocationNormalized[])]); }); }; @@ -167,7 +167,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { } return false; }); - resolve([...visitedViews.value as RouteLocationNormalized[]]); + resolve([...(visitedViews.value as RouteLocationNormalized[])]); }); }; const delLeftTags = (view: RouteLocationNormalized): Promise => { @@ -186,7 +186,7 @@ export const useTagsViewStore = defineStore('tagsView', () => { } return false; }); - resolve([...visitedViews.value as RouteLocationNormalized[]]); + resolve([...(visitedViews.value as RouteLocationNormalized[])]); }); }; diff --git a/src/utils/request.ts b/src/utils/request.ts index f8f1f53..9682b81 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -10,7 +10,7 @@ import FileSaver from 'file-saver'; import { getLanguage } from '@/lang'; import { encryptBase64, encryptWithAes, generateAesKey, decryptWithAes, decryptBase64 } from '@/utils/crypto'; import { encrypt, decrypt } from '@/utils/jsencrypt'; -import router from "@/router"; +import router from '@/router'; const encryptHeader = 'encrypt-key'; let downloadLoadingInstance: LoadingInstance; diff --git a/src/utils/sse.ts b/src/utils/sse.ts index 5234648..69447ad 100644 --- a/src/utils/sse.ts +++ b/src/utils/sse.ts @@ -9,10 +9,7 @@ export const initSSE = (url: any) => { } url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID; - const { - data, - error - } = useEventSource(url, [], { + const { data, error } = useEventSource(url, [], { autoReconnect: { retries: 10, delay: 3000, diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue index 523deff..da1bc16 100644 --- a/src/views/demo/demo/index.vue +++ b/src/views/demo/demo/index.vue @@ -45,7 +45,7 @@ 导出 - + diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue index 921ddd9..566d071 100644 --- a/src/views/demo/tree/index.vue +++ b/src/views/demo/tree/index.vue @@ -25,7 +25,7 @@ 展开/折叠 - + 导出 - + diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index fcecab7..5bf8430 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -57,7 +57,7 @@ 导出 - + diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue index c05dcdc..37e8609 100644 --- a/src/views/system/client/index.vue +++ b/src/views/system/client/index.vue @@ -41,7 +41,7 @@ 导出 - + diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index dcd41ea..64a0d4c 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -56,7 +56,7 @@ 刷新缓存 - + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 199a997..15dfaa2 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -33,7 +33,7 @@ 展开/折叠 - + diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 33c7fc8..0faf1fa 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -40,7 +40,7 @@ 关闭 - + diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 9eead48..adb0b27 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -49,7 +49,7 @@ 刷新缓存 - + @@ -240,7 +240,6 @@ const handleRefreshCache = async () => { useDictStore().cleanDict(); }; - onMounted(() => { getList(); }); diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index cf5f0fc..05630f4 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -30,7 +30,7 @@ 展开/折叠 - + diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 7d4bbe0..d99b42c 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -40,7 +40,7 @@ 删除 - + diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue index 41766f6..07bfd36 100644 --- a/src/views/system/oss/config.vue +++ b/src/views/system/oss/config.vue @@ -41,7 +41,7 @@ 删除 - + diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue index d057c23..37b2e91 100644 --- a/src/views/system/oss/index.vue +++ b/src/views/system/oss/index.vue @@ -62,7 +62,7 @@ 配置管理 - + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 49b735b..95ad1ec 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -81,7 +81,7 @@ 导出 - + diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue index 6394804..0af7b6d 100644 --- a/src/views/system/role/authUser.vue +++ b/src/views/system/role/authUser.vue @@ -30,7 +30,7 @@ 关闭 - + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index f67a527..b86a8ec 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -51,7 +51,7 @@ 导出 - + diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index e2cec99..c6f011e 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -47,7 +47,7 @@ 同步租户字典 - + @@ -144,7 +144,16 @@