From 26ec154e34f642b87753a3773e5fba508db253d3 Mon Sep 17 00:00:00 2001 From: K <1175047471@qq.com> Date: Tue, 27 Feb 2024 17:14:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 - .env.development | 4 +- .env.production | 2 +- .vscode/settings.json | 7 +- eslint.config.js | 1 + src/App.vue | 16 +- src/api/base/login.ts | 6 - src/api/base/model/userModel.ts | 7 - src/api/base/user.ts | 36 -- src/api/base/user/index.ts | 29 ++ src/api/base/user/types.ts | 32 ++ src/api/system/dept/index.ts | 62 ++-- src/api/system/dept/types.ts | 17 + src/api/system/menu/index.ts | 67 ++-- src/api/system/menu/types.ts | 26 ++ src/api/system/role/index.ts | 92 +++--- src/api/system/role/types.ts | 29 ++ src/api/system/tenant/index.ts | 75 ++--- src/api/system/tenant/types.ts | 16 + src/api/system/user/index.ts | 102 ++---- src/api/system/user/types.ts | 23 ++ src/components/Form/src/BasicForm.vue | 8 - .../Form/src/components/ApiTreeSelect.vue | 23 +- .../Form/src/hooks/useFormEvents.ts | 22 +- .../Form/src/hooks/useFormValues.ts | 5 +- src/components/Form/src/types/index.ts | 2 +- src/components/Table/src/BasicTable.vue | 2 +- .../Table/src/components/TableAction.vue | 3 +- src/components/Table/src/hooks/useColumns.ts | 1 - src/components/Table/src/types/table.ts | 2 +- src/components/Tree/src/types/tree.ts | 2 +- src/enums/appEnum.ts | 15 - src/enums/httpEnum.ts | 2 +- src/enums/systemEnum.ts | 9 - src/hooks/component/useFormItem.ts | 6 +- src/hooks/setting/index.ts | 4 - src/hooks/setting/useRootSetting.ts | 3 - src/hooks/web/usePermission.ts | 50 +-- .../header/components/lock/LockModal.vue | 2 +- .../header/components/user-dropdown/index.vue | 6 +- src/router/guard/paramMenuGuard.ts | 23 +- src/router/guard/permissionGuard.ts | 8 +- src/router/helper/routeHelper.ts | 28 +- src/router/menus/index.ts | 70 +--- src/router/routes/index.ts | 10 - src/router/routes/modules/dashboard.ts | 2 +- src/router/types.ts | 2 +- src/settings/componentSetting.ts | 6 +- src/settings/projectSetting.ts | 6 - src/store/modules/lock.ts | 3 +- src/store/modules/permission.ts | 122 +------ src/store/modules/user.ts | 52 +-- src/types/axios.d.ts | 2 +- src/types/config.d.ts | 11 - src/types/global.d.ts | 7 +- src/types/index.d.ts | 8 +- src/utils/auth/index.ts | 2 +- src/utils/env.ts | 4 - src/utils/http/axios/index.ts | 18 +- src/utils/index.ts | 13 + src/views/base/lock/LockPage.vue | 2 +- src/views/base/login/Login.vue | 4 - src/views/base/login/LoginForm.vue | 107 +----- src/views/base/login/LoginFormTitle.vue | 2 - src/views/base/login/MobileForm.vue | 155 --------- src/views/base/login/QrCodeForm.vue | 37 --- src/views/base/login/SSOForm.vue | 199 ----------- src/views/base/login/SessionTimeoutLogin.vue | 16 +- src/views/base/login/sso.vue | 200 ------------ src/views/base/login/useLogin.ts | 14 - .../workbench/components/WorkbenchHeader.vue | 2 +- src/views/system/dept/DeptFormModal.vue | 59 ++++ src/views/system/dept/DeptModal.vue | 61 ---- src/views/system/dept/data.ts | 85 +++++ src/views/system/dept/dept.data.ts | 146 --------- src/views/system/dept/index.vue | 124 +++---- src/views/system/menu/MenuFormModal.vue | 55 ++++ src/views/system/menu/MenuModal.vue | 58 ---- .../system/menu/{menu.data.ts => data.tsx} | 119 +++---- src/views/system/menu/index.vue | 106 +++--- src/views/system/role/RoleFormModal.vue | 56 ++++ src/views/system/role/RoleMenuModal.vue | 136 ++------ src/views/system/role/RoleModal.vue | 58 ---- src/views/system/role/RoleScopeModal.vue | 73 ----- src/views/system/role/data.ts | 116 +++++++ src/views/system/role/index.vue | 140 ++++---- src/views/system/role/role.data.ts | 184 ----------- src/views/system/tenant/TenantFormModal.vue | 52 +++ src/views/system/tenant/TenantModal.vue | 58 ---- src/views/system/tenant/data.ts | 106 ++++++ src/views/system/tenant/index.vue | 92 +++--- src/views/system/tenant/tenant.data.ts | 191 ----------- .../tenantPackage/TenantPackageModal.vue | 11 +- src/views/system/user/DeptTree.vue | 64 ++-- .../{ResetPwdModal.vue => UserFormModal.vue} | 36 +- src/views/system/user/UserModal.vue | 58 ---- src/views/system/user/UserRoleModal.vue | 52 --- src/views/system/user/data.ts | 309 ++++++++++++++++++ src/views/system/user/index.vue | 124 ++----- src/views/system/user/user.data.ts | 283 ---------------- 100 files changed, 1713 insertions(+), 3256 deletions(-) delete mode 100644 src/api/base/user.ts create mode 100644 src/api/base/user/index.ts create mode 100644 src/api/base/user/types.ts create mode 100644 src/api/system/dept/types.ts create mode 100644 src/api/system/menu/types.ts create mode 100644 src/api/system/role/types.ts create mode 100644 src/api/system/tenant/types.ts create mode 100644 src/api/system/user/types.ts delete mode 100644 src/views/base/login/MobileForm.vue delete mode 100644 src/views/base/login/QrCodeForm.vue delete mode 100644 src/views/base/login/SSOForm.vue delete mode 100644 src/views/base/login/sso.vue create mode 100644 src/views/system/dept/DeptFormModal.vue delete mode 100644 src/views/system/dept/DeptModal.vue create mode 100644 src/views/system/dept/data.ts delete mode 100644 src/views/system/dept/dept.data.ts create mode 100644 src/views/system/menu/MenuFormModal.vue delete mode 100644 src/views/system/menu/MenuModal.vue rename src/views/system/menu/{menu.data.ts => data.tsx} (60%) create mode 100644 src/views/system/role/RoleFormModal.vue delete mode 100644 src/views/system/role/RoleModal.vue delete mode 100644 src/views/system/role/RoleScopeModal.vue create mode 100644 src/views/system/role/data.ts delete mode 100644 src/views/system/role/role.data.ts create mode 100644 src/views/system/tenant/TenantFormModal.vue delete mode 100644 src/views/system/tenant/TenantModal.vue create mode 100644 src/views/system/tenant/data.ts delete mode 100644 src/views/system/tenant/tenant.data.ts rename src/views/system/user/{ResetPwdModal.vue => UserFormModal.vue} (50%) delete mode 100644 src/views/system/user/UserModal.vue delete mode 100644 src/views/system/user/UserRoleModal.vue create mode 100644 src/views/system/user/data.ts delete mode 100644 src/views/system/user/user.data.ts diff --git a/.env b/.env index ca0ef89..625f0f1 100644 --- a/.env +++ b/.env @@ -6,9 +6,3 @@ VITE_GLOB_APP_TITLE = Fast Iot Web # 简称,用于配置文件名字 不要出现空格、数字开头等特殊字符 VITE_GLOB_APP_SHORT_NAME = FAST_IOT_Admin - -# 租户开关 -VITE_GLOB_APP_TENANT_ENABLE = true - -# 验证码的开关 -VITE_GLOB_APP_CAPTCHA_ENABLE = true diff --git a/.env.development b/.env.development index f879ec0..0011e52 100644 --- a/.env.development +++ b/.env.development @@ -7,13 +7,13 @@ VITE_PUBLIC_PATH = / # 本地开发代理,可以解决跨域及多地址代理 # 如果接口地址匹配到,则会转发到http://localhost:3000,防止本地出现跨域问题 # 可以有多个,注意多个不能换行,否则代理将会失效 -VITE_PROXY = [["/dev-api","192.168.1.100:48081/admin-api"],["/upload","192.168.1.100:48081/admin-api/infra/file/upload"]] +VITE_PROXY = [] # 是否删除Console.log VITE_DROP_CONSOLE = false # 接口地址,如果没有跨域问题,直接在这里配置即可 -VITE_GLOB_API_URL = /dev-api +VITE_GLOB_API_URL = http://192.168.1.100:48081/admin-api # 文件上传接口 可选 VITE_GLOB_UPLOAD_URL = /upload diff --git a/.env.production b/.env.production index 19c3b92..4e1815f 100644 --- a/.env.production +++ b/.env.production @@ -13,7 +13,7 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false # 接口地址 可以由nginx做转发或者直接写实际地址 -VITE_GLOB_API_URL = http://localhost:48080/admin-api +VITE_GLOB_API_URL = /admin-api # 文件上传地址 可以由nginx做转发或者直接写实际地址 VITE_GLOB_UPLOAD_URL = /upload diff --git a/.vscode/settings.json b/.vscode/settings.json index 200997c..bd2cb38 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -74,5 +74,10 @@ "vuedraggable", "vueuse" ], - "terminal.integrated.scrollback": 10000 + "terminal.integrated.scrollback": 10000, + "i18n-ally.localesPaths": [ + "src/locales", + "src/locales/lang", + "public/resource/tinymce/langs" + ] } diff --git a/eslint.config.js b/eslint.config.js index 0e003f5..840142a 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -9,6 +9,7 @@ export default antfu( 'vue/custom-event-name-casing': 'off', 'vue/component-name-in-template-casing': 'off', 'vue/require-toggle-inside-transition': 'off', + 'ts/no-use-before-define': 'off', }, }, unocss.configs.flat, diff --git a/src/App.vue b/src/App.vue index 9bc36ca..e8dc619 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,10 +1,9 @@