chore(projects): release v0.10.3 thin branch

.env

@@ -13,8 +13,8 @@ VITE_AUTH_ROUTE_MODE=static
 VITE_ROUTE_HOME_PATH=/multi-menu/first/second
 
 # iconify图标作为组件的前缀
-VITE_ICON_PREFIX=icon
+VITE_ICON_PREFFIX=icon
 
-# 本地SVG图标作为组件的前缀, 请注意一定要包含 VITE_ICON_PREFIX
+# 本地SVG图标作为组件的前缀, 请注意一定要包含 VITE_ICON_PREFFIX
-# 格式 {VITE_ICON_PREFIX}-{本地图标集合名称}
+# 格式 {VITE_ICON_PREFFIX}-{本地图标集合名称}
-VITE_ICON_LOCAL_PREFIX=icon-local
+VITE_ICON_LOCAL_PREFFIX=icon-local

.eslintignore

@@ -1,3 +1,4 @@
 !.env-config.ts
+components.d.ts
 router-page.d.ts
-
+*.svg

.eslintrc.js

@@ -10,8 +10,7 @@ module.exports = {
     {
       files: ['*.vue'],
       rules: {
-        'no-undef': 'off', // use tsc to check the ts code of the vue
+        'no-undef': 'off' // use tsc to check the ts code of the vue
-        'vue/no-setup-props-destructure': 'off' // wait to fix this rule
       }
     }
   ],

.gitignore

@@ -34,4 +34,3 @@ stats.html
 /src/typings/components.d.ts
 package-lock.json
 yarn.lock
-pnpm-lock.yaml

.vscode/extensions.json

@@ -1,19 +1,27 @@
 {
   "recommendations": [
+    "afzalsayed96.icones",
+    "antfu.iconify",
     "antfu.unocss",
+    "christian-kohler.path-intellisense",
     "dbaeumer.vscode-eslint",
+    "eamodio.gitlens",
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
-    "formulahendry.auto-complete-tag",
     "formulahendry.auto-close-tag",
+    "formulahendry.auto-complete-tag",
     "formulahendry.auto-rename-tag",
     "kisstkondoros.vscode-gutter-preview",
     "lokalise.i18n-ally",
     "mariusalchimavicius.json-to-ts",
     "mhutchie.git-graph",
+    "mikestead.dotenv",
+    "naumovs.color-highlight",
+    "pkief.material-icon-theme",
     "sdras.vue-vscode-snippets",
-    "streetsidesoftware.code-spell-checker",
     "vue.volar",
-    "vue.vscode-typescript-vue-plugin"
+    "vue.vscode-typescript-vue-plugin",
+    "whtouche.vscode-js-console-utils",
+    "zhuangtongfa.material-theme"
   ]
 }

.vscode/settings.json

@@ -1,76 +1,75 @@
 {
-  "cSpell.ignorePaths": [
-    "package.json",
-    "package-lock.json",
-    "yarn.lock",
-    "pnpm-lock.yaml",
-    "node_modules",
-    "vscode-extension",
-    ".git/objects",
-    ".vscode",
-    ".vscode-insiders",
-    "CHANGELOG.md",
-    "dist",
-    "public",
-    "styles"
-  ],
-  "cSpell.words": [
-    "AMAP",
-    "antdesign",
-    "antv",
-    "apacheecharts",
-    "areaspline",
-    "bmapgl",
-    "colord",
-    "echarts",
-    "gitee",
-    "gridicons",
-    "iconify",
-    "jsapi",
-    "naiveui",
-    "Popconfirm",
-    "Posva",
-    "Shenzhen",
-    "Sider",
-    "tauri",
-    "unocss",
-    "unplugin",
-    "vditor",
-    "VERCEL",
-    "Vite",
-    "vitejs",
-    "vuedraggable",
-    "vueuse",
-    "wangeditor",
-    "wechat",
-    "xgplayer",
-    "yanbowe",
-    "ភាសាខ្មែរ"
-  ],
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
   "editor.fontLigatures": true,
   "editor.formatOnSave": false,
+  "editor.guides.bracketPairs": "active",
   "editor.quickSuggestions": {
     "strings": true
   },
   "editor.tabSize": 2,
-  "eslint.validate": ["json"],
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue", "json"],
   "files.associations": {
-    "*.env.*": "dotenv",
+    "*.env.*": "dotenv"
-    "*.svg": "html"
   },
   "files.eol": "\n",
-  "i18n-ally.displayLanguage": "zh-CN",
+  "git.enableSmartCommit": true,
-  "i18n-ally.enabledParsers": ["ts"],
+  "gutterpreview.paths": {
-  "i18n-ally.enabledFrameworks": ["vue"],
+    "@": "/src",
-  "i18n-ally.editor.preferEditor": true,
+    "~@": "/src"
-  "i18n-ally.keystyle": "nested",
+  },
-  "i18n-ally.localesPaths": ["src/locales/lang"],
+  "material-icon-theme.activeIconPack": "angular",
-  "material-icon-theme.activeIconPack": "vue",
+  "material-icon-theme.files.associations": {},
-  "[html][css][less][scss][sass][markdown][yaml][yml][jsonc]": {
+  "material-icon-theme.folders.associations": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "src-tauri": "src",
-    "editor.formatOnSave": true
+    "enum": "typescript",
-  }
+    "enums": "typescript",
+    "store": "context",
+    "stores": "context",
+    "composable": "hook",
+    "composables": "hook",
+    "directive": "tools",
+    "directives": "tools",
+    "business": "core",
+    "request": "api",
+    "adapter": "middleware"
+  },
+  "path-intellisense.mappings": {
+    "@": "${workspaceFolder}/src",
+    "~@": "${workspaceFolder}/src"
+  },
+  "terminal.integrated.fontSize": 14,
+  "terminal.integrated.fontWeight": 500,
+  "terminal.integrated.tabs.enabled": true,
+  "workbench.iconTheme": "material-icon-theme",
+  "workbench.colorTheme": "One Dark Pro",
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": "yzhang.markdown-all-in-one"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[vue]": {
+    "editor.defaultFormatter": "Vue.volar"
+  },
+  "i18n-ally.localesPaths": ["src/locales", "src/locales/lang"]
 }

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-	<img src="./public/favicon.svg" style="width: 160px;"/>
+	<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/soybean.svg" style="width: 160px;"/>
 	<h1>Soybean Admin</h1>
 </div>
 
@@ -34,17 +34,17 @@
 
 ## 在线预览
 
-- [Soybean Admin 预览地址](https://admin.soybeanjs.cn/)
+- [Soybean Admin 预览地址](https://soybean.pro/)
 
 ## 文档
 
-- [项目文档预览地址](https://admin-docs.soybeanjs.cn/)
+- [项目文档预览地址](https://docs.soybean.pro)
 
 ## 代码仓库
 
-| 仓库           | GitHub 地址                                                                   | gitee 镜像                                                                   | 预览                                                      |
+| 仓库           | github 地址                                                                   | gitee 镜像                                                                   | 预览                                                      |
 | -------------- | ----------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | --------------------------------------------------------- |
-| soybean-admin  | [GitHub](https://github.com/honghuangdc/soybean-admin)                        | [gitee](https://gitee.com/honghuangdc/soybean-admin)                         | [预览](https://admin.soybeanjs.cn/)                       |
+| soybean-admin  | [github](https://github.com/honghuangdc/soybean-admin)                        | [gitee](https://gitee.com/honghuangdc/soybean-admin)                         | [预览](https://soybean.pro/)                              |
 | tauri 版       | [tauri 版](https://github.com/honghuangdc/soybean-admin/tree/tauri)           | [tauri 版](https://gitee.com/honghuangdc/soybean-admin/tree/tauri)           |                                                           |
 | 精简版         | [精简版](https://github.com/honghuangdc/soybean-admin/tree/thin)              | [精简版](https://gitee.com/honghuangdc/soybean-admin/tree/thin)              |                                                           |
 | 集成 fast-crud | [集成 fast-crud](https://github.com/honghuangdc/soybean-admin/tree/fast-crud) | [集成 fast-crud](https://gitee.com/honghuangdc/soybean-admin/tree/fast-crud) | [预览](http://fast-crud.docmirror.cn/soybean/#/crud/demo) |
@@ -123,8 +123,7 @@ pnpm build
 - Docker 部署 Soybean
 
 ```bash
-docker build -t soybean-admin-image -f docker/Dockerfile .
+docker run --name soybean -p 80:80 -d soybeanjs/soybean-admin:v0.9.6
-docker run -d -p 80:80 soybean-admin-image
 ```
 
 - 访问 SoybeanAdmin
@@ -139,7 +138,7 @@ docker run -d -p 80:80 soybean-admin-image
 
 项目已经内置 Angular 提交规范，直接执行 commit 命令即可生成符合 Angular 提交规范的 commit。
 
-项目已用 simple-git-hooks 代替了 husky, 旧版本用了 husky，执行 pnpm soy init-simple-git-hooks 进行初始化配置
+项目已用 simple-git-hooks 代替了 husky, 旧版本用了 husky，执行 pnpm soy init-git-hooks 进行初始化配置
 
 ## 浏览器支持
 

build/plugins/unplugin.ts

@@ -7,13 +7,13 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
 import { getSrcPath } from '../utils';
 
 export default function unplugin(viteEnv: ImportMetaEnv) {
-  const { VITE_ICON_PREFIX, VITE_ICON_LOCAL_PREFIX } = viteEnv;
+  const { VITE_ICON_PREFFIX, VITE_ICON_LOCAL_PREFFIX } = viteEnv;
 
   const srcPath = getSrcPath();
   const localIconPath = `${srcPath}/assets/svg-icon`;
 
   /** 本地svg图标集合名称 */
-  const collectionName = VITE_ICON_LOCAL_PREFIX.replace(`${VITE_ICON_PREFIX}-`, '');
+  const collectionName = VITE_ICON_LOCAL_PREFFIX.replace(`${VITE_ICON_PREFFIX}-`, '');
 
   return [
     Icons({
@@ -31,12 +31,12 @@ export default function unplugin(viteEnv: ImportMetaEnv) {
       types: [{ from: 'vue-router', names: ['RouterLink', 'RouterView'] }],
       resolvers: [
         NaiveUiResolver(),
-        IconsResolver({ customCollections: [collectionName], componentPrefix: VITE_ICON_PREFIX })
+        IconsResolver({ customCollections: [collectionName], componentPrefix: VITE_ICON_PREFFIX })
       ]
     }),
     createSvgIconsPlugin({
       iconDirs: [localIconPath],
-      symbolId: `${VITE_ICON_LOCAL_PREFIX}-[dir]-[name]`,
+      symbolId: `${VITE_ICON_LOCAL_PREFFIX}-[dir]-[name]`,
       inject: 'body-last',
       customDomId: '__SVG_ICON_LOCAL__'
     })

index.html

@@ -1,12 +1,7 @@
-<!-- prettier-ignore -->
 <!DOCTYPE html>
 <html lang="zh-cmn-Hans">
 	<head>
 		<meta charset="UTF-8" />
-		<meta http-equiv="Expires" content="0" />
-		<meta http-equiv="Pragma" content="no-cache" />
-		<meta http-equiv="Cache-control" content="no-cache" />
-		<meta http-equiv="Cache" content="no-cache" />
 		<link rel="icon" href="/favicon.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>%VITE_APP_NAME%</title>

mock/model/route.ts

@@ -16,7 +16,7 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
               component: 'self',
               meta: {
                 title: '二级菜单',
-                i18nTitle: 'routes.multi-menu.first.second',
+                i18nTitle: 'message.routes.multi-menu.first.second',
                 requiresAuth: true,
                 icon: 'mdi:menu'
               }
@@ -32,7 +32,7 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
                   component: 'self',
                   meta: {
                     title: '三级菜单',
-                    i18nTitle: 'routes.multi-menu.first.second-new.third',
+                    i18nTitle: 'message.routes.multi-menu.first.second-new.third',
                     requiresAuth: true,
                     icon: 'mdi:menu'
                   }
@@ -40,21 +40,21 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
               ],
               meta: {
                 title: '二级菜单(有子菜单)',
-                i18nTitle: 'routes.multi-menu.first.second-new._value',
+                i18nTitle: 'message.routes.multi-menu.first.second-new._value',
                 icon: 'mdi:menu'
               }
             }
           ],
           meta: {
             title: '一级菜单',
-            i18nTitle: 'routes.multi-menu.first._value',
+            i18nTitle: 'message.routes.multi-menu.first._value',
             icon: 'mdi:menu'
           }
         }
       ],
       meta: {
         title: '多级菜单',
-        i18nTitle: 'routes.multi-menu._value',
+        i18nTitle: 'message.routes.multi-menu._value',
         icon: 'carbon:menu',
         order: 1
       }
@@ -77,7 +77,7 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
               component: 'self',
               meta: {
                 title: '二级菜单',
-                i18nTitle: 'routes.multi-menu.first.second',
+                i18nTitle: 'message.routes.multi-menu.first.second',
                 requiresAuth: true,
                 icon: 'mdi:menu'
               }
@@ -93,7 +93,7 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
                   component: 'self',
                   meta: {
                     title: '三级菜单',
-                    i18nTitle: 'routes.multi-menu.first.second-new.third',
+                    i18nTitle: 'message.routes.multi-menu.first.second-new.third',
                     requiresAuth: true,
                     icon: 'mdi:menu'
                   }
@@ -101,21 +101,21 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
               ],
               meta: {
                 title: '二级菜单(有子菜单)',
-                i18nTitle: 'routes.multi-menu.first.second-new._value',
+                i18nTitle: 'message.routes.multi-menu.first.second-new._value',
                 icon: 'mdi:menu'
               }
             }
           ],
           meta: {
             title: '一级菜单',
-            i18nTitle: 'routes.multi-menu.first._value',
+            i18nTitle: 'message.routes.multi-menu.first._value',
             icon: 'mdi:menu'
           }
         }
       ],
       meta: {
         title: '多级菜单',
-        i18nTitle: 'routes.multi-menu._value',
+        i18nTitle: 'message.routes.multi-menu._value',
         icon: 'carbon:menu',
         order: 1
       }
@@ -138,7 +138,7 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
               component: 'self',
               meta: {
                 title: '二级菜单',
-                i18nTitle: 'routes.multi-menu.first.second',
+                i18nTitle: 'message.routes.multi-menu.first.second',
                 requiresAuth: true,
                 icon: 'mdi:menu'
               }
@@ -154,7 +154,7 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
                   component: 'self',
                   meta: {
                     title: '三级菜单',
-                    i18nTitle: 'routes.multi-menu.first.second-new.third',
+                    i18nTitle: 'message.routes.multi-menu.first.second-new.third',
                     requiresAuth: true,
                     icon: 'mdi:menu'
                   }
@@ -162,21 +162,21 @@ export const routeModel: Record<Auth.RoleType, AuthRoute.Route[]> = {
               ],
               meta: {
                 title: '二级菜单(有子菜单)',
-                i18nTitle: 'routes.multi-menu.first.second-new._value',
+                i18nTitle: 'message.routes.multi-menu.first.second-new._value',
                 icon: 'mdi:menu'
               }
             }
           ],
           meta: {
             title: '一级菜单',
-            i18nTitle: 'routes.multi-menu.first._value',
+            i18nTitle: 'message.routes.multi-menu.first._value',
             icon: 'mdi:menu'
           }
         }
       ],
       meta: {
         title: '多级菜单',
-        i18nTitle: 'routes.multi-menu._value',
+        i18nTitle: 'message.routes.multi-menu._value',
         icon: 'carbon:menu',
         order: 1
       }

package.json

@@ -1,11 +1,11 @@
 {
   "name": "soybean-admin",
-  "version": "0.10.4",
+  "version": "0.10.3",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
-    "email": "soybeanjs@outlook.com",
+    "email": "honghuangdc@gmail.com",
-    "url": "https://github.com/soybeanjs"
+    "url": "https://github.com/honghuangdc"
   },
   "license": "MIT",
   "homepage": "https://github.com/honghuangdc/soybean-admin",
@@ -55,51 +55,50 @@
   "dependencies": {
     "@better-scroll/core": "2.5.1",
     "@soybeanjs/vue-materials": "0.2.0",
-    "@vueuse/core": "10.4.1",
+    "@vueuse/core": "10.1.2",
-    "axios": "1.5.0",
+    "axios": "1.4.0",
     "clipboard": "2.0.11",
     "colord": "2.9.3",
     "crypto-js": "4.1.1",
-    "dayjs": "1.11.10",
+    "dayjs": "1.11.8",
     "form-data": "4.0.0",
     "lodash-es": "4.17.21",
     "naive-ui": "2.34.4",
-    "pinia": "2.1.6",
+    "pinia": "2.1.4",
     "qs": "6.11.2",
-    "ua-parser-js": "1.0.36",
+    "ua-parser-js": "1.0.35",
     "vue": "3.3.4",
-    "vue-i18n": "9.4.1",
+    "vue-i18n": "9.2.2",
-    "vue-router": "4.2.4",
+    "vue-router": "4.2.2"
-    "xgplayer": "3.0.9"
   },
   "devDependencies": {
-    "@iconify/json": "2.2.118",
+    "@iconify/json": "2.2.78",
     "@iconify/vue": "4.1.1",
-    "@soybeanjs/cli": "0.7.1",
+    "@soybeanjs/cli": "0.6.2",
-    "@soybeanjs/vite-plugin-vue-page-route": "0.0.10",
+    "@soybeanjs/vite-plugin-vue-page-route": "0.0.5",
-    "@types/crypto-js": "4.1.2",
+    "@types/crypto-js": "4.1.1",
-    "@types/node": "20.6.3",
+    "@types/node": "20.3.1",
-    "@types/qs": "6.9.8",
+    "@types/qs": "6.9.7",
-    "@types/ua-parser-js": "0.7.37",
+    "@types/ua-parser-js": "0.7.36",
-    "@unocss/preset-uno": "0.56.0",
+    "@unocss/preset-uno": "0.53.1",
-    "@unocss/transformer-directives": "0.56.0",
+    "@unocss/transformer-directives": "0.53.1",
-    "@unocss/vite": "0.56.0",
+    "@unocss/vite": "0.53.1",
-    "@vitejs/plugin-vue": "4.3.4",
+    "@vitejs/plugin-vue": "4.2.3",
-    "@vitejs/plugin-vue-jsx": "3.0.2",
+    "@vitejs/plugin-vue-jsx": "3.0.1",
     "cross-env": "7.0.3",
-    "eslint": "8.49.0",
+    "eslint": "8.42.0",
-    "eslint-config-soybeanjs": "0.5.6",
+    "eslint-config-soybeanjs": "0.4.9",
     "mockjs": "1.1.0",
-    "sass": "1.67.0",
+    "sass": "1.63.4",
-    "tsx": "3.12.10",
+    "tsx": "3.12.7",
-    "typescript": "5.2.2",
+    "typescript": "5.1.3",
-    "unplugin-icons": "0.17.0",
+    "unplugin-icons": "0.16.3",
-    "unplugin-vue-components": "0.25.2",
+    "unplugin-vue-components": "0.25.1",
-    "vite": "4.4.9",
+    "vite": "4.3.9",
     "vite-plugin-mock": "2.9.8",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "1.0.0-rc.4",
+    "vite-plugin-vue-devtools": "0.2.0",
-    "vue-tsc": "1.8.13"
+    "vue-tsc": "1.6.5"
   },
   "pnpm": {
     "patchedDependencies": {

public/favicon.svg

@@ -1 +1 @@
-<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="#646cff"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="#646cff"/></svg>
+<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="#1890ff"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="#1890ff"/></svg>

src/components/common/app-loading.vue

@@ -4,23 +4,25 @@
     <div class="w-56px h-56px my-36px">
       <div class="relative h-full animate-spin">
         <div
-          v-for="(item, index) in loadingClasses"
+          v-for="(item, index) in lodingClasses"
           :key="index"
           class="absolute w-16px h-16px bg-primary rounded-8px animate-pulse"
           :class="item"
         ></div>
       </div>
     </div>
-    <h2 class="text-28px font-500 text-#646464">{{ $t('system.title') }}</h2>
+    <h2 class="text-28px font-500 text-#646464">{{ title }}</h2>
   </div>
 </template>
 
 <script setup lang="ts">
-import { sessionStg, getRgbOfColor } from '@/utils';
+import { useAppInfo } from '@/composables';
-import { $t } from '@/locales';
+import { localStg, getRgbOfColor } from '@/utils';
 import themeSettings from '@/settings/theme.json';
 
-const loadingClasses = [
+const { title } = useAppInfo();
+
+const lodingClasses = [
   'left-0 top-0',
   'left-0 bottom-0 animate-delay-500',
   'right-0 top-0 animate-delay-1000',
@@ -29,7 +31,7 @@ const loadingClasses = [
 
 function addThemeColorCssVars() {
   const defaultColor = themeSettings.themeColor;
-  const themeColor = sessionStg.get('themeColor') || defaultColor;
+  const themeColor = localStg.get('themeColor') || defaultColor;
 
   const { r, g, b } = getRgbOfColor(themeColor);
 

src/components/common/dark-mode-switch.vue

@@ -13,8 +13,6 @@ defineOptions({ name: 'DarkModeSwitch' });
 interface Props {
   /** 暗黑模式 */
   dark?: boolean;
-  /** 自定义暗黑模式动画过渡 */
-  customizeTransition?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -36,25 +34,21 @@ const darkMode = computed({
   }
 });
 
-async function handleSwitch(event: MouseEvent) {
+function handleSwitch(event: MouseEvent) {
   const x = event.clientX;
   const y = event.clientY;
-
+  const endRadius = Math.hypot(Math.max(x, innerWidth - x), Math.max(y, innerHeight - y));
-  if (!props.customizeTransition || !document.startViewTransition) {
+  // @ts-expect-error: Transition API
+  if (!document.startViewTransition) {
     darkMode.value = !darkMode.value;
     return;
   }
-
+  // @ts-expect-error: Transition API
-  const endRadius = Math.hypot(Math.max(x, innerWidth - x), Math.max(y, innerHeight - y));
-
   const transition = document.startViewTransition(() => {
     darkMode.value = !darkMode.value;
   });
-
+  transition.ready.then(() => {
-  await transition.ready;
-
     const clipPath = [`circle(0px at ${x}px ${y}px)`, `circle(${endRadius}px at ${x}px ${y}px)`];
-
     document.documentElement.animate(
       {
         clipPath: darkMode.value ? clipPath : [...clipPath].reverse()
@@ -65,6 +59,7 @@ async function handleSwitch(event: MouseEvent) {
         pseudoElement: darkMode.value ? '::view-transition-new(root)' : '::view-transition-old(root)'
       }
     );
+  });
 }
 </script>
 

src/components/custom/count-to.vue

@@ -1,116 +0,0 @@
-<template>
-  <span>{{ value }}</span>
-</template>
-<script lang="ts" setup>
-import { computed, onMounted, ref, watch, watchEffect } from 'vue';
-import { TransitionPresets, useTransition } from '@vueuse/core';
-import { isNumber } from '@/utils';
-
-defineOptions({ name: 'CountTo' });
-
-type TransitionKey = keyof typeof TransitionPresets;
-
-interface Props {
-  /** 初始值 */
-  startValue?: number;
-  /** 结束值 */
-  endValue?: number;
-  /** 动画时长 */
-  duration?: number;
-  /** 自动动画 */
-  autoplay?: boolean;
-  /** 进制 */
-  decimals?: number;
-  /** 前缀 */
-  prefix?: string;
-  /** 后缀 */
-  suffix?: string;
-  /** 分割符号 */
-  separator?: string;
-  /** 小数点 */
-  decimal?: string;
-  /** 使用缓冲动画函数 */
-  useEasing?: boolean;
-  /** 缓冲动画函数类型 */
-  transition?: TransitionKey;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  startValue: 0,
-  endValue: 2021,
-  duration: 1500,
-  autoplay: true,
-  decimals: 0,
-  prefix: '',
-  suffix: '',
-  separator: ',',
-  decimal: '.',
-  useEasing: true,
-  transition: 'linear'
-});
-
-interface Emits {
-  (e: 'on-started'): void;
-  (e: 'on-finished'): void;
-}
-
-const emit = defineEmits<Emits>();
-
-const source = ref(props.startValue);
-let outputValue = useTransition(source);
-const value = computed(() => formatNumber(outputValue.value));
-const disabled = ref(false);
-
-function run() {
-  outputValue = useTransition(source, {
-    disabled,
-    duration: props.duration,
-    onStarted: () => emit('on-started'),
-    onFinished: () => emit('on-finished'),
-    ...(props.useEasing ? { transition: TransitionPresets[props.transition] } : {})
-  });
-}
-
-function start() {
-  run();
-  source.value = props.endValue;
-}
-
-function formatNumber(num: number | string) {
-  if (num !== 0 && !num) {
-    return '';
-  }
-  const { decimals, decimal, separator, suffix, prefix } = props;
-  let number = Number(num).toFixed(decimals);
-  number = String(number);
-
-  const x = number.split('.');
-  let x1 = x[0];
-  const x2 = x.length > 1 ? decimal + x[1] : '';
-  const rgx = /(\d+)(\d{3})/;
-  if (separator && !isNumber(separator)) {
-    while (rgx.test(x1)) {
-      x1 = x1.replace(rgx, `$1${separator}$2`);
-    }
-  }
-  return prefix + x1 + x2 + suffix;
-}
-
-watch([() => props.startValue, () => props.endValue], () => {
-  if (props.autoplay) {
-    start();
-  }
-});
-
-watchEffect(() => {
-  source.value = props.startValue;
-});
-
-onMounted(() => {
-  if (props.autoplay) {
-    start();
-  }
-});
-</script>
-
-<style scoped></style>

src/components/custom/svg-icon.vue

@@ -37,13 +37,13 @@ const bindAttrs = computed<{ class: string; style: string }>(() => ({
 }));
 
 const symbolId = computed(() => {
-  const { VITE_ICON_LOCAL_PREFIX: prefix } = import.meta.env;
+  const { VITE_ICON_LOCAL_PREFFIX: preffix } = import.meta.env;
 
   const defaultLocalIcon = 'no-icon';
 
   const icon = props.localIcon || defaultLocalIcon;
 
-  return `#${prefix}-${icon}`;
+  return `#${preffix}-${icon}`;
 });
 
 /** 渲染本地icon */

src/composables/system.ts

@@ -2,6 +2,26 @@ import UAParser from 'ua-parser-js';
 import { useAuthStore } from '@/store';
 import { isArray, isString } from '@/utils';
 
+interface AppInfo {
+  /** 项目名称 */
+  name: string;
+  /** 项目标题 */
+  title: string;
+  /** 项目描述 */
+  desc: string;
+}
+
+/** 项目信息 */
+export function useAppInfo(): AppInfo {
+  const { VITE_APP_NAME: name, VITE_APP_TITLE: title, VITE_APP_DESC: desc } = import.meta.env;
+
+  return {
+    name,
+    title,
+    desc
+  };
+}
+
 /** 获取设备信息 */
 export function useDeviceInfo() {
   const parser = new UAParser();

src/config/map-sdk.ts

@@ -1,8 +0,0 @@
-/** 百度地图sdk地址 */
-export const BAIDU_MAP_SDK_URL = `https://api.map.baidu.com/getscript?v=3.0&ak=KSezYymXPth1DIGILRX3oYN9PxbOQQmU&services=&t=20210201100830&s=1`;
-
-/** 高德地图sdk地址 */
-export const AMAP_SDK_URL = 'https://webapi.amap.com/maps?v=2.0&key=e7bd02bd504062087e6563daf4d6721d';
-
-/** 腾讯地图sdk地址 */
-export const TENCENT_MAP_SDK_URL = 'https://map.qq.com/api/gljs?v=1.exp&key=A6DBZ-KXPLW-JKSRY-ONZF4-CPHY3-K6BL7';

src/constants/business.ts

@@ -1,17 +1,16 @@
-import { $t } from '@/locales';
 import { transformObjectToOption } from './_shared';
 
 export const loginModuleLabels: Record<UnionKey.LoginModule, string> = {
-  'pwd-login': $t('page.login.pwdLogin.title'),
+  'pwd-login': '账密登录',
-  'code-login': $t('page.login.codeLogin.title'),
+  'code-login': '手机验证码登录',
-  register: $t('page.login.register.title'),
+  register: '注册',
-  'reset-pwd': $t('page.login.resetPwd.title'),
+  'reset-pwd': '重置密码',
-  'bind-wechat': $t('page.login.bindWeChat.title')
+  'bind-wechat': '微信绑定'
 };
 
 export const userRoleLabels: Record<Auth.RoleType, string> = {
-  super: $t('page.login.pwdLogin.superAdmin'),
+  super: '超级管理员',
-  admin: $t('page.login.pwdLogin.admin'),
+  admin: '管理员',
-  user: $t('page.login.pwdLogin.user')
+  user: '普通用户'
 };
 export const userRoleOptions = transformObjectToOption(userRoleLabels);

src/hooks/business/use-hook-table.ts

@@ -1,180 +0,0 @@
-import { ref, reactive } from 'vue';
-import type { Ref } from 'vue';
-import type { PaginationProps, DataTableBaseColumn, DataTableSelectionColumn, DataTableExpandColumn } from 'naive-ui';
-import type { TableColumnGroup } from 'naive-ui/es/data-table/src/interface';
-import { useLoadingEmpty } from '../common';
-
-/**
- * 接口请求函数
- */
-type ApiFn<T = any, R = any> = (args: T) => Promise<Service.RequestResult<R>>;
-
-/**
- * 接口请求函数的参数
- */
-type GetApiFnParameters<T extends ApiFn, R = any> = T extends (args: infer P) => Promise<Service.RequestResult<R>>
-  ? P
-  : never;
-
-/**
- * 接口请求函数的返回值
- */
-type GetApiFnReturnType<T extends ApiFn, P = any> = T extends (args: P) => Promise<Service.RequestResult<infer R>>
-  ? R
-  : never;
-
-/**
- * 表格接口请求后转换后的数据
- */
-type Transformer<TableData, Response> = (response: Response) => {
-  data: TableData[];
-  pageNum: number;
-  pageSize: number;
-  total: number;
-};
-
-/**
- * 列表接口参数更新
- */
-type ApiParamsUpdater<P, R> = (params: P) => R;
-
-/**
- * 分页参数
- */
-type PagePropsOfPagination = Pick<PaginationProps, 'page' | 'pageSize'>;
-
-/**
- * 自定义的列 key
- */
-type CustomColumnKey<K = never> = K | 'action';
-
-/**
- * 表格的列
- */
-type HookTableColumn<T = Record<string, unknown>> =
-  | (Omit<TableColumnGroup<T>, 'key'> & { key: CustomColumnKey<keyof T> })
-  | (Omit<DataTableBaseColumn<T>, 'key'> & { key: CustomColumnKey<keyof T> })
-  | DataTableSelectionColumn<T>
-  | DataTableExpandColumn<T>;
-
-/**
- * 表格配置
- */
-type HookTableConfig<TableData, Fn extends ApiFn> = {
-  /**
-   * 列表接口参数
-   */
-  apiParams: GetApiFnParameters<Fn>;
-  /**
-   * 列表接口返回数据转换
-   */
-  transformer: Transformer<TableData, GetApiFnReturnType<Fn>>;
-  /**
-   * 列表列
-   */
-  columns: () => HookTableColumn<TableData>[];
-  /**
-   * 列表接口参数更新
-   * @description 用于更新分页参数, 如果列表接口的参数不包含同名分页参数属性 `page` 和 `pageSize`, 需要通过此函数更新
-   * @default p => p
-   */
-  apiParamsUpdater?: ApiParamsUpdater<GetApiFnParameters<Fn> & Partial<PagePropsOfPagination>, GetApiFnParameters<Fn>>;
-  /**
-   * 列表分页参数
-   */
-  pagination?: PaginationProps;
-  /**
-   * 是否立即请求
-   * @default true
-   */
-  immediate?: boolean;
-};
-
-/**
- * 通用表格 hook
- * @param apiFn 接口请求函数
- * @param config 表格配置
- */
-export default function useHookTable<TableData, Fn extends ApiFn>(apiFn: Fn, config: HookTableConfig<TableData, Fn>) {
-  const { loading, startLoading, endLoading, empty, setEmpty } = useLoadingEmpty();
-
-  const { apiParams, transformer, apiParamsUpdater = p => p, immediate = true } = config;
-
-  const data: Ref<TableData[]> = ref([]);
-
-  function updateData(update: TableData[]) {
-    data.value = update;
-  }
-
-  const columns = ref(config.columns()) as Ref<HookTableColumn<TableData>[]>;
-
-  const requestParams = ref(apiParams) as Ref<HookTableConfig<TableData, Fn>['apiParams']>;
-
-  function updateRequestParamsByPagination(p: PagePropsOfPagination) {
-    requestParams.value = apiParamsUpdater({ ...requestParams.value, ...p });
-  }
-
-  const pagination = reactive({
-    page: 1,
-    pageSize: 10,
-    showSizePicker: true,
-    pageSizes: [10, 15, 20, 25, 30],
-    onChange: (page: number) => {
-      pagination.page = page;
-
-      updateRequestParamsByPagination({ page });
-      getData();
-    },
-    onUpdatePageSize: (pageSize: number) => {
-      pagination.pageSize = pageSize;
-      pagination.page = 1;
-
-      updateRequestParamsByPagination({ pageSize });
-      getData();
-    },
-    ...config.pagination
-  }) as PaginationProps;
-
-  function updatePagination(update: Partial<PaginationProps>) {
-    Object.assign(pagination, update);
-
-    updateRequestParamsByPagination({ page: pagination.page, pageSize: pagination.pageSize });
-  }
-
-  async function getData() {
-    startLoading();
-
-    const { data: apiData, error } = await apiFn(requestParams.value);
-
-    if (!error && data) {
-      const { data: tableData, pageNum, pageSize, total } = transformer(apiData);
-
-      updateData(tableData);
-
-      setEmpty(tableData.length === 0);
-
-      updatePagination({ page: pageNum, pageSize, itemCount: total });
-    }
-
-    endLoading();
-  }
-
-  function reloadColumns() {
-    columns.value = config.columns();
-  }
-
-  if (immediate) {
-    getData();
-  }
-
-  return {
-    data,
-    columns,
-    loading,
-    empty,
-    pagination,
-    getData,
-    updatePagination,
-    reloadColumns
-  };
-}

src/layouts/common/global-header/components/global-breadcrumb.vue

@@ -35,7 +35,7 @@ import { routePath } from '@/router';
 import { useRouteStore, useThemeStore } from '@/store';
 import { useRouterPush } from '@/composables';
 import { getBreadcrumbByRouteKey } from '@/utils';
-import { $t } from '@/locales';
+import { t } from '@/locales';
 
 defineOptions({ name: 'GlobalBreadcrumb' });
 
@@ -48,8 +48,8 @@ const breadcrumbs = computed(() =>
   getBreadcrumbByRouteKey(route.name as string, routeStore.menus as App.GlobalMenuOption[], routePath('root')).map(
     item => ({
       ...item,
-      label: item.i18nTitle ? $t(item.i18nTitle) : item.label,
+      label: item.i18nTitle ? t(item.i18nTitle) : item.label,
-      options: item.options?.map(oItem => ({ ...oItem, label: oItem.i18nTitle ? $t(oItem.i18nTitle) : oItem.label }))
+      options: item.options?.map(oItem => ({ ...oItem, label: oItem.i18nTitle ? t(oItem.i18nTitle) : oItem.label }))
     })
   )
 );

src/layouts/common/global-header/components/theme-mode.vue

@@ -1,11 +1,6 @@
 <template>
   <hover-container class="w-40px" :inverted="theme.header.inverted" tooltip-content="主题模式">
-    <dark-mode-switch
+    <dark-mode-switch :dark="theme.darkMode" class="wh-full" @update:dark="theme.setDarkMode" />
-      :dark="theme.darkMode"
-      :customize-transition="theme.isCustomizeDarkModeTransition"
-      class="wh-full"
-      @update:dark="theme.setDarkMode"
-    />
   </hover-container>
 </template>
 

src/layouts/common/global-header/components/toggle-lang.vue

@@ -15,7 +15,7 @@ import { localStg } from '@/utils';
 const theme = useThemeStore();
 const { locale } = useI18n();
 
-const language = ref<I18nType.LangType>(localStg.get('lang') || 'zh-CN');
+const language = ref<I18nType.langType>(localStg.get('lang') || 'zh-CN');
 const options = [
   {
     label: '中文',
@@ -31,9 +31,9 @@ const options = [
   }
 ];
 const handleSelect = (key: string) => {
-  language.value = key as I18nType.LangType;
+  language.value = key as I18nType.langType;
   locale.value = key;
-  localStg.set('lang', key as I18nType.LangType);
+  localStg.set('lang', key as I18nType.langType);
 };
 </script>
 <style scoped></style>

src/layouts/common/global-logo/index.vue

@@ -2,14 +2,14 @@
   <router-link :to="routeHomePath" class="flex-center w-full nowrap-hidden">
     <system-logo class="text-32px text-primary" />
     <h2 v-show="showTitle" class="pl-8px text-16px font-bold text-primary transition duration-300 ease-in-out">
-      {{ $t('system.title') }}
+      {{ t('message.system.title') }}
     </h2>
   </router-link>
 </template>
 
 <script setup lang="ts">
 import { routePath } from '@/router';
-import { $t } from '@/locales';
+import { t } from '@/locales';
 
 defineOptions({ name: 'GlobalLogo' });
 

src/layouts/common/global-search/components/search-footer.vue

@@ -1,30 +0,0 @@
-<template>
-  <div class="px-24px h-44px flex-y-center">
-    <span class="mr-14px flex-y-center">
-      <icon-mdi-keyboard-return class="icon text-20px p-2px mr-6px" />
-      <span>确认</span>
-    </span>
-    <span class="mr-14px flex-y-center">
-      <icon-mdi-arrow-up-thin class="icon text-20px p-2px mr-5px" />
-      <icon-mdi-arrow-down-thin class="icon text-20px p-2px mr-6px" />
-      <span>切换</span>
-    </span>
-    <span class="flex-y-center">
-      <icon-mdi-keyboard-esc class="icon text-20px p-2px mr-6px" />
-      <span>关闭</span>
-    </span>
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineOptions({ name: 'SearchFooter' });
-</script>
-
-<style lang="scss" scoped>
-.icon {
-  box-shadow:
-    inset 0 -2px #cdcde6,
-    inset 0 0 1px 1px #fff,
-    0 1px 2px 1px #1e235a66;
-}
-</style>

src/layouts/common/global-sider/components/vertical-mix-sider/components/mix-menu-drawer.vue

@@ -9,7 +9,7 @@
       :style="{ width: showDrawer ? theme.sider.mixChildMenuWidth + 'px' : '0px' }"
     >
       <header class="header-height flex-y-center justify-between" :style="{ height: theme.header.height + 'px' }">
-        <h2 class="text-primary pl-8px text-16px font-bold">{{ $t('system.title') }}</h2>
+        <h2 class="text-primary pl-8px text-16px font-bold">{{ title }}</h2>
         <div class="px-8px text-16px text-gray-600 cursor-pointer" @click="app.toggleMixSiderFixed">
           <icon-mdi-pin-off v-if="app.mixSiderFixed" />
           <icon-mdi-pin v-else />
@@ -35,9 +35,8 @@ import { computed, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import type { MenuOption } from 'naive-ui';
 import { useAppStore, useThemeStore } from '@/store';
-import { useRouterPush } from '@/composables';
+import { useAppInfo, useRouterPush } from '@/composables';
 import { getActiveKeyPathsOfMenus } from '@/utils';
-import { $t } from '@/locales';
 
 defineOptions({ name: 'MixMenuDrawer' });
 
@@ -54,6 +53,7 @@ const route = useRoute();
 const app = useAppStore();
 const theme = useThemeStore();
 const { routerPush } = useRouterPush();
+const { title } = useAppInfo();
 
 const showDrawer = computed(() => (props.visible && props.menus.length) || app.mixSiderFixed);
 

src/layouts/common/global-sider/components/vertical-mix-sider/index.vue

@@ -28,7 +28,7 @@ import { useRouterPush } from '@/composables';
 import { useBoolean } from '@/hooks';
 import { translateMenuLabel } from '@/utils';
 import { GlobalLogo } from '@/layouts/common';
-import { $t } from '@/locales';
+import { t } from '@/locales';
 import { MixMenuCollapse, MixMenuDetail, MixMenuDrawer } from './components';
 
 defineOptions({ name: 'VerticalMixSider' });
@@ -53,7 +53,7 @@ const firstDegreeMenus = computed(() =>
 
     return {
       routeName,
-      label: i18nTitle ? $t(i18nTitle) : label,
+      label: i18nTitle ? t(i18nTitle) : label,
       icon,
       hasChildren
     };

src/layouts/common/global-tab/components/reload-button/index.vue

@@ -6,21 +6,26 @@
 
 <script setup lang="ts">
 import { useRoute } from 'vue-router';
-import { useRouteStore } from '@/store';
+import { useAppStore, useRouteStore } from '@/store';
 import { useLoading } from '@/hooks';
-
 defineOptions({ name: 'ReloadButton' });
 
-const { reCacheRoute } = useRouteStore();
+const app = useAppStore();
+const routeStore = useRouteStore();
 const route = useRoute();
 const { loading, startLoading, endLoading } = useLoading();
 
-async function handleRefresh() {
+function handleRefresh() {
+  const isCached = routeStore.cacheRoutes.includes(String(route.name));
+  if (isCached) {
+    routeStore.removeCacheRoute(route.name as AuthRoute.AllRouteKey);
+  }
   startLoading();
-
+  app.reloadPage();
-  await reCacheRoute(route.name as AuthRoute.AllRouteKey);
-
   setTimeout(() => {
+    if (isCached) {
+      routeStore.addCacheRoute(route.name as AuthRoute.AllRouteKey);
+    }
     endLoading();
   }, 1000);
 }

src/layouts/common/global-tab/components/tab-detail/index.vue

@@ -19,7 +19,7 @@
           class="inline-block align-text-bottom text-16px"
         />
       </template>
-      {{ item.meta.i18nTitle ? $t(item.meta.i18nTitle) : item.meta.title }}
+      {{ item.meta.i18nTitle ? t(item.meta.i18nTitle) : item.meta.title }}
     </PageTab>
   </div>
   <context-menu
@@ -36,7 +36,7 @@
 import { computed, nextTick, reactive, ref, watch } from 'vue';
 import { PageTab } from '@soybeanjs/vue-materials';
 import { useTabStore, useThemeStore } from '@/store';
-import { $t } from '@/locales';
+import { t } from '@/locales';
 import { ContextMenu } from './components';
 
 defineOptions({ name: 'TabDetail' });

src/layouts/common/setting-drawer/components/dark-mode/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <n-divider title-placement="center">{{ $t('layout.settingDrawer.themeModeTitle') }}</n-divider>
+  <n-divider title-placement="center">主题模式</n-divider>
   <n-space vertical size="large">
-    <setting-menu :label="$t('layout.settingDrawer.darkMode')">
+    <setting-menu label="深色主题">
       <n-switch :value="theme.darkMode" @update:value="theme.setDarkMode">
         <template #checked>
           <icon-mdi-white-balance-sunny class="text-14px text-white" />
@@ -11,7 +11,7 @@
         </template>
       </n-switch>
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.followSystemTheme')">
+    <setting-menu label="跟随系统">
       <n-switch :value="theme.followSystemTheme" @update:value="theme.setFollowSystemTheme">
         <template #checked>
           <icon-ic-baseline-do-not-disturb class="text-14px text-white" />
@@ -21,23 +21,13 @@
         </template>
       </n-switch>
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.isCustomizeDarkModeTransition')">
+    <setting-menu label="侧边栏深色">
-      <n-switch :value="theme.isCustomizeDarkModeTransition" @update:value="theme.setIsCustomizeDarkModeTransition">
-        <template #checked>
-          <icon-ic-baseline-do-not-disturb class="text-14px text-white" />
-        </template>
-        <template #unchecked>
-          <icon-ic-round-hdr-auto class="text-14px text-white" />
-        </template>
-      </n-switch>
-    </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.sider.inverted')">
       <n-switch :value="theme.sider.inverted" @update:value="theme.setSiderInverted" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.header.inverted')">
+    <setting-menu label="头部深色">
       <n-switch :value="theme.header.inverted" @update:value="theme.setHeaderInverted" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.footer.inverted')">
+    <setting-menu label="底部深色">
       <n-switch :value="theme.footer.inverted" @update:value="theme.setFooterInverted" />
     </setting-menu>
   </n-space>
@@ -45,7 +35,6 @@
 
 <script lang="ts" setup>
 import { useThemeStore } from '@/store';
-import { $t } from '@/locales';
 import SettingMenu from '../setting-menu/index.vue';
 
 defineOptions({ name: 'DarkMode' });

src/layouts/common/setting-drawer/components/layout-mode/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <n-divider title-placement="center">{{ $t('layout.settingDrawer.layoutModelTitle') }}</n-divider>
+  <n-divider title-placement="center">布局模式</n-divider>
   <n-space justify="space-around" :wrap="true" :size="24" class="px-12px">
     <layout-card
       v-for="item in theme.layout.modeList"
@@ -43,7 +43,6 @@
 
 <script setup lang="ts">
 import { useThemeStore } from '@/store';
-import { $t } from '@/locales';
 import { LayoutCard } from './components';
 
 defineOptions({ name: 'LayoutMode' });

src/layouts/common/setting-drawer/components/page-func/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <n-divider title-placement="center">{{ $t('layout.settingDrawer.pageFunctionsTitle') }}</n-divider>
+  <n-divider title-placement="center">界面功能</n-divider>
   <n-space vertical size="large">
-    <setting-menu :label="$t('layout.settingDrawer.scrollMode')">
+    <setting-menu label="滚动模式">
       <n-select
         class="w-120px"
         size="small"
@@ -10,10 +10,10 @@
         @update:value="theme.setScrollMode"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.fixedHeaderAndTab')">
+    <setting-menu label="固定头部和多页签">
       <n-switch :value="theme.fixedHeaderAndTab" @update:value="theme.setIsFixedHeaderAndTab" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.menu.horizontalPosition')">
+    <setting-menu label="顶部菜单位置">
       <n-select
         class="w-120px"
         size="small"
@@ -22,7 +22,7 @@
         @update:value="theme.setHorizontalMenuPosition"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.header.height')">
+    <setting-menu label="头部高度">
       <n-input-number
         class="w-120px"
         size="small"
@@ -31,7 +31,7 @@
         @update:value="theme.setHeaderHeight"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.tab.height')">
+    <setting-menu label="多页签高度">
       <n-input-number
         class="w-120px"
         size="small"
@@ -40,10 +40,10 @@
         @update:value="theme.setTabHeight"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.tab.isCache')">
+    <setting-menu label="多页签缓存">
       <n-switch :value="theme.tab.isCache" @update:value="theme.setTabIsCache" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.sider.width')">
+    <setting-menu label="侧边栏展开宽度">
       <n-input-number
         class="w-120px"
         size="small"
@@ -52,7 +52,7 @@
         @update:value="theme.setSiderWidth"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.sider.mixWidth')">
+    <setting-menu label="左侧混合侧边栏展开宽度">
       <n-input-number
         class="w-120px"
         size="small"
@@ -61,13 +61,13 @@
         @update:value="theme.setMixSiderWidth"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.footer.visible')">
+    <setting-menu label="显示底部">
       <n-switch :value="theme.footer.visible" @update:value="theme.setFooterVisible" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.footer.fixed')">
+    <setting-menu label="固定底部">
       <n-switch :value="theme.footer.fixed" @update:value="theme.setFooterIsFixed" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.footer.right')">
+    <setting-menu label="底部居右">
       <n-switch :value="theme.footer.right" @update:value="theme.setFooterIsRight" />
     </setting-menu>
   </n-space>
@@ -75,7 +75,6 @@
 
 <script lang="ts" setup>
 import { useThemeStore } from '@/store';
-import { $t } from '@/locales';
 import SettingMenu from '../setting-menu/index.vue';
 
 defineOptions({ name: 'PageFunc' });

src/layouts/common/setting-drawer/components/page-view/index.vue

@@ -1,16 +1,16 @@
 <template>
-  <n-divider title-placement="center">{{ $t('layout.settingDrawer.pageViewTitle') }}</n-divider>
+  <n-divider title-placement="center">界面显示</n-divider>
   <n-space vertical size="large">
-    <setting-menu :label="$t('layout.settingDrawer.header.crumb.visible')">
+    <setting-menu label="面包屑">
       <n-switch :value="theme.header.crumb.visible" @update:value="theme.setHeaderCrumbVisible" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.header.crumb.icon')">
+    <setting-menu label="面包屑图标">
       <n-switch :value="theme.header.crumb.showIcon" @update:value="theme.setHeaderCrumbIconVisible" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.tab.visible')">
+    <setting-menu label="多页签">
       <n-switch :value="theme.tab.visible" @update:value="theme.setTabVisible" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.tab.modeList.mode')">
+    <setting-menu label="多页签风格">
       <n-select
         class="w-120px"
         size="small"
@@ -19,10 +19,10 @@
         @update:value="theme.setTabMode"
       />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.page.animate')">
+    <setting-menu label="页面切换动画">
       <n-switch :value="theme.page.animate" @update:value="theme.setPageIsAnimate" />
     </setting-menu>
-    <setting-menu :label="$t('layout.settingDrawer.page.animateMode')">
+    <setting-menu label="页面切换动画类型">
       <n-select
         class="w-120px"
         size="small"
@@ -36,7 +36,6 @@
 
 <script lang="ts" setup>
 import { useThemeStore } from '@/store';
-import { $t } from '@/locales';
 import SettingMenu from '../setting-menu/index.vue';
 
 defineOptions({ name: 'PageView' });

src/layouts/common/setting-drawer/components/theme-color-select/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <n-divider title-placement="center">{{ $t('layout.settingDrawer.systemThemeTitle') }}</n-divider>
+  <n-divider title-placement="center">系统主题</n-divider>
   <n-grid :cols="8" :x-gap="8" :y-gap="12">
     <n-grid-item v-for="color in theme.themeColorList" :key="color" class="flex-x-center">
       <color-checkbox :color="color" :checked="color === theme.themeColor" @click="theme.setThemeColor(color)" />
@@ -7,9 +7,7 @@
   </n-grid>
   <n-space :vertical="true" class="pt-12px">
     <n-color-picker :value="theme.themeColor" :show-alpha="false" @update-value="theme.setThemeColor" />
-    <n-button :block="true" :type="otherColorBtnType" @click="openModal">
+    <n-button :block="true" :type="otherColorBtnType" @click="openModal">更多颜色</n-button>
-      {{ $t('layout.settingDrawer.systemTheme.moreColors') }}
-    </n-button>
   </n-space>
   <color-modal :visible="visible" @close="closeModal" />
 </template>
@@ -19,7 +17,6 @@ import { computed } from 'vue';
 import { isInTraditionColors } from '@/settings';
 import { useThemeStore } from '@/store';
 import { useBoolean } from '@/hooks';
-import { $t } from '@/locales';
 import { ColorCheckbox, ColorModal } from './components';
 
 defineOptions({ name: 'ThemeColorSelect' });

src/layouts/common/setting-drawer/components/theme-config/index.vue

@@ -1,13 +1,11 @@
 <template>
-  <n-divider title-placement="center">{{ $t('layout.settingDrawer.themeConfiguration.title') }}</n-divider>
+  <n-divider title-placement="center">主题配置</n-divider>
   <textarea id="themeConfigCopyTarget" v-model="dataClipboardText" class="absolute opacity-0" />
   <n-space vertical>
     <div ref="copyRef" data-clipboard-target="#themeConfigCopyTarget">
-      <n-button type="primary" :block="true">{{ $t('layout.settingDrawer.themeConfiguration.copy') }}</n-button>
+      <n-button type="primary" :block="true">拷贝当前配置</n-button>
     </div>
-    <n-button type="warning" :block="true" @click="handleResetConfig">
+    <n-button type="warning" :block="true" @click="handleResetConfig">重置当前配置</n-button>
-      {{ $t('layout.settingDrawer.themeConfiguration.reset') }}
-    </n-button>
   </n-space>
 </template>
 
@@ -15,7 +13,6 @@
 import { onMounted, onUnmounted, ref, watch } from 'vue';
 import Clipboard from 'clipboard';
 import { useThemeStore } from '@/store';
-import { $t } from '@/locales';
 
 defineOptions({ name: 'ThemeConfig' });
 
@@ -31,7 +28,7 @@ function getClipboardText() {
 
 function handleResetConfig() {
   theme.resetThemeStore();
-  window.$message?.success($t('layout.settingDrawer.themeConfiguration.resetSuccess'));
+  window.$message?.success('已重置配置，请重新拷贝！');
 }
 
 function clipboardEventListener() {
@@ -39,9 +36,9 @@ function clipboardEventListener() {
   const copy = new Clipboard(copyRef.value);
   copy.on('success', () => {
     window.$dialog?.success({
-      title: $t('layout.settingDrawer.themeConfiguration.operateSuccess'),
+      title: '操作成功',
-      content: $t('layout.settingDrawer.themeConfiguration.copySuccess'),
+      content: '复制成功,请替换 src/settings/theme.json的内容！',
-      positiveText: $t('layout.settingDrawer.themeConfiguration.confirmCopy')
+      positiveText: '确定'
     });
   });
 }

src/layouts/common/setting-drawer/index.vue

@@ -1,6 +1,6 @@
 <template>
   <n-drawer :show="app.settingDrawerVisible" display-directive="show" :width="330" @mask-click="app.closeSettingDrawer">
-    <n-drawer-content :title="$t('layout.settingDrawer.title')" :native-scrollbar="false">
+    <n-drawer-content title="主题配置" :native-scrollbar="false">
       <dark-mode />
       <layout-mode />
       <theme-color-select />
@@ -14,7 +14,6 @@
 
 <script setup lang="ts">
 import { useAppStore } from '@/store';
-import { $t } from '@/locales';
 import { DarkMode, DrawerButton, LayoutMode, PageFunc, PageView, ThemeColorSelect, ThemeConfig } from './components';
 
 defineOptions({ name: 'SettingDrawer' });

src/locales/i18n.ts

@@ -1,8 +1,8 @@
 import type { App } from 'vue';
 import { createI18n } from 'vue-i18n';
-import type { TranslateOptions } from 'vue-i18n';
+import { localStg } from '@/utils';
-import { localStg } from '@/utils/storage';
+import messages from './lang';
-import messages from './locale';
+import type { LocaleKey } from './lang';
 
 const i18n = createI18n({
   locale: localStg.get('lang') || 'zh-CN',
@@ -15,20 +15,10 @@ export function setupI18n(app: App) {
   app.use(i18n);
 }
 
-interface T {
+export function t(key: string) {
-  (key: I18nType.I18nKey): string;
+  return i18n.global.t(key);
-  (key: I18nType.I18nKey, plural: number, options?: TranslateOptions<I18nType.LangType>): string;
-  (key: I18nType.I18nKey, defaultMsg: string, options?: TranslateOptions<I18nType.I18nKey>): string;
-  (key: I18nType.I18nKey, list: unknown[], options?: TranslateOptions<I18nType.I18nKey>): string;
-  (key: I18nType.I18nKey, list: unknown[], plural: number): string;
-  (key: I18nType.I18nKey, list: unknown[], defaultMsg: string): string;
-  (key: I18nType.I18nKey, named: Record<string, unknown>, options?: TranslateOptions<I18nType.LangType>): string;
-  (key: I18nType.I18nKey, named: Record<string, unknown>, plural: number): string;
-  (key: I18nType.I18nKey, named: Record<string, unknown>, defaultMsg: string): string;
 }
 
-export const $t = i18n.global.t as T;
+export function setLocale(locale: LocaleKey) {
-
-export function setLocale(locale: I18nType.LangType) {
   i18n.global.locale.value = locale;
 }

src/locales/lang/en.ts

@@ -1,20 +1,10 @@
-const locale: I18nType.Schema = {
+import type { LocaleMessages } from 'vue-i18n';
+
+const locale: LocaleMessages<I18nType.Schema> = {
+  message: {
     system: {
       title: 'SoybeanAdmin'
     },
-  common: {
-    add: 'Add',
-    addSuccess: 'Add Success',
-    edit: 'Edit',
-    editSuccess: 'Edit Success',
-    delete: 'Delete',
-    deleteSuccess: 'Delete Success',
-    batchDelete: 'Batch Delete',
-    confirm: 'Confirm',
-    cancel: 'Cancel',
-    pleaseCheckValue: 'Please check the value is valid',
-    action: 'Action'
-  },
     routes: {
       dashboard: {
         _value: 'Dashboard',
@@ -88,130 +78,6 @@ const locale: I18nType.Schema = {
         user: 'User'
       },
       about: 'About'
-  },
-  layout: {
-    settingDrawer: {
-      title: 'Theme configuration',
-      themeModeTitle: 'Theme mode',
-      darkMode: 'Dark mode',
-      layoutModelTitle: 'Layout mode',
-      systemThemeTitle: 'System theme',
-      pageFunctionsTitle: 'Page functions',
-      pageViewTitle: 'Page view',
-      followSystemTheme: 'Follow the system',
-      isCustomizeDarkModeTransition: 'Custom dark theme animation transition',
-      scrollMode: 'scrollMode',
-      scrollModeList: {
-        wrapper: 'Outer layer scroll',
-        content: 'Main body scroll'
-      },
-      fixedHeaderAndTab: 'Fixed header and multiple tabs',
-      header: {
-        inverted: 'darkHead',
-        height: 'Head Height',
-        crumb: {
-          visible: 'Crumb',
-          icon: 'Crumb icon'
-        }
-      },
-      tab: {
-        visible: 'Multi-page tab',
-        height: 'Multiple tab height',
-        modeList: {
-          mode: 'Multi-tab style',
-          chrome: 'Google style',
-          button: 'Button style'
-        },
-        isCache: 'Multiple tab caching'
-      },
-      sider: {
-        inverted: 'Dark sidebar',
-        width: 'Sidebar expanded width',
-        mixWidth: 'Left hybrid sidebar expanded width'
-      },
-      menu: {
-        horizontalPosition: 'Top menu position',
-        horizontalPositionList: {
-          flexStart: 'Right',
-          center: 'center',
-          flexEnd: 'Left'
-        }
-      },
-      footer: {
-        inverted: 'Dark bottom',
-        visible: 'Show bottom',
-        fixed: 'Fixed bottom',
-        right: 'Bottom to the right'
-      },
-      page: {
-        animate: 'switch animation',
-        animateMode: 'switch animation type',
-        animateModeList: {
-          zoomFade: 'Gradual change',
-          zoomOut: 'Flash',
-          fadeSlide: 'Slide',
-          fade: 'Fade away',
-          fadeBottom: 'Bottom fade',
-          fadeScale: 'Resizing fade away'
-        }
-      },
-      systemTheme: {
-        moreColors: 'More colors'
-      },
-      themeConfiguration: {
-        title: 'Theme configuration',
-        copy: 'Copy the current configuration',
-        reset: 'Reset the current configuration',
-        resetSuccess: 'The configuration has been reset, please copy it again!',
-        operateSuccess: 'Successful operation',
-        copySuccess: 'Copy success, please replace the content of src/settings/theme.json!',
-        confirmCopy: 'Confirm'
-      }
-    }
-  },
-  page: {
-    login: {
-      common: {
-        userNamePlaceholder: 'Please enter user name',
-        phonePlaceholder: 'Please enter phone number',
-        codePlaceholder: 'Please enter verification code',
-        passwordPlaceholder: 'Please enter password',
-        confirmPasswordPlaceholder: 'Please enter password again',
-        codeLogin: 'Verification code login',
-        confirm: 'Confirm',
-        back: 'Back',
-        validateSuccess: 'Verification passed',
-        loginSuccess: 'Login success',
-        welcomeBack: 'Welcome back, {userName}!'
-      },
-      pwdLogin: {
-        title: 'Password Login',
-        rememberMe: 'Remember me',
-        forgetPassword: 'Forget password?',
-        register: 'Register account',
-        otherAccountLogin: 'Other Account Login',
-        otherLoginMode: 'Other Login Mode',
-        superAdmin: 'Super Administrator',
-        admin: 'Administrator',
-        user: 'Ordinary User'
-      },
-      codeLogin: {
-        title: 'Verification Code Login',
-        getCode: 'Get verification code',
-        imageCodePlaceholder: 'Please enter image verification code'
-      },
-      register: {
-        title: 'Register Account',
-        agreement: 'I have read and agree to',
-        protocol: '《User Agreement》',
-        policy: '《Privacy Policy》'
-      },
-      resetPwd: {
-        title: 'Reset Password'
-      },
-      bindWeChat: {
-        title: 'Bind WeChat'
-      }
     }
   }
 };

src/locales/lang/index.ts

@@ -0,0 +1,13 @@
+import zhCN from './zh-cn';
+import en from './en';
+import kmKH from './km-KH';
+
+const locales = {
+  'zh-CN': zhCN,
+  en,
+  'km-KH': kmKH
+};
+
+export type LocaleKey = keyof typeof locales;
+
+export default locales;

src/locales/lang/km-KH.ts

@@ -1,20 +1,10 @@
-const locale: I18nType.Schema = {
+import type { LocaleMessages } from 'vue-i18n';
+
+const locale: LocaleMessages<I18nType.Schema> = {
+  message: {
     system: {
       title: 'ប្រព័ន្ធគ្រប់គ្រង'
     },
-  common: {
-    add: 'បន្ថែម',
-    addSuccess: 'បន្ថែមជោគជ័យ',
-    edit: 'កែប្រែ',
-    editSuccess: 'កែប្រែជោគជ័យ',
-    delete: 'លុប',
-    deleteSuccess: 'លុបជោគជ័យ',
-    batchDelete: 'លុបច្រើន',
-    confirm: 'យល់ព្រម',
-    cancel: 'បោះបង់',
-    pleaseCheckValue: 'សូមពិនិត្យមើលតម្លៃដែលបានបញ្ចូលដើម្បីបញ្ជាក់ថាត្រូវប្រើប្រាស់បាន',
-    action: 'សកម្មភាព'
-  },
     routes: {
       dashboard: {
         _value: 'ផ្ទាំងទិន្នន័យ',
@@ -88,130 +78,6 @@ const locale: I18nType.Schema = {
         user: 'អ្នកប្រើប្រាស់'
       },
       about: 'អំពីប្រព័ន្ធ'
-  },
-  layout: {
-    settingDrawer: {
-      title: 'ការកំណត់ស្បែក',
-      themeModeTitle: 'ស្បែករបស់របស់អ្នក',
-      darkMode: 'របៀបងារស្បែកងងឹត',
-      layoutModelTitle: 'របៀបប្រើប្រាស់របស់អ្នក',
-      systemThemeTitle: 'ស្បែករបស់ប្រព័ន្ធគ្រប់គ្រង',
-      pageFunctionsTitle: 'មុខងារទំនាក់ទំនងរបស់ទំព័រ',
-      pageViewTitle: 'ទំព័រទស្សន៍ទាយ',
-      followSystemTheme: 'តាមដានស្បែកប្រព័ន្ធគ្រប់គ្រង',
-      isCustomizeDarkModeTransition: 'ប្រើប្រាស់របៀបងារស្បែកងងឹតផ្ទាល់ខ្លួន',
-      scrollMode: 'របៀបរុករក',
-      scrollModeList: {
-        wrapper: 'រុករកជាក់លាក់',
-        content: 'រុករកមានមុខងារ'
-      },
-      fixedHeaderAndTab: 'បិទការរុករកជាក់លាក់និងរុករកមានមុខងារ',
-      header: {
-        inverted: 'បង្កើតការរុករកជាក់លាក់',
-        height: 'កម្ពស់',
-        crumb: {
-          visible: 'បង្ហាញរុករកជាក់លាក់',
-          icon: 'រុករកជាក់លាក់រូបតំណាង'
-        }
-      },
-      tab: {
-        visible: 'បង្ហាញរុករកជាក់លាក់',
-        height: 'កម្ពស់',
-        modeList: {
-          mode: 'របៀប',
-          chrome: 'ក្រុមហ៊ុន',
-          button: 'ប៊ូតុង'
-        },
-        isCache: 'រក្សាទុកការរុករកជាក់លាក់'
-      },
-      sider: {
-        inverted: 'បង្កើតការរុករកជាក់លាក់',
-        width: 'ទទឹង',
-        mixWidth: 'ទទឹងបញ្ចូល'
-      },
-      menu: {
-        horizontalPosition: 'ទីតាំងផ្ដេក',
-        horizontalPositionList: {
-          flexStart: 'ចាប់ផ្ដើមឈុត',
-          center: 'កណ្តាល',
-          flexEnd: 'ចាប់ផ្ដើមចុងក្រោយ'
-        }
-      },
-      footer: {
-        inverted: 'បង្កើតការរុករកជាក់លាក់',
-        visible: 'បង្ហាញការរុករកជាក់លាក់',
-        fixed: 'ការរុករកជាក់លាក់',
-        right: 'ត្រឡប់ទៅស្តាំ'
-      },
-      page: {
-        animate: 'ការផ្លាស់ប្តូរ',
-        animateMode: 'របៀបផ្លាស់ប្តូរ',
-        animateModeList: {
-          zoomFade: 'ពង្រីកបង្ហាញនិងលាស់ប្តូរ',
-          zoomOut: 'ពង្រីកបង្ហាញនិងលាស់ប្តូរ',
-          fadeSlide: 'ពង្រីកបង្ហាញនិងលាស់ប្តូរ',
-          fade: 'ពង្រីកបង្ហាញនិងលាស់ប្តូរ',
-          fadeBottom: 'ពង្រីកបង្ហាញនិងលាស់ប្តូរ',
-          fadeScale: 'ពង្រីកបង្ហាញនិងលាស់ប្តូរ'
-        }
-      },
-      systemTheme: {
-        moreColors: 'ពន្លឺច្រើនទៀត'
-      },
-      themeConfiguration: {
-        title: 'ការកំណត់ស្បែក',
-        copy: 'ចម្លង',
-        reset: 'កំណត់ឡើងវិញ',
-        resetSuccess: 'កំណត់ឡើងវិញជោគជ័យ, សូមចម្លងឯកសារស្បែកឡើងវិញ!',
-        operateSuccess: 'សម្រាប់ការប្រើប្រាស់ជោគជ័យ',
-        copySuccess: 'ចម្លងជោគជ័យ, សូមជោគជ័យឯកសារ src/settings/theme.json!',
-        confirmCopy: 'យល់ព្រម'
-      }
-    }
-  },
-  page: {
-    login: {
-      common: {
-        userNamePlaceholder: 'ឈ្មោះអ្នកប្រើប្រាស់',
-        phonePlaceholder: 'លេខទូរស័ព្ទ',
-        codePlaceholder: 'លេខកូដ',
-        passwordPlaceholder: 'លេខសម្ងាត់',
-        confirmPasswordPlaceholder: 'បញ្ជាក់លេខសម្ងាត់',
-        codeLogin: 'ចូលតាមលេខកូដ',
-        confirm: 'យល់ព្រម',
-        back: 'ត្រឡប់ក្រោយ',
-        validateSuccess: 'បញ្ជាក់ជោគជ័យ',
-        loginSuccess: 'ចូលជោគជ័យ',
-        welcomeBack: 'សូមស្វាគមន៍ម្តងទៀត, {userName}!'
-      },
-      pwdLogin: {
-        title: 'ចូលគណនី',
-        rememberMe: 'ចងចាំខ្ញុំ',
-        forgetPassword: 'ភ្លេចលេខសម្ងាត់',
-        register: 'ចុះឈ្មោះ',
-        otherAccountLogin: 'ចូលតាមគណនីផ្សេងទៀត',
-        otherLoginMode: 'របៀបចូលគណនីផ្សេងទៀត',
-        superAdmin: 'អ្នកគ្រប់គ្រងសុវត្ថិភាព',
-        admin: 'អ្នកគ្រប់គ្រង',
-        user: 'អ្នកប្រើប្រាស់'
-      },
-      codeLogin: {
-        title: 'ចូលតាមលេខកូដ',
-        getCode: 'ទទួលលេខកូដ',
-        imageCodePlaceholder: 'លេខកូដរូបភាព'
-      },
-      register: {
-        title: 'ចុះឈ្មោះ',
-        agreement: 'យល់ព្រមនឹង',
-        protocol: 'សម្រាប់ការប្រើប្រាស់',
-        policy: 'គោលការណ៍ផ្សេងៗ'
-      },
-      resetPwd: {
-        title: 'កំណត់លេខសម្ងាត់ថ្មី'
-      },
-      bindWeChat: {
-        title: 'ភ្ជាប់គណនីរបស់អ្នកជាមួយគណនីរបស់អ្នក'
-      }
     }
   }
 };

src/locales/lang/zh-CN.ts

@@ -1,219 +0,0 @@
-const locale: I18nType.Schema = {
-  system: {
-    title: 'Soybean管理系统'
-  },
-  common: {
-    add: '添加',
-    addSuccess: '添加成功',
-    edit: '修改',
-    editSuccess: '修改成功',
-    delete: '删除',
-    deleteSuccess: '删除成功',
-    batchDelete: '批量删除',
-    confirm: '确认',
-    cancel: '取消',
-    pleaseCheckValue: '请检查输入的值是否合法',
-    action: '操作'
-  },
-  routes: {
-    dashboard: {
-      _value: '仪表盘',
-      analysis: '分析页',
-      workbench: '工作台'
-    },
-    document: {
-      _value: '文档',
-      vue: 'Vue文档',
-      vite: 'Vite文档',
-      naive: 'NaiveUI文档',
-      project: '项目文档',
-      'project-link': '项目文档(外链)'
-    },
-    component: {
-      _value: '组件示例',
-      button: '按钮',
-      card: '卡片',
-      table: '表格'
-    },
-    plugin: {
-      _value: '插件示例',
-      charts: {
-        _value: '图表',
-        echarts: 'ECharts',
-        antv: 'AntV'
-      },
-      copy: '剪贴板',
-      editor: {
-        _value: '编辑器',
-        quill: '富文本',
-        markdown: 'Markdown'
-      },
-      icon: '图标',
-      map: '地图',
-      print: '打印',
-      swiper: 'Swiper',
-      video: '视频'
-    },
-    'auth-demo': {
-      _value: '权限示例',
-      permission: '切换权限',
-      super: '超级管理员可见'
-    },
-    function: {
-      _value: '功能',
-      tab: 'Tab页签'
-    },
-    exception: {
-      _value: '异常页',
-      403: '403',
-      404: '404',
-      500: '500'
-    },
-    'multi-menu': {
-      _value: '多级菜单',
-      first: {
-        _value: '一级菜单',
-        second: '二级菜单',
-        'second-new': {
-          _value: '二级菜单(有子菜单)',
-          third: '三级菜单'
-        }
-      }
-    },
-    management: {
-      _value: '系统管理',
-      auth: '权限管理',
-      role: '角色管理',
-      route: '路由管理',
-      user: '用户管理'
-    },
-    about: '关于'
-  },
-  layout: {
-    settingDrawer: {
-      title: '主题配置',
-      themeModeTitle: '主题模式',
-      darkMode: '深色主题',
-      layoutModelTitle: '布局模式',
-      systemThemeTitle: '系统主题',
-      pageFunctionsTitle: '界面功能',
-      pageViewTitle: '界面显示',
-      followSystemTheme: '跟随系统',
-      isCustomizeDarkModeTransition: '自定义暗黑主题动画过渡',
-      scrollMode: '滚动模式',
-      scrollModeList: {
-        wrapper: '外层滚动',
-        content: '主体滚动'
-      },
-      fixedHeaderAndTab: '固定头部和多页签',
-      header: {
-        inverted: '头部深色',
-        height: '头部高度',
-        crumb: {
-          visible: '面包屑',
-          icon: '面包屑图标'
-        }
-      },
-      tab: {
-        visible: '多页签',
-        height: '多页签高度',
-        modeList: {
-          mode: '多页签风格',
-          chrome: '谷歌风格',
-          button: '按钮风格'
-        },
-        isCache: '多页签缓存'
-      },
-      sider: {
-        inverted: '侧边栏深色',
-        width: '侧边栏展开宽度',
-        mixWidth: '左侧混合侧边栏展开宽度'
-      },
-      menu: {
-        horizontalPosition: '顶部菜单位置',
-        horizontalPositionList: {
-          flexStart: '居左',
-          center: '居中',
-          flexEnd: '居右'
-        }
-      },
-      footer: {
-        inverted: '底部深色',
-        visible: '显示底部',
-        fixed: '固定底部',
-        right: '底部居右'
-      },
-      page: {
-        animate: '页面切换动画',
-        animateMode: '页面切换动画类型',
-        animateModeList: {
-          zoomFade: '渐变',
-          zoomOut: '闪现',
-          fadeSlide: '滑动',
-          fade: '消退',
-          fadeBottom: '底部消退',
-          fadeScale: '缩放消退'
-        }
-      },
-      systemTheme: {
-        moreColors: '更多颜色'
-      },
-      themeConfiguration: {
-        title: '主题配置',
-        copy: '拷贝当前配置',
-        reset: '重置当前配置',
-        resetSuccess: '已重置配置，请重新拷贝！',
-        operateSuccess: '操作成功',
-        copySuccess: '复制成功,请替换 src/settings/theme.json的内容！',
-        confirmCopy: '确认'
-      }
-    }
-  },
-  page: {
-    login: {
-      common: {
-        userNamePlaceholder: '请输入用户名',
-        phonePlaceholder: '请输入手机号',
-        codePlaceholder: '请输入验证码',
-        passwordPlaceholder: '请输入密码',
-        confirmPasswordPlaceholder: '请再次输入密码',
-        codeLogin: '验证码登录',
-        confirm: '确定',
-        back: '返回',
-        validateSuccess: '验证成功',
-        loginSuccess: '登录成功',
-        welcomeBack: '欢迎回来，{userName}!'
-      },
-      pwdLogin: {
-        title: '密码登录',
-        rememberMe: '记住我',
-        forgetPassword: '忘记密码？',
-        register: '注册账号',
-        otherAccountLogin: '其他账号登录',
-        otherLoginMode: '其他登录方式',
-        superAdmin: '超级管理员',
-        admin: '管理员',
-        user: '普通用户'
-      },
-      codeLogin: {
-        title: '验证码登录',
-        getCode: '获取验证码',
-        imageCodePlaceholder: '请输入图片验证码'
-      },
-      register: {
-        title: '注册账号',
-        agreement: '我已经仔细阅读并接受',
-        protocol: '《用户协议》',
-        policy: '《隐私权政策》'
-      },
-      resetPwd: {
-        title: '重置密码'
-      },
-      bindWeChat: {
-        title: '绑定微信'
-      }
-    }
-  }
-};
-
-export default locale;

src/locales/lang/zh-cn.ts

@@ -0,0 +1,85 @@
+import type { LocaleMessages } from 'vue-i18n';
+
+const locale: LocaleMessages<I18nType.Schema> = {
+  message: {
+    system: {
+      title: 'Soybean管理系统'
+    },
+    routes: {
+      dashboard: {
+        _value: '仪表盘',
+        analysis: '分析页',
+        workbench: '工作台'
+      },
+      document: {
+        _value: '文档',
+        vue: 'Vue文档',
+        vite: 'Vite文档',
+        naive: 'NaiveUI文档',
+        project: '项目文档',
+        'project-link': '项目文档(外链)'
+      },
+      component: {
+        _value: '组件示例',
+        button: '按钮',
+        card: '卡片',
+        table: '表格'
+      },
+      plugin: {
+        _value: '插件示例',
+        charts: {
+          _value: '图表',
+          echarts: 'ECharts',
+          antv: 'AntV'
+        },
+        copy: '剪贴板',
+        editor: {
+          _value: '编辑器',
+          quill: '富文本',
+          markdown: 'Markdown'
+        },
+        icon: '图标',
+        map: '地图',
+        print: '打印',
+        swiper: 'Swiper',
+        video: '视频'
+      },
+      'auth-demo': {
+        _value: '权限示例',
+        permission: '切换权限',
+        super: '超级管理员可见'
+      },
+      function: {
+        _value: '功能',
+        tab: 'Tab页签'
+      },
+      exception: {
+        _value: '异常页',
+        403: '403',
+        404: '404',
+        500: '500'
+      },
+      'multi-menu': {
+        _value: '多级菜单',
+        first: {
+          _value: '一级菜单',
+          second: '二级菜单',
+          'second-new': {
+            _value: '二级菜单(有子菜单)',
+            third: '三级菜单'
+          }
+        }
+      },
+      management: {
+        _value: '系统管理',
+        auth: '权限管理',
+        role: '角色管理',
+        route: '路由管理',
+        user: '用户管理'
+      },
+      about: '关于'
+    }
+  }
+};
+
+export default locale;

src/locales/locale.ts

@@ -1,11 +0,0 @@
-import zhCN from './lang/zh-CN';
-import en from './lang/en';
-import kmKH from './lang/km-KH';
-
-const locales: Record<I18nType.LangType, I18nType.Schema> = {
-  'zh-CN': zhCN,
-  en,
-  'km-KH': kmKH
-};
-
-export default locales;

src/plugins/assets.ts

@@ -4,6 +4,4 @@ import 'virtual:svg-icons-register';
 import '../styles/css/global.css';
 
 /** import static assets: css, js , font and so on. - [引入静态资源，css、js和字体文件等] */
-export default function setupAssets() {
+export default function setupAssets() {}
-  //
-}

src/router/guard/index.ts

@@ -1,6 +1,6 @@
 import type { Router } from 'vue-router';
 import { useTitle } from '@vueuse/core';
-import { $t } from '@/locales';
+import { t } from '@/locales';
 import { createPermissionGuard } from './permission';
 
 /**
@@ -16,7 +16,7 @@ export function createRouterGuard(router: Router) {
   });
   router.afterEach(to => {
     // 设置document title
-    useTitle(to.meta.i18nTitle ? $t(to.meta.i18nTitle) : to.meta.title);
+    useTitle(to.meta.i18nTitle ? t(to.meta.i18nTitle) : to.meta.title);
     // 结束 loadingBar
     window.$loadingBar?.finish();
   });

src/router/modules/multi-menu.ts

@@ -14,7 +14,7 @@ const multiMenu: AuthRoute.Route = {
           component: 'self',
           meta: {
             title: '二级菜单',
-            i18nTitle: 'routes.multi-menu.first.second',
+            i18nTitle: 'message.routes.multi-menu.first.second',
             requiresAuth: true,
             icon: 'mdi:menu'
           }
@@ -30,7 +30,7 @@ const multiMenu: AuthRoute.Route = {
               component: 'self',
               meta: {
                 title: '三级菜单',
-                i18nTitle: 'routes.multi-menu.first.second-new.third',
+                i18nTitle: 'message.routes.multi-menu.first.second-new.third',
                 requiresAuth: true,
                 icon: 'mdi:menu'
               }
@@ -38,21 +38,21 @@ const multiMenu: AuthRoute.Route = {
           ],
           meta: {
             title: '二级菜单(有子菜单)',
-            i18nTitle: 'routes.multi-menu.first.second-new._value',
+            i18nTitle: 'message.routes.multi-menu.first.second-new._value',
             icon: 'mdi:menu'
           }
         }
       ],
       meta: {
         title: '一级菜单',
-        i18nTitle: 'routes.multi-menu.first._value',
+        i18nTitle: 'message.routes.multi-menu.first._value',
         icon: 'mdi:menu'
       }
     }
   ],
   meta: {
     title: '多级菜单',
-    i18nTitle: 'routes.multi-menu._value',
+    i18nTitle: 'message.routes.multi-menu._value',
     icon: 'carbon:menu',
     order: 8
   }

src/service/request/instance.ts

@@ -11,8 +11,6 @@ import {
 } from '@/utils';
 import { handleRefreshToken } from './helpers';
 
-type RefreshRequestQueue = (config: AxiosRequestConfig) => void;
-
 /**
  * 封装axios请求类
  * @author Soybean<honghuangdc@gmail.com>
@@ -22,10 +20,6 @@ export default class CustomAxiosInstance {
 
   backendConfig: Service.BackendResultConfig;
 
-  isRefreshing: boolean;
-
-  retryQueues: RefreshRequestQueue[];
-
   /**
    *
    * @param axiosConfig - axios配置
@@ -43,8 +37,6 @@ export default class CustomAxiosInstance {
     this.backendConfig = backendConfig;
     this.instance = axios.create(axiosConfig);
     this.setInterceptor();
-    this.isRefreshing = false;
-    this.retryQueues = [];
   }
 
   /** 设置请求拦截器 */
@@ -68,7 +60,7 @@ export default class CustomAxiosInstance {
     );
     this.instance.interceptors.response.use(
       (async response => {
-        const { status, config } = response;
+        const { status } = response;
         if (status === 200 || status < 300 || status === 304) {
           const backend = response.data;
           const { codeKey, dataKey, successCode } = this.backendConfig;
@@ -79,24 +71,10 @@ export default class CustomAxiosInstance {
 
           // token失效, 刷新token
           if (REFRESH_TOKEN_CODE.includes(backend[codeKey])) {
-            // 原始请求
+            const config = await handleRefreshToken(response.config);
-            const originRequest = new Promise(resolve => {
+            if (config) {
-              this.retryQueues.push((refreshConfig: AxiosRequestConfig) => {
+              return this.instance.request(config);
-                config.headers.Authorization = refreshConfig.headers?.Authorization;
-                resolve(this.instance.request(config));
-              });
-            });
-
-            if (!this.isRefreshing) {
-              this.isRefreshing = true;
-              const refreshConfig = await handleRefreshToken(response.config);
-              if (refreshConfig) {
-                this.retryQueues.map(cb => cb(refreshConfig));
             }
-              this.retryQueues = [];
-              this.isRefreshing = false;
-            }
-            return originRequest;
           }
 
           const error = handleBackendError(backend, this.backendConfig);

src/settings/theme.json

@@ -1,7 +1,6 @@
 {
   "darkMode": false,
   "followSystemTheme": true,
-  "isCustomizeDarkModeTransition": false,
   "layout": {
     "minWidth": 900,
     "mode": "vertical",
@@ -35,15 +34,15 @@
       "label": "主体滚动"
     }
   ],
-  "themeColor": "#646cff",
+  "themeColor": "#1890ff",
   "themeColorList": [
     "#1890ff",
     "#409EFF",
+    "#2d8cf0",
     "#007AFF",
     "#5ac8fa",
     "#5856D6",
     "#536dfe",
-    "#646cff",
     "#9c27b0",
     "#AF52DE",
     "#0096c7",

src/settings/theme.ts

@@ -10,11 +10,11 @@ import jsonSetting from './theme.json';
 const themeColorList = [
   '#1890ff',
   '#409EFF',
+  '#2d8cf0',
   '#007AFF',
   '#5ac8fa',
   '#5856D6',
   '#536dfe',
-  '#646cff',
   '#9c27b0',
   '#AF52DE',
   '#0096c7',
@@ -37,7 +37,6 @@ const themeColorList = [
 const defaultThemeSetting: Theme.Setting = {
   darkMode: false,
   followSystemTheme: true,
-  isCustomizeDarkModeTransition: false,
   layout: {
     minWidth: 900,
     mode: 'vertical',
@@ -45,7 +44,7 @@ const defaultThemeSetting: Theme.Setting = {
   },
   scrollMode: 'content',
   scrollModeList: themeScrollModeOptions,
-  themeColor: themeColorList[6],
+  themeColor: themeColorList[0],
   themeColorList,
   otherColor: {
     info: '#2080f0',

src/store/modules/auth/index.ts

@@ -4,7 +4,6 @@ import { router } from '@/router';
 import { fetchLogin, fetchUserInfo } from '@/service';
 import { useRouterPush } from '@/composables';
 import { localStg } from '@/utils';
-import { $t } from '@/locales';
 import { useTabStore } from '../tab';
 import { useRouteStore } from '../route';
 import { getToken, getUserInfo, clearAuthStorage } from './helpers';
@@ -69,8 +68,8 @@ export const useAuthStore = defineStore('auth-store', {
         // 登录成功弹出欢迎提示
         if (route.isInitAuthRoute) {
           window.$notification?.success({
-            title: $t('page.login.common.loginSuccess'),
+            title: '登录成功!',
-            content: $t('page.login.common.welcomeBack', { userName: this.userInfo.userName }),
+            content: `欢迎回来，${this.userInfo.userName}!`,
             duration: 3000
           });
         }

src/store/modules/route/index.ts

@@ -14,7 +14,6 @@ import {
   transformRoutePathToRouteName,
   sortRoutes
 } from '@/utils';
-import { useAppStore } from '../app';
 import { useAuthStore } from '../auth';
 import { useTabStore } from '../tab';
 
@@ -120,10 +119,9 @@ export const useRouteStore = defineStore('route-store', {
       const { error, data } = await fetchUserRoutes(userId);
 
       if (!error) {
-        this.handleAuthRoute(sortRoutes(data.routes));
-        // home相关处理需要在最后，否则会出现找不到主页404的情况
         this.routeHomeName = data.home;
         this.handleUpdateRootRedirect(data.home);
+        this.handleAuthRoute(sortRoutes(data.routes));
 
         initHomeTab(data.home, router);
 
@@ -152,6 +150,7 @@ export const useRouteStore = defineStore('route-store', {
         await this.initStaticRoute();
       }
     },
+
     /** 从缓存路由中去除某个路由 */
     removeCacheRoute(name: AuthRoute.AllRouteKey) {
       const index = this.cacheRoutes.indexOf(name);
@@ -159,30 +158,13 @@ export const useRouteStore = defineStore('route-store', {
         this.cacheRoutes.splice(index, 1);
       }
     },
+
     /** 添加某个缓存路由 */
     addCacheRoute(name: AuthRoute.AllRouteKey) {
       const index = this.cacheRoutes.indexOf(name);
       if (index === -1) {
         this.cacheRoutes.push(name);
       }
-    },
-    /**
-     * 重新缓存路由
-     */
-    async reCacheRoute(name: AuthRoute.AllRouteKey) {
-      const { reloadPage } = useAppStore();
-
-      const isCached = this.cacheRoutes.includes(name);
-
-      if (isCached) {
-        this.removeCacheRoute(name);
-      }
-
-      await reloadPage();
-
-      if (isCached) {
-        this.addCacheRoute(name as AuthRoute.AllRouteKey);
-      }
     }
   }
 });

src/store/modules/tab/index.ts

@@ -1,6 +1,5 @@
 import type { RouteLocationNormalizedLoaded, Router } from 'vue-router';
 import { defineStore } from 'pinia';
-import { useRouteStore } from '@/store';
 import { useRouterPush } from '@/composables';
 import { localStg } from '@/utils';
 import { useThemeStore } from '../theme';
@@ -69,12 +68,8 @@ export const useTabStore = defineStore('tab-store', {
     setActiveTabTitle(title: string) {
       const item = this.tabs.find(tab => tab.fullPath === this.activeTab);
       if (item) {
-        if (item.meta.i18nTitle) {
-          item.meta.i18nTitle = title as I18nType.I18nKey;
-        } else {
         item.meta.title = title;
       }
-      }
     },
     /**
      * 初始化首页页签路由
@@ -120,14 +115,8 @@ export const useTabStore = defineStore('tab-store', {
      * @param fullPath - 路由fullPath
      */
     async removeTab(fullPath: string) {
-      const { reCacheRoute } = useRouteStore();
       const { routerPush } = useRouterPush(false);
 
-      const tabName = this.tabs.find(tab => tab.fullPath === fullPath)?.name as AuthRoute.AllRouteKey | undefined;
-      if (tabName) {
-        await reCacheRoute(tabName);
-      }
-
       const isActive = this.activeTab === fullPath;
       const updateTabs = this.tabs.filter(tab => tab.fullPath !== fullPath);
       if (!isActive) {

src/store/modules/theme/helpers.ts

@@ -1,19 +1,19 @@
 import type { GlobalThemeOverrides } from 'naive-ui';
 import { cloneDeep } from 'lodash-es';
 import { themeSetting } from '@/settings';
-import { sessionStg, addColorAlpha, getColorPalette } from '@/utils';
+import { localStg, addColorAlpha, getColorPalette } from '@/utils';
 
 /** 初始化主题配置 */
 export function initThemeSettings() {
   const isProd = import.meta.env.PROD;
   // 生产环境才缓存主题配置，本地开发实时调整配置更改配置的json
-  const storageSettings = sessionStg.get('themeSettings');
+  const storageSettings = localStg.get('themeSettings');
 
   if (isProd && storageSettings) {
     return storageSettings;
   }
 
-  const themeColor = sessionStg.get('themeColor') || themeSetting.themeColor;
+  const themeColor = localStg.get('themeColor') || themeSetting.themeColor;
   const info = themeSetting.isCustomizeInfoColor ? themeSetting.otherColor.info : getColorPalette(themeColor, 7);
   const otherColor = { ...themeSetting.otherColor, info };
   const setting = cloneDeep({ ...themeSetting, themeColor, otherColor });

src/store/modules/theme/index.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { darkTheme } from 'naive-ui';
-import { sessionStg } from '@/utils';
+import { localStg } from '@/utils';
 import { getNaiveThemeOverrides, initThemeSettings } from './helpers';
 
 type ThemeState = Theme.Setting;
@@ -25,14 +25,14 @@ export const useThemeStore = defineStore('theme-store', {
   actions: {
     /** 重置theme状态 */
     resetThemeStore() {
-      sessionStg.remove('themeSettings');
+      localStg.remove('themeSettings');
       this.$reset();
     },
     /** 缓存主题配置 */
     cacheThemeSettings() {
       const isProd = import.meta.env.PROD;
       if (isProd) {
-        sessionStg.set('themeSettings', this.$state);
+        localStg.set('themeSettings', this.$state);
       }
     },
     /** 设置暗黑模式 */
@@ -43,10 +43,6 @@ export const useThemeStore = defineStore('theme-store', {
     setFollowSystemTheme(visible: boolean) {
       this.followSystemTheme = visible;
     },
-    /** 设置自动跟随系统主题 */
-    setIsCustomizeDarkModeTransition(isCustomize: boolean) {
-      this.isCustomizeDarkModeTransition = isCustomize;
-    },
     /** 自动跟随系统主题 */
     setAutoFollowSystemMode(darkMode: boolean) {
       if (this.followSystemTheme) {

src/store/subscribe/theme.ts

@@ -3,7 +3,7 @@ import { useOsTheme } from 'naive-ui';
 import type { GlobalThemeOverrides } from 'naive-ui';
 import { useElementSize } from '@vueuse/core';
 import { kebabCase } from 'lodash-es';
-import { sessionStg, getColorPalettes, getRgbOfColor } from '@/utils';
+import { localStg, getColorPalettes, getRgbOfColor } from '@/utils';
 import { useThemeStore } from '../modules';
 
 /** 订阅theme store */
@@ -19,7 +19,7 @@ export default function subscribeThemeStore() {
     watch(
       () => theme.themeColor,
       newValue => {
-        sessionStg.set('themeColor', newValue);
+        localStg.set('themeColor', newValue);
       },
       { immediate: true }
     );

src/styles/css/reset.css

@@ -24,21 +24,9 @@ html {
 	-webkit-text-size-adjust: 100%; /* 2 */
 	-moz-tab-size: 4; /* 3 */
 	tab-size: 4; /* 3 */
-	font-family:
+	font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
-		ui-sans-serif,
+		"Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
-		system-ui,
+		"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 4 */
-		-apple-system,
-		BlinkMacSystemFont,
-		"Segoe UI",
-		Roboto,
-		"Helvetica Neue",
-		Arial,
-		"Noto Sans",
-		sans-serif,
-		"Apple Color Emoji",
-		"Segoe UI Emoji",
-		"Segoe UI Symbol",
-		"Noto Color Emoji"; /* 4 */
 }
 
 /*

src/styles/css/transition.css

@@ -25,9 +25,7 @@
 /* fade-bottom */
 .fade-bottom-enter-active,
 .fade-bottom-leave-active {
-	transition:
+	transition: opacity 0.25s, transform 0.3s;
-		opacity 0.25s,
-		transform 0.3s;
 }
 .fade-bottom-enter-from {
 	opacity: 0;
@@ -55,9 +53,7 @@
 /* zoom-fade */
 .zoom-fade-enter-active,
 .zoom-fade-leave-active {
-	transition:
+	transition: transform 0.2s, opacity 0.3s ease-out;
-		transform 0.2s,
-		opacity 0.3s ease-out;
 }
 .zoom-fade-enter-from {
 	opacity: 0;
@@ -71,9 +67,7 @@
 /* zoom-out */
 .zoom-out-enter-active,
 .zoom-out-leave-active {
-	transition:
+	transition: opacity 0.1s ease-in-out, transform 0.15s ease-out;
-		opacity 0.1s ease-in-out,
-		transform 0.15s ease-out;
 }
 .zoom-out-enter-from,
 .zoom-out-leave-to {

src/typings/env.d.ts

@@ -40,13 +40,13 @@ interface ImportMetaEnv {
   /** 路由首页的路径 */
   readonly VITE_ROUTE_HOME_PATH: AuthRoute.RoutePath;
   /** iconify图标作为组件的前缀 */
-  readonly VITE_ICON_PREFIX: string;
+  readonly VITE_ICON_PREFFIX: string;
   /**
-   * 本地SVG图标作为组件的前缀, 请注意一定要包含 VITE_ICON_PREFIX
+   * 本地SVG图标作为组件的前缀, 请注意一定要包含 VITE_ICON_PREFFIX
-   * - 格式 {VITE_ICON_PREFIX}-{本地图标集合名称}
+   * - 格式 {VITE_ICON_PREFFIX}-{本地图标集合名称}
    * - 例如：icon-local
    */
-  readonly VITE_ICON_LOCAL_PREFIX: string;
+  readonly VITE_ICON_LOCAL_PREFFIX: string;
   /** 后端服务的环境类型 */
   readonly VITE_SERVICE_ENV?: ServiceEnvType;
   /** 开启请求代理 */

src/typings/global.d.ts

@@ -5,14 +5,6 @@ interface Window {
   $notification?: import('naive-ui').NotificationProviderInst;
 }
 
-interface ViewTransition {
-  ready: Promise<void>;
-}
-
-interface Document {
-  startViewTransition?: (callback: () => Promise<void> | void) => ViewTransition;
-}
-
 /** 通用类型 */
 declare namespace Common {
   /**

src/typings/route.d.ts

@@ -32,7 +32,7 @@ declare namespace AuthRoute {
     /** 路由标题(可用来作document.title或者菜单的名称) */
     title: string;
     /** 用来支持多国语言 如果i18nTitle和title同时存在优先使用i18nTitle */
-    i18nTitle?: I18nType.I18nKey;
+    i18nTitle?: string;
     /** 路由的动态路径(需要动态路径的页面需要将path添加进范型参数) */
     dynamicPath?: AuthRouteUtils.GetDynamicPath<K>;
     /** 作为单级路由的父级路由布局组件 */

src/typings/storage.d.ts

@@ -1,23 +1,24 @@
 declare namespace StorageInterface {
   /** localStorage的存储数据的类型 */
   interface Session {
-    /** 主题颜色 */
+    demoKey: string;
-    themeColor: string;
-    /** 主题配置 */
-    themeSettings: Theme.Setting;
   }
 
   /** localStorage的存储数据的类型 */
   interface Local {
+    /** 主题颜色 */
+    themeColor: string;
     /** 用户token */
     token: string;
     /** 用户刷新token */
     refreshToken: string;
     /** 用户信息 */
     userInfo: Auth.UserInfo;
+    /** 主题配置 */
+    themeSettings: Theme.Setting;
     /** 多页签路由信息 */
     multiTabRoutes: App.GlobalTabRoute[];
     /** 本地语言缓存 */
-    lang: I18nType.LangType;
+    lang: I18nType.langType;
   }
 }

src/typings/system.d.ts

@@ -90,8 +90,6 @@ declare namespace Theme {
     darkMode: boolean;
     /** 是否自动跟随系统主题 */
     followSystemTheme: boolean;
-    /** 自定义暗黑动画过渡 */
-    isCustomizeDarkModeTransition: boolean;
     /** 布局样式 */
     layout: Layout;
     /** 滚动模式 */
@@ -244,7 +242,7 @@ declare namespace App {
     routePath: string;
     icon?: () => import('vue').VNodeChild;
     children?: GlobalMenuOption[];
-    i18nTitle?: I18nType.I18nKey;
+    i18nTitle?: string;
   };
 
   /** 面包屑 */
@@ -255,8 +253,8 @@ declare namespace App {
     routeName: string;
     hasChildren: boolean;
     icon?: import('vue').Component;
-    i18nTitle?: I18nType.I18nKey;
+    i18nTitle?: string;
-    options?: (import('naive-ui/es/dropdown/src/interface').DropdownMixedOption & { i18nTitle?: I18nType.I18nKey })[];
+    options?: (import('naive-ui/es/dropdown/src/interface').DropdownMixedOption & { i18nTitle?: string })[];
   };
 
   /** 多页签Tab的路由 */
@@ -304,25 +302,12 @@ declare namespace App {
 }
 
 declare namespace I18nType {
-  type LangType = 'en' | 'zh-CN' | 'km-KH';
+  type langType = 'en' | 'zh-CN' | 'km-KH';
 
-  type Schema = {
+  interface Schema {
     system: {
       title: string;
     };
-    common: {
-      add: string;
-      addSuccess: string;
-      edit: string;
-      editSuccess: string;
-      delete: string;
-      deleteSuccess: string;
-      batchDelete: string;
-      confirm: string;
-      cancel: string;
-      pleaseCheckValue: string;
-      action: string;
-    };
     routes: {
       dashboard: {
         _value: string;
@@ -373,9 +358,9 @@ declare namespace I18nType {
       };
       exception: {
         _value: string;
-        '403': string;
+        403: string;
-        '404': string;
+        404: string;
-        '500': string;
+        500: string;
       };
       'multi-menu': {
         _value: string;
@@ -397,138 +382,5 @@ declare namespace I18nType {
       };
       about: string;
     };
-    layout: {
+  }
-      settingDrawer: {
-        title: string;
-        themeModeTitle: string;
-        darkMode: string;
-        layoutModelTitle: string;
-        systemThemeTitle: string;
-        pageFunctionsTitle: string;
-        pageViewTitle: string;
-        followSystemTheme: string;
-        isCustomizeDarkModeTransition: string;
-        scrollMode: string;
-        scrollModeList: {
-          wrapper: string;
-          content: string;
-        };
-        fixedHeaderAndTab: string;
-        header: {
-          inverted: string;
-          height: string;
-          crumb: {
-            visible: string;
-            icon: string;
-          };
-        };
-        tab: {
-          visible: string;
-          height: string;
-          modeList: {
-            mode: string;
-            chrome: string;
-            button: string;
-          };
-          isCache: string;
-        };
-        sider: {
-          inverted: string;
-          width: string;
-          mixWidth: string;
-        };
-        menu: {
-          horizontalPosition: string;
-          horizontalPositionList: {
-            flexStart: string;
-            center: string;
-            flexEnd: string;
-          };
-        };
-        footer: {
-          inverted: string;
-          visible: string;
-          fixed: string;
-          right: string;
-        };
-        page: {
-          animate: string;
-          animateMode: string;
-          animateModeList: {
-            zoomFade: string;
-            zoomOut: string;
-            fadeSlide: string;
-            fade: string;
-            fadeBottom: string;
-            fadeScale: string;
-          };
-        };
-        systemTheme: {
-          moreColors: string;
-        };
-        themeConfiguration: {
-          title: string;
-          copy: string;
-          reset: string;
-          resetSuccess: string;
-          operateSuccess: string;
-          copySuccess: string;
-          confirmCopy: string;
-        };
-      };
-    };
-    page: {
-      login: {
-        common: {
-          userNamePlaceholder: string;
-          phonePlaceholder: string;
-          codePlaceholder: string;
-          passwordPlaceholder: string;
-          confirmPasswordPlaceholder: string;
-          codeLogin: string;
-          confirm: string;
-          back: string;
-          validateSuccess: string;
-          loginSuccess: string;
-          welcomeBack: string;
-        };
-        pwdLogin: {
-          title: string;
-          rememberMe: string;
-          forgetPassword: string;
-          register: string;
-          otherAccountLogin: string;
-          otherLoginMode: string;
-          superAdmin: string;
-          admin: string;
-          user: string;
-        };
-        codeLogin: {
-          title: string;
-          getCode: string;
-          imageCodePlaceholder: string;
-        };
-        register: {
-          title: string;
-          agreement: string;
-          protocol: string;
-          policy: string;
-        };
-        resetPwd: {
-          title: string;
-        };
-        bindWeChat: {
-          title: string;
-        };
-      };
-    };
-  };
-
-  type GetI18nKey<T extends Record<string, unknown>, K extends keyof T = keyof T> = K extends string
-    ? T[K] extends Record<string, unknown>
-      ? `${K}.${GetI18nKey<T[K]>}`
-      : K
-    : never;
-
-  type I18nKey = GetI18nKey<Schema>;
 }

src/utils/common/color.ts

@@ -77,9 +77,9 @@ const darkColorMap = [
  * @param darkThemeMixColor - 暗黑主题的混合颜色，默认 #141414
  */
 export function getColorPalettes(color: AnyColor, darkTheme = false, darkThemeMixColor = '#141414'): string[] {
-  const indexes: ColorIndex[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+  const indexs: ColorIndex[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
-  const patterns = indexes.map(index => getColorPalette(color, index));
+  const patterns = indexs.map(index => getColorPalette(color, index));
 
   if (darkTheme) {
     const darkPatterns = darkColorMap.map(({ index, opacity }) => {

src/utils/crypto/index.ts

@@ -6,7 +6,7 @@ const CryptoSecret = '__CryptoJS_Secret__';
  * 加密数据
  * @param data - 数据
  */
-export function encrypt(data: any) {
+export function encrypto(data: any) {
   const newData = JSON.stringify(data);
   return CryptoJS.AES.encrypt(newData, CryptoSecret).toString();
 }
@@ -15,7 +15,7 @@ export function encrypt(data: any) {
  * 解密数据
  * @param cipherText - 密文
  */
-export function decrypt(cipherText: string) {
+export function decrypto(cipherText: string) {
   const bytes = CryptoJS.AES.decrypt(cipherText, CryptoSecret);
   const originalText = bytes.toString(CryptoJS.enc.Utf8);
   if (originalText) {

src/utils/router/menu.ts

@@ -1,5 +1,5 @@
 import { useIconRender } from '@/composables';
-import { $t } from '@/locales';
+import { t } from '@/locales';
 
 /**
  * 将权限路由转换成菜单
@@ -50,7 +50,7 @@ export function translateMenuLabel(menus: App.GlobalMenuOption[]): App.GlobalMen
     const menuItem: App.GlobalMenuOption = {
       ...menu,
       children: menuChildren,
-      label: menu.i18nTitle ? $t(menu.i18nTitle) : menu.label
+      label: menu.i18nTitle ? t(menu.i18nTitle) : menu.label
     };
     globalMenu.push(menuItem);
   });

src/utils/service/transform.ts

@@ -1,4 +1,4 @@
-import { stringify } from 'qs';
+import qs from 'qs';
 import FormData from 'form-data';
 import { isArray, isFile } from '../common';
 
@@ -12,7 +12,7 @@ export async function transformRequestData(requestData: any, contentType?: Union
   let data = requestData;
   // form类型转换
   if (contentType === 'application/x-www-form-urlencoded') {
-    data = stringify(requestData);
+    data = qs.stringify(requestData);
   }
   // form-data类型转换
   if (contentType === 'multipart/form-data') {

src/utils/storage/local.ts

@@ -1,4 +1,4 @@
-import { decrypt, encrypt } from '../crypto';
+import { decrypto, encrypto } from '../crypto';
 interface StorageData<T> {
   value: T;
   expire: number | null;
@@ -13,7 +13,7 @@ function createLocalStorage<T extends StorageInterface.Local = StorageInterface.
       value,
       expire: expire !== null ? new Date().getTime() + expire * 1000 : null
     };
-    const json = encrypt(storageData);
+    const json = encrypto(storageData);
     window.localStorage.setItem(key as string, json);
   }
 
@@ -22,7 +22,7 @@ function createLocalStorage<T extends StorageInterface.Local = StorageInterface.
     if (json) {
       let storageData: StorageData<T[K]> | null = null;
       try {
-        storageData = decrypt(json);
+        storageData = decrypto(json);
       } catch {
         // 防止解析失败
       }

src/utils/storage/session.ts

@@ -1,8 +1,8 @@
-import { decrypt, encrypt } from '../crypto';
+import { decrypto, encrypto } from '../crypto';
 
 function createSessionStorage<T extends StorageInterface.Session = StorageInterface.Session>() {
   function set<K extends keyof T>(key: K, value: T[K]) {
-    const json = encrypt(value);
+    const json = encrypto(value);
     sessionStorage.setItem(key as string, json);
   }
   function get<K extends keyof T>(key: K) {
@@ -10,7 +10,7 @@ function createSessionStorage<T extends StorageInterface.Session = StorageInterf
     let data: T[K] | null = null;
     if (json) {
       try {
-        data = decrypt(json);
+        data = decrypto(json);
       } catch {
         // 防止解析失败
       }

src/views/_builtin/constant-page/index.vue

@@ -4,7 +4,7 @@
     <router-link :to="{ name: routeHomePath }">
       <n-button type="primary">回到首页</n-button>
     </router-link>
-    <n-card :bordered="false" size="small" class="mt-24px rounded-8px shadow-sm">
+    <n-card :bordered="false" size="small" class="mt-24px rounded-16px shadow-sm">
       <div class="flex-center py-12px">
         <n-button type="primary" class="mr-24px" :disabled="isMoving" @click="startMove">开始</n-button>
         <n-button type="error" @click="endMove">暂停</n-button>

src/views/_builtin/login/components/bind-wechat/index.vue

@@ -1,11 +1,11 @@
 <template>
   <n-form ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
     <n-form-item path="phone">
-      <n-input v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
+      <n-input v-model:value="model.phone" placeholder="手机号码" />
     </n-form-item>
     <n-form-item path="code">
       <div class="flex-y-center w-full">
-        <n-input v-model:value="model.code" :placeholder="$t('page.login.common.codePlaceholder')" />
+        <n-input v-model:value="model.code" placeholder="验证码" />
         <div class="w-18px"></div>
         <n-button size="large" :disabled="isCounting" :loading="smsLoading" @click="handleSmsCode">
           {{ label }}
@@ -13,12 +13,8 @@
       </div>
     </n-form-item>
     <n-space :vertical="true" size="large">
-      <n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">
+      <n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
-        {{ $t('page.login.common.confirm') }}
+      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">返回</n-button>
-      </n-button>
-      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">
-        {{ $t('page.login.common.back') }}
-      </n-button>
     </n-space>
   </n-form>
 </template>
@@ -29,7 +25,6 @@ import type { FormInst } from 'naive-ui';
 import { useRouterPush } from '@/composables';
 import { useSmsCode } from '@/hooks';
 import { formRules } from '@/utils';
-import { $t } from '@/locales';
 
 const { toLoginModule } = useRouterPush();
 const { label, isCounting, loading: smsLoading, getSmsCode } = useSmsCode();
@@ -53,7 +48,7 @@ function handleSmsCode() {
 
 async function handleSubmit() {
   await formRef.value?.validate();
-  window.$message?.success($t('page.login.common.validateSuccess'));
+  window.$message?.success('验证成功!');
 }
 </script>
 

src/views/_builtin/login/components/code-login/index.vue

@@ -1,11 +1,11 @@
 <template>
   <n-form ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
     <n-form-item path="phone">
-      <n-input v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
+      <n-input v-model:value="model.phone" placeholder="手机号码" />
     </n-form-item>
     <n-form-item path="code">
       <div class="flex-y-center w-full">
-        <n-input v-model:value="model.code" :placeholder="$t('page.login.common.codePlaceholder')" />
+        <n-input v-model:value="model.code" placeholder="验证码" />
         <div class="w-18px"></div>
         <n-button size="large" :disabled="isCounting" :loading="smsLoading" @click="handleSmsCode">
           {{ label }}
@@ -13,7 +13,7 @@
       </div>
     </n-form-item>
     <n-form-item path="imgCode">
-      <n-input v-model:value="model.imgCode" :placeholder="$t('page.login.codeLogin.imageCodePlaceholder')" />
+      <n-input v-model:value="model.imgCode" placeholder="验证码,点击图片刷新" />
       <div class="pl-8px">
         <image-verify v-model:code="imgCode" />
       </div>
@@ -27,11 +27,9 @@
         :loading="auth.loginLoading"
         @click="handleSubmit"
       >
-        {{ $t('page.login.common.confirm') }}
+        确定
-      </n-button>
-      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">
-        {{ $t('page.login.common.back') }}
       </n-button>
+      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">返回</n-button>
     </n-space>
   </n-form>
 </template>
@@ -43,7 +41,6 @@ import { useAuthStore } from '@/store';
 import { useRouterPush } from '@/composables';
 import { useSmsCode } from '@/hooks';
 import { formRules, getImgCodeRule } from '@/utils';
-import { $t } from '@/locales';
 
 const auth = useAuthStore();
 const { toLoginModule } = useRouterPush();
@@ -71,7 +68,7 @@ function handleSmsCode() {
 
 async function handleSubmit() {
   await formRef.value?.validate();
-  window.$message?.success($t('page.login.common.validateSuccess'));
+  window.$message?.success('验证成功!');
 }
 </script>
 

src/views/_builtin/login/components/pwd-login/components/other-account.vue

@@ -1,6 +1,6 @@
 <template>
   <n-space :vertical="true">
-    <n-divider class="!mb-0 text-14px text-#666">{{ $t('page.login.pwdLogin.otherAccountLogin') }}</n-divider>
+    <n-divider class="!mb-0 text-14px text-#666">其他账户登录</n-divider>
     <n-space justify="center">
       <n-button
         v-for="item in accounts"
@@ -15,38 +15,25 @@
 </template>
 
 <script lang="ts" setup>
-import { userRoleLabels } from '@/constants';
-import { $t } from '@/locales';
-
 interface Emits {
   (e: 'login', param: { userName: string; password: string }): void;
 }
 
 const emit = defineEmits<Emits>();
 
-interface Account {
+const accounts = [
-  key: Auth.RoleType;
-  label: string;
-  userName: string;
-  password: string;
-}
-
-const accounts: Account[] = [
   {
-    key: 'super',
+    label: '超级管理员',
-    label: userRoleLabels.super,
     userName: 'Super',
     password: 'super123'
   },
   {
-    key: 'admin',
+    label: '管理员',
-    label: userRoleLabels.admin,
     userName: 'Admin',
     password: 'admin123'
   },
   {
-    key: 'user',
+    label: '普通用户',
-    label: userRoleLabels.user,
     userName: 'User01',
     password: 'user01123'
   }

src/views/_builtin/login/components/pwd-login/components/other-login.vue

@@ -1,6 +1,6 @@
 <template>
   <n-space :vertical="true">
-    <n-divider class="!mb-0 text-14px text-#666">{{ $t('page.login.pwdLogin.otherLoginMode') }}</n-divider>
+    <n-divider class="!mb-0 text-14px text-#666">其他登录方式</n-divider>
     <div class="flex-center">
       <n-button :text="true">
         <icon-mdi-wechat class="text-22px text-#888 hover:text-#52BF5E" />
@@ -9,8 +9,6 @@
   </n-space>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup></script>
-import { $t } from '@/locales';
-</script>
 
 <style scoped></style>

src/views/_builtin/login/components/pwd-login/index.vue

@@ -1,22 +1,15 @@
 <template>
   <n-form ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
     <n-form-item path="userName">
-      <n-input v-model:value="model.userName" :placeholder="$t('page.login.common.userNamePlaceholder')" />
+      <n-input v-model:value="model.userName" placeholder="请输入用户名" />
     </n-form-item>
     <n-form-item path="password">
-      <n-input
+      <n-input v-model:value="model.password" type="password" show-password-on="click" placeholder="请输入密码" />
-        v-model:value="model.password"
-        type="password"
-        show-password-on="click"
-        :placeholder="$t('page.login.common.passwordPlaceholder')"
-      />
     </n-form-item>
     <n-space :vertical="true" :size="24">
       <div class="flex-y-center justify-between">
-        <n-checkbox v-model:checked="rememberMe">{{ $t('page.login.pwdLogin.rememberMe') }}</n-checkbox>
+        <n-checkbox v-model:checked="rememberMe">记住我</n-checkbox>
-        <n-button :text="true" @click="toLoginModule('reset-pwd')">
+        <n-button :text="true" @click="toLoginModule('reset-pwd')">忘记密码？</n-button>
-          {{ $t('page.login.pwdLogin.forgetPassword') }}
-        </n-button>
       </div>
       <n-button
         type="primary"
@@ -26,7 +19,7 @@
         :loading="auth.loginLoading"
         @click="handleSubmit"
       >
-        {{ $t('page.login.common.confirm') }}
+        确定
       </n-button>
       <div class="flex-y-center justify-between">
         <n-button class="flex-1" :block="true" @click="toLoginModule('code-login')">

src/views/_builtin/login/components/register-user/index.vue

@@ -1,11 +1,11 @@
 <template>
   <n-form ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
     <n-form-item path="phone">
-      <n-input v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
+      <n-input v-model:value="model.phone" placeholder="手机号码" />
     </n-form-item>
     <n-form-item path="code">
       <div class="flex-y-center w-full">
-        <n-input v-model:value="model.code" :placeholder="$t('page.login.common.codePlaceholder')" />
+        <n-input v-model:value="model.code" placeholder="验证码" />
         <div class="w-18px"></div>
         <n-button size="large" :disabled="isCounting" :loading="smsLoading" @click="handleSmsCode">
           {{ label }}
@@ -13,29 +13,15 @@
       </div>
     </n-form-item>
     <n-form-item path="pwd">
-      <n-input
+      <n-input v-model:value="model.pwd" type="password" show-password-on="click" placeholder="密码" />
-        v-model:value="model.pwd"
-        type="password"
-        show-password-on="click"
-        :placeholder="$t('page.login.common.passwordPlaceholder')"
-      />
     </n-form-item>
     <n-form-item path="confirmPwd">
-      <n-input
+      <n-input v-model:value="model.confirmPwd" type="password" show-password-on="click" placeholder="确认密码" />
-        v-model:value="model.confirmPwd"
-        type="password"
-        show-password-on="click"
-        :placeholder="$t('page.login.common.confirmPasswordPlaceholder')"
-      />
     </n-form-item>
     <n-space :vertical="true" :size="18">
       <login-agreement v-model:value="agreement" />
-      <n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">
+      <n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
-        {{ $t('page.login.common.confirm') }}
+      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">返回</n-button>
-      </n-button>
-      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">
-        {{ $t('page.login.common.back') }}
-      </n-button>
     </n-space>
   </n-form>
 </template>
@@ -46,7 +32,6 @@ import type { FormInst, FormRules } from 'naive-ui';
 import { useRouterPush } from '@/composables';
 import { useSmsCode } from '@/hooks';
 import { formRules, getConfirmPwdRule } from '@/utils';
-import { $t } from '@/locales';
 
 const { toLoginModule } = useRouterPush();
 const { label, isCounting, loading: smsLoading, start } = useSmsCode();
@@ -75,7 +60,7 @@ function handleSmsCode() {
 
 async function handleSubmit() {
   await formRef.value?.validate();
-  window.$message?.success($t('page.login.common.validateSuccess'));
+  window.$message?.success('验证成功!');
 }
 </script>
 

src/views/_builtin/login/components/reset-pwd/index.vue

@@ -1,11 +1,11 @@
 <template>
   <n-form ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
     <n-form-item path="phone">
-      <n-input v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
+      <n-input v-model:value="model.phone" placeholder="手机号码" />
     </n-form-item>
     <n-form-item path="code">
       <div class="flex-y-center w-full">
-        <n-input v-model:value="model.code" :placeholder="$t('page.login.common.codePlaceholder')" />
+        <n-input v-model:value="model.code" placeholder="验证码" />
         <div class="w-18px"></div>
         <n-button size="large" :disabled="isCounting" :loading="smsLoading" @click="handleSmsCode">
           {{ label }}
@@ -13,28 +13,14 @@
       </div>
     </n-form-item>
     <n-form-item path="pwd">
-      <n-input
+      <n-input v-model:value="model.pwd" type="password" show-password-on="click" placeholder="密码" />
-        v-model:value="model.pwd"
-        type="password"
-        show-password-on="click"
-        :placeholder="$t('page.login.common.passwordPlaceholder')"
-      />
     </n-form-item>
     <n-form-item path="confirmPwd">
-      <n-input
+      <n-input v-model:value="model.confirmPwd" type="password" show-password-on="click" placeholder="确认密码" />
-        v-model:value="model.confirmPwd"
-        type="password"
-        show-password-on="click"
-        :placeholder="$t('page.login.common.confirmPasswordPlaceholder')"
-      />
     </n-form-item>
     <n-space :vertical="true" size="large">
-      <n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">
+      <n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
-        {{ $t('page.login.common.confirm') }}
+      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">返回</n-button>
-      </n-button>
-      <n-button size="large" :block="true" :round="true" @click="toLoginModule('pwd-login')">
-        {{ $t('page.login.common.back') }}
-      </n-button>
     </n-space>
   </n-form>
 </template>
@@ -45,7 +31,6 @@ import type { FormInst, FormRules } from 'naive-ui';
 import { useRouterPush } from '@/composables';
 import { useSmsCode } from '@/hooks';
 import { formRules, getConfirmPwdRule } from '@/utils';
-import { $t } from '@/locales';
 
 const { toLoginModule } = useRouterPush();
 const { label, isCounting, loading: smsLoading, start } = useSmsCode();
@@ -72,7 +57,7 @@ function handleSmsCode() {
 
 async function handleSubmit() {
   await formRef.value?.validate();
-  window.$message?.success($t('page.login.common.validateSuccess'));
+  window.$message?.success('验证成功!');
 }
 </script>
 

src/views/_builtin/login/index.vue

@@ -9,7 +9,7 @@
       <div class="w-300px sm:w-360px">
         <header class="flex-y-center justify-between">
           <system-logo class="text-64px text-primary" />
-          <n-gradient-text type="primary" :size="28">{{ $t('system.title') }}</n-gradient-text>
+          <n-gradient-text type="primary" :size="28">{{ title }}</n-gradient-text>
         </header>
         <main class="pt-24px">
           <h3 class="text-18px text-primary font-medium">{{ activeModule.label }}</h3>
@@ -30,8 +30,8 @@ import { computed } from 'vue';
 import type { Component } from 'vue';
 import { loginModuleLabels } from '@/constants';
 import { useThemeStore } from '@/store';
+import { useAppInfo } from '@/composables';
 import { getColorPalette, mixColor } from '@/utils';
-import { $t } from '@/locales';
 import { BindWechat, CodeLogin, LoginBg, PwdLogin, Register, ResetPwd } from './components';
 
 interface Props {
@@ -42,6 +42,7 @@ interface Props {
 const props = defineProps<Props>();
 
 const theme = useThemeStore();
+const { title } = useAppInfo();
 
 interface LoginModule {
   key: UnionKey.LoginModule;

src/views/multi-menu/first/second-new/third/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="h-full">
-    <n-card title="多级菜单 - 三级菜单" :bordered="false" class="h-full rounded-8px shadow-sm"></n-card>
+    <n-card title="多级菜单 - 三级菜单" class="h-full shadow-sm rounded-16px"></n-card>
   </div>
 </template>
 

src/views/multi-menu/first/second/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="h-full">
-    <n-card title="多级菜单 - 二级菜单" :bordered="false" class="h-full rounded-8px shadow-sm"></n-card>
+    <n-card title="多级菜单 - 二级菜单" class="h-full shadow-sm rounded-16px"></n-card>
   </div>
 </template>
 

vite.config.ts

@@ -16,7 +16,8 @@ export default defineConfig(configEnv => {
     resolve: {
       alias: {
         '~': rootPath,
-        '@': srcPath
+        '@': srcPath,
+        'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
       }
     },
     plugins: setupVitePlugins(viteEnv),