From da63d23fe98563afbe14f97852718e5347f23bba Mon Sep 17 00:00:00 2001
From: buqiyuan <1743369777@qq.com>
Date: Fri, 22 Mar 2024 08:36:16 +0800
Subject: [PATCH] refactor: optimize menu and route code logic

---
 .gitignore                                    |   3 +-
 package.json                                  |   4 +-
 pnpm-lock.yaml                                | 298 ++++++++++--------
 src/App.vue                                   |  11 -
 .../header/components/breadcrumb/index.vue    |  35 +-
 .../header/components/setting/constant.ts     |   8 +
 .../header/components/setting/index.vue       |  14 +-
 src/layout/header/index.vue                   |   5 +-
 src/layout/menu/menu.vue                      |  50 +--
 src/layout/tabs/tabs-view.vue                 |  18 +-
 src/router/helper/routeHelper.tsx             |  27 +-
 src/router/router-guards.ts                   |  24 +-
 src/router/routes/modules/demos.ts            |   6 +-
 src/store/modules/layoutSetting.ts            |   3 +
 src/views/account/about.vue                   |   8 -
 src/views/demos/nested-routes/index.vue       |  28 +-
 src/views/demos/nested-routes/route-one.vue   |   7 +-
 src/views/demos/nested-routes/route-three.vue |   7 +-
 src/views/demos/nested-routes/route-two.vue   |   7 +-
 types/global.d.ts                             |   2 +-
 types/modules.d.ts                            |   4 +-
 types/shims/shims-tsx.d.ts                    |   3 +-
 types/vue-router.d.ts                         |   8 +-
 23 files changed, 309 insertions(+), 271 deletions(-)

diff --git a/.gitignore b/.gitignore
index 142d1acfc..ee85ded84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ dist
 .cache
 .turbo
 .nx
+.nx/cache
 
 tests/server/static
 tests/server/static/upload
@@ -33,5 +34,3 @@ yarn-error.log*
 types/auto-imports.d.ts
 types/components.d.ts
 
-
-.nx/cache
\ No newline at end of file
diff --git a/package.json b/package.json
index 1d88dd9a5..6c743ab1d 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "less": "~4.2.0",
     "lint-staged": "~15.2.2",
     "msw": "^2.2.9",
-    "postcss": "~8.4.37",
+    "postcss": "~8.4.38",
     "postcss-html": "~1.6.0",
     "postcss-less": "~6.0.0",
     "prettier": "~3.2.5",
@@ -114,7 +114,7 @@
     "stylelint-config-standard": "~36.0.0",
     "stylelint-order": "~6.0.4",
     "stylelint-prettier": "^5.0.0",
-    "typescript": "~5.4.2",
+    "typescript": "~5.4.3",
     "unocss": "^0.58.6",
     "unplugin-vue-components": "~0.26.0",
     "vite": "~5.2.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 17ac636b2..13d1d671c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,7 +49,7 @@ importers:
         version: 1.0.0-1
       pinia:
         specifier: ~2.1.7
-        version: 2.1.7(typescript@5.4.2)(vue@3.4.21)
+        version: 2.1.7(typescript@5.4.3)(vue@3.4.21)
       pinia-plugin-persistedstate:
         specifier: ^3.2.1
         version: 3.2.1(pinia@2.1.7)
@@ -67,7 +67,7 @@ importers:
         version: 6.8.3
       vue:
         specifier: ~3.4.21
-        version: 3.4.21(typescript@5.4.2)
+        version: 3.4.21(typescript@5.4.3)
       vue-echarts:
         specifier: ^6.6.9
         version: 6.6.9(echarts@5.5.0)(vue@3.4.21)
@@ -98,7 +98,7 @@ importers:
         version: link:packages/vite-plugin-tinymce-resource
       '@commitlint/cli':
         specifier: ~19.2.1
-        version: 19.2.1(@types/node@20.11.30)(typescript@5.4.2)
+        version: 19.2.1(@types/node@20.11.30)(typescript@5.4.3)
       '@commitlint/config-conventional':
         specifier: ~19.1.0
         version: 19.1.0
@@ -128,10 +128,10 @@ importers:
         version: 1.15.8
       '@typescript-eslint/eslint-plugin':
         specifier: ~7.3.1
-        version: 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.2)
+        version: 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3)
       '@typescript-eslint/parser':
         specifier: ~7.3.1
-        version: 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+        version: 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       '@umijs/openapi':
         specifier: ^1.11.1
         version: 1.11.1
@@ -146,7 +146,7 @@ importers:
         version: 0.5.1
       commitizen:
         specifier: ~4.3.0
-        version: 4.3.0(@types/node@20.11.30)(typescript@5.4.2)
+        version: 4.3.0(@types/node@20.11.30)(typescript@5.4.3)
       conventional-changelog-cli:
         specifier: ~4.1.0
         version: 4.1.0
@@ -188,19 +188,19 @@ importers:
         version: 15.2.2
       msw:
         specifier: ^2.2.9
-        version: 2.2.9(typescript@5.4.2)
+        version: 2.2.9(typescript@5.4.3)
       nx:
         specifier: 18.1.2
         version: 18.1.2
       postcss:
-        specifier: ~8.4.37
-        version: 8.4.37
+        specifier: ~8.4.38
+        version: 8.4.38
       postcss-html:
         specifier: ~1.6.0
         version: 1.6.0
       postcss-less:
         specifier: ~6.0.0
-        version: 6.0.0(postcss@8.4.37)
+        version: 6.0.0(postcss@8.4.38)
       prettier:
         specifier: ~3.2.5
         version: 3.2.5
@@ -212,7 +212,7 @@ importers:
         version: 5.0.5
       stylelint:
         specifier: ~16.2.1
-        version: 16.2.1(typescript@5.4.2)
+        version: 16.2.1(typescript@5.4.3)
       stylelint-config-property-sort-order-smacss:
         specifier: ^10.0.0
         version: 10.0.0(stylelint@16.2.1)
@@ -232,11 +232,11 @@ importers:
         specifier: ^5.0.0
         version: 5.0.0(prettier@3.2.5)(stylelint@16.2.1)
       typescript:
-        specifier: ~5.4.2
-        version: 5.4.2
+        specifier: ~5.4.3
+        version: 5.4.3
       unocss:
         specifier: ^0.58.6
-        version: 0.58.6(postcss@8.4.37)(vite@5.2.2)
+        version: 0.58.6(postcss@8.4.38)(vite@5.2.2)
       unplugin-vue-components:
         specifier: ~0.26.0
         version: 0.26.0(vue@3.4.21)
@@ -245,7 +245,7 @@ importers:
         version: 5.2.2(@types/node@20.11.30)(less@4.2.0)
       vite-plugin-checker:
         specifier: ~0.6.4
-        version: 0.6.4(eslint@8.57.0)(stylelint@16.2.1)(typescript@5.4.2)(vite@5.2.2)(vue-tsc@1.8.27)
+        version: 0.6.4(eslint@8.57.0)(stylelint@16.2.1)(typescript@5.4.3)(vite@5.2.2)(vue-tsc@1.8.27)
       vite-plugin-inspect:
         specifier: ^0.8.3
         version: 0.8.3(vite@5.2.2)
@@ -260,7 +260,7 @@ importers:
         version: 9.4.2(eslint@8.57.0)
       vue-tsc:
         specifier: ~1.8.27
-        version: 1.8.27(typescript@5.4.2)
+        version: 1.8.27(typescript@5.4.3)
 
   packages/components:
     dependencies:
@@ -285,14 +285,14 @@ importers:
         version: 4.0.3
       msw:
         specifier: ^2.0.0
-        version: 2.2.9(typescript@5.4.2)
+        version: 2.2.9(typescript@5.4.3)
       strict-event-emitter:
         specifier: ^0.5.1
         version: 0.5.1
     devDependencies:
       tsup:
         specifier: ^8.0.2
-        version: 8.0.2(postcss@8.4.37)(typescript@5.4.2)
+        version: 8.0.2(postcss@8.4.38)(typescript@5.4.3)
 
   packages/vite-plugin-tinymce-resource:
     dependencies:
@@ -332,7 +332,7 @@ packages:
     dependencies:
       '@ant-design/colors': 6.0.0
       '@ant-design/icons-svg': 4.4.2
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /@antfu/install-pkg@0.1.1:
@@ -1692,14 +1692,14 @@ packages:
     dependencies:
       statuses: 2.0.1
 
-  /@commitlint/cli@19.2.1(@types/node@20.11.30)(typescript@5.4.2):
+  /@commitlint/cli@19.2.1(@types/node@20.11.30)(typescript@5.4.3):
     resolution: {integrity: sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg==}
     engines: {node: '>=v18'}
     hasBin: true
     dependencies:
       '@commitlint/format': 19.0.3
       '@commitlint/lint': 19.1.0
-      '@commitlint/load': 19.2.0(@types/node@20.11.30)(typescript@5.4.2)
+      '@commitlint/load': 19.2.0(@types/node@20.11.30)(typescript@5.4.3)
       '@commitlint/read': 19.2.1
       '@commitlint/types': 19.0.3
       execa: 8.0.1
@@ -1768,7 +1768,7 @@ packages:
       '@commitlint/types': 19.0.3
     dev: true
 
-  /@commitlint/load@19.2.0(@types/node@20.11.30)(typescript@5.4.2):
+  /@commitlint/load@19.2.0(@types/node@20.11.30)(typescript@5.4.3):
     resolution: {integrity: sha512-XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ==}
     engines: {node: '>=v18'}
     dependencies:
@@ -1777,8 +1777,8 @@ packages:
       '@commitlint/resolve-extends': 19.1.0
       '@commitlint/types': 19.0.3
       chalk: 5.3.0
-      cosmiconfig: 9.0.0(typescript@5.4.2)
-      cosmiconfig-typescript-loader: 5.0.0(@types/node@20.11.30)(cosmiconfig@9.0.0)(typescript@5.4.2)
+      cosmiconfig: 9.0.0(typescript@5.4.3)
+      cosmiconfig-typescript-loader: 5.0.0(@types/node@20.11.30)(cosmiconfig@9.0.0)(typescript@5.4.3)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -2448,7 +2448,7 @@ packages:
       vue: '>=3'
     dependencies:
       '@iconify/types': 2.0.0
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /@inquirer/confirm@3.1.0:
@@ -2971,7 +2971,7 @@ packages:
     dependencies:
       '@babel/core': 7.24.3
       postcss: 7.0.39
-      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.37)
+      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.38)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -2984,7 +2984,7 @@ packages:
       postcss-syntax: '>=0.36.2'
     dependencies:
       postcss: 7.0.39
-      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.37)
+      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.38)
       remark: 13.0.0
       unist-util-find-all-after: 3.0.2
     transitivePeerDependencies:
@@ -2997,7 +2997,7 @@ packages:
       vue: ^3.0.0
     dependencies:
       tinymce: 6.8.3
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /@trysound/sax@0.2.0:
@@ -3141,7 +3141,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.2):
+  /@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3):
     resolution: {integrity: sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
@@ -3153,10 +3153,10 @@ packages:
         optional: true
     dependencies:
       '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       '@typescript-eslint/scope-manager': 7.3.1
-      '@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
-      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
+      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       '@typescript-eslint/visitor-keys': 7.3.1
       debug: 4.3.4
       eslint: 8.57.0
@@ -3164,8 +3164,8 @@ packages:
       ignore: 5.3.1
       natural-compare: 1.4.0
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.4.2)
-      typescript: 5.4.2
+      ts-api-utils: 1.3.0(typescript@5.4.3)
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3208,7 +3208,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.2):
+  /@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3):
     resolution: {integrity: sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
@@ -3220,11 +3220,11 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 7.3.1
       '@typescript-eslint/types': 7.3.1
-      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.2)
+      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
       '@typescript-eslint/visitor-keys': 7.3.1
       debug: 4.3.4
       eslint: 8.57.0
-      typescript: 5.4.2
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3273,7 +3273,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.2):
+  /@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.3):
     resolution: {integrity: sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
@@ -3283,12 +3283,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.2)
-      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
+      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       debug: 4.3.4
       eslint: 8.57.0
-      ts-api-utils: 1.3.0(typescript@5.4.2)
-      typescript: 5.4.2
+      ts-api-utils: 1.3.0(typescript@5.4.3)
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3350,7 +3350,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.2):
+  /@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.3):
     resolution: {integrity: sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
@@ -3366,8 +3366,8 @@ packages:
       is-glob: 4.0.3
       minimatch: 9.0.3
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.4.2)
-      typescript: 5.4.2
+      ts-api-utils: 1.3.0(typescript@5.4.3)
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3392,7 +3392,7 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.2):
+  /@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.3):
     resolution: {integrity: sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
@@ -3403,7 +3403,7 @@ packages:
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 7.3.1
       '@typescript-eslint/types': 7.3.1
-      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.2)
+      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
       eslint: 8.57.0
       semver: 7.6.0
     transitivePeerDependencies:
@@ -3571,7 +3571,7 @@ packages:
       sirv: 2.0.4
     dev: true
 
-  /@unocss/postcss@0.58.6(postcss@8.4.37):
+  /@unocss/postcss@0.58.6(postcss@8.4.38):
     resolution: {integrity: sha512-jTwu7llhRm7luscsk0JekCeo6RS2W98CXiCJRE1H6IDQnjGQQ/9uRAqW4wuLsv7OQ1ThF8m9NKEj0wFJv7ePNg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -3583,7 +3583,7 @@ packages:
       css-tree: 2.3.1
       fast-glob: 3.3.2
       magic-string: 0.30.8
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
   /@unocss/preset-attributify@0.58.6:
@@ -3731,7 +3731,7 @@ packages:
       '@babel/plugin-transform-typescript': 7.24.1(@babel/core@7.24.3)
       '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.24.3)
       vite: 5.2.2(@types/node@20.11.30)(less@4.2.0)
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3744,7 +3744,7 @@ packages:
       vue: ^3.2.25
     dependencies:
       vite: 5.2.2(@types/node@20.11.30)(less@4.2.0)
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: true
 
   /@volar/language-core@1.11.1:
@@ -3832,7 +3832,7 @@ packages:
       '@vue/shared': 3.4.21
       estree-walker: 2.0.2
       magic-string: 0.30.8
-      postcss: 8.4.37
+      postcss: 8.4.38
       source-map-js: 1.2.0
 
   /@vue/compiler-ssr@3.4.21:
@@ -3845,7 +3845,7 @@ packages:
     resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==}
     dev: false
 
-  /@vue/language-core@1.8.27(typescript@5.4.2):
+  /@vue/language-core@1.8.27(typescript@5.4.3):
     resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
     peerDependencies:
       typescript: '*'
@@ -3861,7 +3861,7 @@ packages:
       minimatch: 9.0.3
       muggle-string: 0.3.1
       path-browserify: 1.0.1
-      typescript: 5.4.2
+      typescript: 5.4.3
       vue-template-compiler: 2.7.16
     dev: true
 
@@ -4096,7 +4096,7 @@ packages:
       shallow-equal: 1.2.1
       stylis: 4.3.1
       throttle-debounce: 5.0.0
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
       vue-types: 3.0.2(vue@3.4.21)
       warning: 4.0.3
     dev: false
@@ -4785,13 +4785,13 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /commitizen@4.3.0(@types/node@20.11.30)(typescript@5.4.2):
+  /commitizen@4.3.0(@types/node@20.11.30)(typescript@5.4.3):
     resolution: {integrity: sha512-H0iNtClNEhT0fotHvGV3E9tDejDeS04sN1veIebsKYGMuGscFaswRoYJKmT3eW85eIJAs0F28bG2+a/9wCOfPw==}
     engines: {node: '>= 12'}
     hasBin: true
     dependencies:
       cachedir: 2.3.0
-      cz-conventional-changelog: 3.3.0(@types/node@20.11.30)(typescript@5.4.2)
+      cz-conventional-changelog: 3.3.0(@types/node@20.11.30)(typescript@5.4.3)
       dedent: 0.7.0
       detect-indent: 6.1.0
       find-node-modules: 2.1.3
@@ -5012,7 +5012,7 @@ packages:
       vary: 1.1.2
     dev: true
 
-  /cosmiconfig-typescript-loader@5.0.0(@types/node@20.11.30)(cosmiconfig@9.0.0)(typescript@5.4.2):
+  /cosmiconfig-typescript-loader@5.0.0(@types/node@20.11.30)(cosmiconfig@9.0.0)(typescript@5.4.3):
     resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==}
     engines: {node: '>=v16'}
     peerDependencies:
@@ -5021,9 +5021,9 @@ packages:
       typescript: '>=4'
     dependencies:
       '@types/node': 20.11.30
-      cosmiconfig: 9.0.0(typescript@5.4.2)
+      cosmiconfig: 9.0.0(typescript@5.4.3)
       jiti: 1.21.0
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   /cosmiconfig@7.1.0:
@@ -5037,7 +5037,7 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /cosmiconfig@9.0.0(typescript@5.4.2):
+  /cosmiconfig@9.0.0(typescript@5.4.3):
     resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -5050,7 +5050,7 @@ packages:
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       parse-json: 5.2.0
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   /crc-32@1.2.2:
@@ -5136,18 +5136,18 @@ packages:
   /csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
-  /cz-conventional-changelog@3.3.0(@types/node@20.11.30)(typescript@5.4.2):
+  /cz-conventional-changelog@3.3.0(@types/node@20.11.30)(typescript@5.4.3):
     resolution: {integrity: sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw==}
     engines: {node: '>= 10'}
     dependencies:
       chalk: 2.4.2
-      commitizen: 4.3.0(@types/node@20.11.30)(typescript@5.4.2)
+      commitizen: 4.3.0(@types/node@20.11.30)(typescript@5.4.3)
       conventional-commit-types: 3.0.0
       lodash.map: 4.6.0
       longest: 2.0.1
       word-wrap: 1.2.5
     optionalDependencies:
-      '@commitlint/load': 19.2.0(@types/node@20.11.30)(typescript@5.4.2)
+      '@commitlint/load': 19.2.0(@types/node@20.11.30)(typescript@5.4.3)
     transitivePeerDependencies:
       - '@types/node'
       - typescript
@@ -5924,7 +5924,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       debug: 3.2.7
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
@@ -5952,7 +5952,7 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.5
       array.prototype.flat: 1.3.2
@@ -6095,7 +6095,7 @@ packages:
       '@typescript-eslint/eslint-plugin':
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/eslint-plugin': 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3)
       eslint: 8.57.0
       eslint-rule-composer: 0.3.0
     dev: true
@@ -8501,7 +8501,7 @@ packages:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
     dev: true
 
-  /msw@2.2.9(typescript@5.4.2):
+  /msw@2.2.9(typescript@5.4.3):
     resolution: {integrity: sha512-MLIFufBe6m9c5rZKlmGl6jl1pjn7cTNiDGEgn5v2iVRs0mz+neE2r7lRyYNzvcp6FbdiUEIRp/Y2O2gRMjO8yQ==}
     engines: {node: '>=18'}
     hasBin: true
@@ -8528,7 +8528,7 @@ packages:
       path-to-regexp: 6.2.1
       strict-event-emitter: 0.5.1
       type-fest: 4.13.1
-      typescript: 5.4.2
+      typescript: 5.4.3
       yargs: 17.7.2
 
   /muggle-string@0.3.1:
@@ -9242,10 +9242,10 @@ packages:
     peerDependencies:
       pinia: ^2.0.0
     dependencies:
-      pinia: 2.1.7(typescript@5.4.2)(vue@3.4.21)
+      pinia: 2.1.7(typescript@5.4.3)(vue@3.4.21)
     dev: false
 
-  /pinia@2.1.7(typescript@5.4.2)(vue@3.4.21):
+  /pinia@2.1.7(typescript@5.4.3)(vue@3.4.21):
     resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
@@ -9258,8 +9258,8 @@ packages:
         optional: true
     dependencies:
       '@vue/devtools-api': 6.6.1
-      typescript: 5.4.2
-      vue: 3.4.21(typescript@5.4.2)
+      typescript: 5.4.3
+      vue: 3.4.21(typescript@5.4.3)
       vue-demi: 0.14.7(vue@3.4.21)
     dev: false
 
@@ -9306,7 +9306,7 @@ packages:
     dependencies:
       htmlparser2: 3.10.1
       postcss: 7.0.39
-      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.37)
+      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.38)
     dev: true
 
   /postcss-html@1.6.0:
@@ -9315,8 +9315,8 @@ packages:
     dependencies:
       htmlparser2: 8.0.2
       js-tokens: 8.0.3
-      postcss: 8.4.37
-      postcss-safe-parser: 6.0.0(postcss@8.4.37)
+      postcss: 8.4.38
+      postcss-safe-parser: 6.0.0(postcss@8.4.38)
     dev: true
 
   /postcss-less@3.1.4:
@@ -9330,19 +9330,19 @@ packages:
     resolution: {integrity: sha512-C92S4sHlbDpefJ2QQJjrucCcypq3+KZPstjfuvgOCNnGx0tF9h8hXgAlOIATGAxMXZXaF+nVp+/Mi8pCAWdSmw==}
     engines: {node: '>=10'}
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  /postcss-less@6.0.0(postcss@8.4.37):
+  /postcss-less@6.0.0(postcss@8.4.38):
     resolution: {integrity: sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg==}
     engines: {node: '>=12'}
     peerDependencies:
       postcss: ^8.3.5
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  /postcss-load-config@4.0.2(postcss@8.4.37):
+  /postcss-load-config@4.0.2(postcss@8.4.38):
     resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
     engines: {node: '>= 14'}
     peerDependencies:
@@ -9355,7 +9355,7 @@ packages:
         optional: true
     dependencies:
       lilconfig: 3.1.1
-      postcss: 8.4.37
+      postcss: 8.4.38
       yaml: 2.4.1
     dev: true
 
@@ -9382,22 +9382,22 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-safe-parser@6.0.0(postcss@8.4.37):
+  /postcss-safe-parser@6.0.0(postcss@8.4.38):
     resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.3.3
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  /postcss-safe-parser@7.0.0(postcss@8.4.37):
+  /postcss-safe-parser@7.0.0(postcss@8.4.38):
     resolution: {integrity: sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==}
     engines: {node: '>=18.0'}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
   /postcss-sass@0.4.4:
@@ -9422,24 +9422,24 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /postcss-sorting@6.0.0(postcss@8.4.37):
+  /postcss-sorting@6.0.0(postcss@8.4.38):
     resolution: {integrity: sha512-bYJ0vgAiGbjCBKi7B07CzsBc9eM84nLEbavUmwNp8rAa+PNyrgdH+6PpnqTtciLuUs99c4rFQQmCaYgeBQYmSQ==}
     peerDependencies:
       postcss: ^8.0.4
     dependencies:
       lodash: 4.17.21
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  /postcss-sorting@8.0.2(postcss@8.4.37):
+  /postcss-sorting@8.0.2(postcss@8.4.38):
     resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
     peerDependencies:
       postcss: ^8.4.20
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  /postcss-syntax@0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.37):
+  /postcss-syntax@0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.38):
     resolution: {integrity: sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==}
     peerDependencies:
       postcss: '>=5.0.0'
@@ -9460,9 +9460,9 @@ packages:
       postcss-scss:
         optional: true
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-html: 1.6.0
-      postcss-less: 6.0.0(postcss@8.4.37)
+      postcss-less: 6.0.0(postcss@8.4.38)
     dev: true
 
   /postcss-value-parser@4.2.0:
@@ -9495,6 +9495,14 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.2.0
 
+  /postcss@8.4.38:
+    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.2.0
+
   /posthtml-parser@0.2.1:
     resolution: {integrity: sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==}
     dependencies:
@@ -9559,9 +9567,9 @@ packages:
     peerDependencies:
       prettier: '>= 2.0.0'
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-less: 4.0.1
-      postcss-sorting: 6.0.0(postcss@8.4.37)
+      postcss-sorting: 6.0.0(postcss@8.4.38)
       prettier: 2.8.8
     dev: true
 
@@ -10554,7 +10562,7 @@ packages:
       stylelint: '>=14.0.0'
     dependencies:
       postcss-html: 1.6.0
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
     dev: true
 
   /stylelint-config-prettier@8.0.2(stylelint@13.13.1):
@@ -10574,7 +10582,7 @@ packages:
       stylelint: ^14.0.0 || ^15.0.0 || ^16.0.0
     dependencies:
       css-property-sort-order-smacss: 2.2.0
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
       stylelint-order: 6.0.4(stylelint@16.2.1)
     dev: true
 
@@ -10587,7 +10595,7 @@ packages:
     dependencies:
       postcss-html: 1.6.0
       semver: 7.6.0
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
       stylelint-config-html: 1.1.0(postcss-html@1.6.0)(stylelint@16.2.1)
       stylelint-config-recommended: 14.0.0(stylelint@16.2.1)
     dev: true
@@ -10598,7 +10606,7 @@ packages:
     peerDependencies:
       stylelint: ^16.0.0
     dependencies:
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
     dev: true
 
   /stylelint-config-recommended@3.0.0(stylelint@13.13.1):
@@ -10624,7 +10632,7 @@ packages:
     peerDependencies:
       stylelint: ^16.1.0
     dependencies:
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
       stylelint-config-recommended: 14.0.0(stylelint@16.2.1)
     dev: true
 
@@ -10642,9 +10650,9 @@ packages:
     peerDependencies:
       stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
     dependencies:
-      postcss: 8.4.37
-      postcss-sorting: 8.0.2(postcss@8.4.37)
-      stylelint: 16.2.1(typescript@5.4.2)
+      postcss: 8.4.38
+      postcss-sorting: 8.0.2(postcss@8.4.38)
+      stylelint: 16.2.1(typescript@5.4.3)
     dev: true
 
   /stylelint-prettier@5.0.0(prettier@3.2.5)(stylelint@16.2.1):
@@ -10656,7 +10664,7 @@ packages:
     dependencies:
       prettier: 3.2.5
       prettier-linter-helpers: 1.0.0
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
     dev: true
 
   /stylelint@13.13.1:
@@ -10699,7 +10707,7 @@ packages:
       postcss-sass: 0.4.4
       postcss-scss: 2.1.1
       postcss-selector-parser: 6.0.16
-      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.37)
+      postcss-syntax: 0.36.2(postcss-html@1.6.0)(postcss-less@6.0.0)(postcss@8.4.38)
       postcss-value-parser: 4.2.0
       resolve-from: 5.0.0
       slash: 3.0.0
@@ -10718,7 +10726,7 @@ packages:
       - supports-color
     dev: true
 
-  /stylelint@16.2.1(typescript@5.4.2):
+  /stylelint@16.2.1(typescript@5.4.3):
     resolution: {integrity: sha512-SfIMGFK+4n7XVAyv50CpVfcGYWG4v41y6xG7PqOgQSY8M/PgdK0SQbjWFblxjJZlN9jNq879mB4BCZHJRIJ1hA==}
     engines: {node: '>=18.12.0'}
     hasBin: true
@@ -10729,7 +10737,7 @@ packages:
       '@csstools/selector-specificity': 3.0.2(postcss-selector-parser@6.0.16)
       balanced-match: 2.0.0
       colord: 2.9.3
-      cosmiconfig: 9.0.0(typescript@5.4.2)
+      cosmiconfig: 9.0.0(typescript@5.4.3)
       css-functions-list: 3.2.1
       css-tree: 2.3.1
       debug: 4.3.4
@@ -10749,9 +10757,9 @@ packages:
       micromatch: 4.0.5
       normalize-path: 3.0.0
       picocolors: 1.0.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-resolve-nested-selector: 0.1.1
-      postcss-safe-parser: 7.0.0(postcss@8.4.37)
+      postcss-safe-parser: 7.0.0(postcss@8.4.38)
       postcss-selector-parser: 6.0.16
       postcss-value-parser: 4.2.0
       resolve-from: 5.0.0
@@ -11067,13 +11075,13 @@ packages:
     resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==}
     dev: true
 
-  /ts-api-utils@1.3.0(typescript@5.4.2):
+  /ts-api-utils@1.3.0(typescript@5.4.3):
     resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
     engines: {node: '>=16'}
     peerDependencies:
       typescript: '>=4.2.0'
     dependencies:
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   /ts-interface-checker@0.1.13:
@@ -11109,7 +11117,7 @@ packages:
   /tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
-  /tsup@8.0.2(postcss@8.4.37)(typescript@5.4.2):
+  /tsup@8.0.2(postcss@8.4.38)(typescript@5.4.3):
     resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==}
     engines: {node: '>=18'}
     hasBin: true
@@ -11136,14 +11144,14 @@ packages:
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss: 8.4.37
-      postcss-load-config: 4.0.2(postcss@8.4.37)
+      postcss: 8.4.38
+      postcss-load-config: 4.0.2(postcss@8.4.38)
       resolve-from: 5.0.0
       rollup: 4.13.0
       source-map: 0.8.0-beta.0
       sucrase: 3.35.0
       tree-kill: 1.2.2
-      typescript: 5.4.2
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
       - ts-node
@@ -11264,6 +11272,11 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  /typescript@5.4.3:
+    resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   /ufo@1.5.3:
     resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==}
     dev: true
@@ -11372,7 +11385,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unocss@0.58.6(postcss@8.4.37)(vite@5.2.2):
+  /unocss@0.58.6(postcss@8.4.38)(vite@5.2.2):
     resolution: {integrity: sha512-HBstDtC6KKD5yCYh5hHpPdHGZai0B/iLlDwkOIK+xfQYrvl8tNBvKfRz3xgiaI5MJ+fLmEOxbfXQIjleU1A0iA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -11388,7 +11401,7 @@ packages:
       '@unocss/cli': 0.58.6
       '@unocss/core': 0.58.6
       '@unocss/extractor-arbitrary-variants': 0.58.6
-      '@unocss/postcss': 0.58.6(postcss@8.4.37)
+      '@unocss/postcss': 0.58.6(postcss@8.4.38)
       '@unocss/preset-attributify': 0.58.6
       '@unocss/preset-icons': 0.58.6
       '@unocss/preset-mini': 0.58.6
@@ -11434,7 +11447,7 @@ packages:
       minimatch: 9.0.3
       resolve: 1.22.8
       unplugin: 1.10.0
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -11521,7 +11534,7 @@ packages:
       vfile-message: 2.0.4
     dev: true
 
-  /vite-plugin-checker@0.6.4(eslint@8.57.0)(stylelint@16.2.1)(typescript@5.4.2)(vite@5.2.2)(vue-tsc@1.8.27):
+  /vite-plugin-checker@0.6.4(eslint@8.57.0)(stylelint@16.2.1)(typescript@5.4.3)(vite@5.2.2)(vue-tsc@1.8.27):
     resolution: {integrity: sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==}
     engines: {node: '>=14.16'}
     peerDependencies:
@@ -11563,15 +11576,15 @@ packages:
       npm-run-path: 4.0.1
       semver: 7.6.0
       strip-ansi: 6.0.1
-      stylelint: 16.2.1(typescript@5.4.2)
+      stylelint: 16.2.1(typescript@5.4.3)
       tiny-invariant: 1.3.3
-      typescript: 5.4.2
+      typescript: 5.4.3
       vite: 5.2.2(@types/node@20.11.30)(less@4.2.0)
       vscode-languageclient: 7.0.0
       vscode-languageserver: 7.0.0
       vscode-languageserver-textdocument: 1.0.11
       vscode-uri: 3.0.8
-      vue-tsc: 1.8.27(typescript@5.4.2)
+      vue-tsc: 1.8.27(typescript@5.4.3)
     dev: true
 
   /vite-plugin-inspect@0.8.3(vite@5.2.2):
@@ -11720,7 +11733,7 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-demi@0.14.7(vue@3.4.21):
@@ -11735,7 +11748,7 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-echarts@6.6.9(echarts@5.5.0)(vue@3.4.21):
@@ -11754,7 +11767,7 @@ packages:
     dependencies:
       echarts: 5.5.0
       resize-detector: 0.3.0
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
       vue-demi: 0.13.11(vue@3.4.21)
     dev: false
 
@@ -11785,7 +11798,7 @@ packages:
       '@intlify/core-base': 9.10.2
       '@intlify/shared': 9.10.2
       '@vue/devtools-api': 6.6.1
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-observe-visibility@2.0.0-alpha.1(vue@3.4.21):
@@ -11793,7 +11806,7 @@ packages:
     peerDependencies:
       vue: ^3.0.0
     dependencies:
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-resize@2.0.0-alpha.1(vue@3.4.21):
@@ -11801,7 +11814,7 @@ packages:
     peerDependencies:
       vue: ^3.0.0
     dependencies:
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-router@4.3.0(vue@3.4.21):
@@ -11810,7 +11823,7 @@ packages:
       vue: ^3.2.0
     dependencies:
       '@vue/devtools-api': 6.6.1
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-template-compiler@2.7.16:
@@ -11820,16 +11833,16 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc@1.8.27(typescript@5.4.2):
+  /vue-tsc@1.8.27(typescript@5.4.3):
     resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
       '@volar/typescript': 1.11.1
-      '@vue/language-core': 1.8.27(typescript@5.4.2)
+      '@vue/language-core': 1.8.27(typescript@5.4.3)
       semver: 7.6.0
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   /vue-types@3.0.2(vue@3.4.21):
@@ -11839,7 +11852,7 @@ packages:
       vue: ^3.0.0
     dependencies:
       is-plain-object: 3.0.1
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-types@5.1.1(vue@3.4.21):
@@ -11852,7 +11865,7 @@ packages:
         optional: true
     dependencies:
       is-plain-object: 5.0.0
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
     dev: false
 
   /vue-virtual-scroller@2.0.0-beta.8(vue@3.4.21):
@@ -11861,7 +11874,7 @@ packages:
       vue: ^3.2.0
     dependencies:
       mitt: 2.1.0
-      vue: 3.4.21(typescript@5.4.2)
+      vue: 3.4.21(typescript@5.4.3)
       vue-observe-visibility: 2.0.0-alpha.1(vue@3.4.21)
       vue-resize: 2.0.0-alpha.1(vue@3.4.21)
     dev: false
@@ -11881,6 +11894,21 @@ packages:
       '@vue/shared': 3.4.21
       typescript: 5.4.2
 
+  /vue@3.4.21(typescript@5.4.3):
+    resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@vue/compiler-dom': 3.4.21
+      '@vue/compiler-sfc': 3.4.21
+      '@vue/runtime-dom': 3.4.21
+      '@vue/server-renderer': 3.4.21(vue@3.4.21)
+      '@vue/shared': 3.4.21
+      typescript: 5.4.3
+
   /warning@4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
     dependencies:
diff --git a/src/App.vue b/src/App.vue
index c322889ce..f5ef810f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,16 +8,5 @@
 </template>
 
 <script setup lang="ts">
-  import { watchEffect } from 'vue';
-  import { useRoute } from 'vue-router';
-  import { transformI18n } from './hooks/useI18n';
   import { LockScreen } from '@/components/basic/lockscreen';
-
-  const route = useRoute();
-  watchEffect(() => {
-    if (route.meta?.title) {
-      // 翻译网页标题
-      document.title = transformI18n(route.meta.title);
-    }
-  });
 </script>
diff --git a/src/layout/header/components/breadcrumb/index.vue b/src/layout/header/components/breadcrumb/index.vue
index 7ddfe0ed4..abcccbe39 100644
--- a/src/layout/header/components/breadcrumb/index.vue
+++ b/src/layout/header/components/breadcrumb/index.vue
@@ -11,40 +11,15 @@
   const route = useRoute();
   const userStore = useUserStore();
 
-  const findLastChild = (route?: RouteRecordRaw) => {
-    if (typeof route?.redirect === 'object') {
-      const redirectValues = Object.values(route.redirect);
-      if (route?.children?.length) {
-        const target = route.children.find((n) =>
-          redirectValues.some((m) => [n.name, n.path, n.meta?.fullPath].some((v) => v === m)),
-        );
-        return findLastChild(target);
-      }
-      return redirectValues.find((n) => typeof n === 'string');
-    } else if (typeof route?.redirect === 'string') {
-      if (route?.children?.length) {
-        const target = route.children.find((n) =>
-          [n.name, n.path, n.meta?.fullPath].some((m) => m === route?.redirect),
-        );
-        return findLastChild(target);
-      }
-      return route?.redirect;
-    }
-    return route;
-  };
-  const getRouteByName = (name: string) => router.getRoutes().find((n) => n.name === name);
-
   // 点击菜单
   const clickMenuItem = (menuItem: RouteRecordRaw) => {
-    const lastChild = findLastChild(menuItem);
-    console.log('lastChild', menuItem, lastChild);
+    if (!menuItem.redirect) return;
 
-    const targetRoute = getRouteByName(lastChild?.name);
-    const { isExt, extOpenMode } = targetRoute?.meta || {};
+    const { isExt, extOpenMode } = menuItem?.meta || {};
     if (isExt && extOpenMode === 1) {
-      window.open(lastChild?.path);
+      window.open(menuItem.path);
     } else {
-      router.push({ name: lastChild?.name });
+      router.push({ name: menuItem.name });
     }
   };
 
@@ -79,7 +54,7 @@
   <a-breadcrumb>
     <template v-for="(routeItem, rotueIndex) in menus" :key="routeItem?.name">
       <a-breadcrumb-item>
-        <TitleI18n :title="routeItem?.meta?.title" />
+        <TitleI18n :title="routeItem?.meta?.title" class="cursor-pointer" />
         <template v-if="routeItem?.children?.length" #overlay>
           <a-menu :selected-keys="getSelectKeys(rotueIndex)">
             <template v-for="childItem in routeItem?.children" :key="childItem.name">
diff --git a/src/layout/header/components/setting/constant.ts b/src/layout/header/components/setting/constant.ts
index 97f2e9a6f..4f4d4c4f8 100644
--- a/src/layout/header/components/setting/constant.ts
+++ b/src/layout/header/components/setting/constant.ts
@@ -80,3 +80,11 @@ export const layouts = [
     value: 'topmenu',
   },
 ] as const;
+
+/** 界面显示相关 */
+export const uiSettings = [
+  {
+    label: '页签持久化',
+    value: 'cacheTabs',
+  },
+] as const;
diff --git a/src/layout/header/components/setting/index.vue b/src/layout/header/components/setting/index.vue
index 36249953f..b758183f7 100644
--- a/src/layout/header/components/setting/index.vue
+++ b/src/layout/header/components/setting/index.vue
@@ -52,6 +52,18 @@
         </div>
       </Descriptions.Item>
     </Descriptions>
+    <Descriptions title="页面显示" :column="1">
+      <Descriptions.Item v-for="item in uiSettings" :key="item.value">
+        <a-flex justify="space-between" class="w-full">
+          {{ item.label }}
+          <a-switch
+            v-model:checked="layoutSetting[item.value]"
+            checked-children="开"
+            un-checked-children="关"
+          />
+        </a-flex>
+      </Descriptions.Item>
+    </Descriptions>
   </Drawer>
 </template>
 
@@ -60,7 +72,7 @@
   import { SettingOutlined } from '@ant-design/icons-vue';
   import { storeToRefs } from 'pinia';
   import { Drawer, Descriptions, Tag, Tooltip } from 'ant-design-vue';
-  import { layouts, themeColors, themeStyle } from './constant';
+  import { layouts, themeColors, themeStyle, uiSettings } from './constant';
   import type { ThemeColor } from './constant';
   import type { LayoutSetting } from '@/store/modules/layoutSetting';
   import { useLayoutSettingStore } from '@/store/modules/layoutSetting';
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 94362d49e..7dc696cd7 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -3,7 +3,10 @@
     <div class="header-left">
       <slot name="left">
         <Space :size="20">
-          <span class="menu-fold" @click="() => emit('update:collapsed', !collapsed)">
+          <span
+            class="menu-fold cursor-pointer"
+            @click="() => emit('update:collapsed', !collapsed)"
+          >
             <component :is="collapsed ? MenuUnfoldOutlined : MenuFoldOutlined" />
           </span>
           <LayoutBreadcrumb />
diff --git a/src/layout/menu/menu.vue b/src/layout/menu/menu.vue
index 3b0023437..7a8a0623a 100644
--- a/src/layout/menu/menu.vue
+++ b/src/layout/menu/menu.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="menu-container" :class="{ 'is-side-menu': isSideMenu }">
     <Menu
-      v-model:selected-keys="state.selectedKeys"
-      :open-keys="isSideMenu ? state.openKeys : []"
+      v-model:selected-keys="selectedKeys"
+      :open-keys="isSideMenu ? openKeys : []"
       :mode="isSideMenu ? 'inline' : 'horizontal'"
       :theme="theme"
       :collapsed="props.collapsed"
@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive, computed, watch, type PropType } from 'vue';
+  import { ref, computed, watch, type PropType } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
   import { Menu, type MenuTheme } from 'ant-design-vue';
   import SubMenuItem from './components/sub-menu-item.vue';
@@ -39,42 +39,30 @@
   // 当前路由
   const currentRoute = useRoute();
   const router = useRouter();
-  const state = reactive({
-    openKeys: [] as string[],
-    selectedKeys: [currentRoute.name] as string[],
-  });
+  const openKeys = ref<string[]>([]);
+  const selectedKeys = ref<string[]>([currentRoute.name as string]);
 
   const menus = computed(() => userStore.menus);
   // console.log('menus', menus.value);
   /** 侧边栏布局 */
   const isSideMenu = computed(() => layoutSettingStore.layoutSetting.layout === 'sidemenu');
   const getRouteByName = (name: string) => router.getRoutes().find((n) => n.name === name);
-  // 根据activeMenu获取指定的menu
-  const getTargetMenuByActiveMenuName = (activeMenu: string) => {
-    return router.getRoutes().find((n) => [n.name, n.path].includes(activeMenu));
-  };
 
   // 获取当前打开的子菜单
   const getOpenKeys = () => {
-    const meta = currentRoute.meta;
-    if (meta?.activeMenu) {
-      const targetMenu = getTargetMenuByActiveMenuName(meta.activeMenu);
-      return targetMenu?.meta?.namePath ?? [meta?.activeMenu];
-    }
-
     return (
-      meta?.hideInMenu
-        ? state?.openKeys || []
-        : currentRoute.meta?.namePath ?? currentRoute.matched.slice(1).map((n) => n.name)
-    ) as string[];
+      currentRoute.meta?.namePath ?? (currentRoute.matched.slice(1).map((n) => n.name) as string[])
+    );
   };
 
   // 监听菜单收缩状态
   watch(
     () => props.collapsed,
-    (newVal) => {
-      state.openKeys = newVal ? [] : getOpenKeys();
-      state.selectedKeys = [currentRoute.name] as string[];
+    () => {
+      selectedKeys.value = [currentRoute.name] as string[];
+      setTimeout(() => {
+        openKeys.value = getOpenKeys();
+      });
     },
   );
 
@@ -82,15 +70,9 @@
   watch(
     () => currentRoute.fullPath,
     () => {
+      selectedKeys.value = [currentRoute.meta?.activeMenu ?? currentRoute.name] as string[];
       if (currentRoute.name === LOGIN_NAME || props.collapsed) return;
-      state.openKeys = getOpenKeys();
-      const meta = currentRoute.meta;
-      if (meta?.activeMenu) {
-        const targetMenu = getTargetMenuByActiveMenuName(meta.activeMenu);
-        state.selectedKeys = [targetMenu?.name ?? meta?.activeMenu] as string[];
-      } else {
-        state.selectedKeys = [currentRoute.meta?.activeMenu ?? currentRoute.name] as string[];
-      }
+      openKeys.value = getOpenKeys();
     },
     {
       immediate: true,
@@ -100,12 +82,12 @@
   // 点击菜单
   const clickMenuItem = ({ key }) => {
     if (key === currentRoute.name) return;
-    const preSelectedKeys = state.selectedKeys;
+    const preSelectedKeys = selectedKeys.value;
     const targetRoute = getRouteByName(key);
     const { isExt, extOpenMode } = targetRoute?.meta || {};
     if (targetRoute && isExt && extOpenMode === 1) {
       queueMicrotask(() => {
-        state.selectedKeys = preSelectedKeys;
+        selectedKeys.value = preSelectedKeys;
       });
     } else {
       router.push({ name: key });
diff --git a/src/layout/tabs/tabs-view.vue b/src/layout/tabs/tabs-view.vue
index d955bd6d0..517233632 100644
--- a/src/layout/tabs/tabs-view.vue
+++ b/src/layout/tabs/tabs-view.vue
@@ -25,7 +25,7 @@
         <template v-if="Component">
           <Suspense>
             <Transition
-              name="fade-slide"
+              :name="transitionName"
               mode="out-in"
               appear
               @before-leave="overflow = 'hidden'"
@@ -52,6 +52,7 @@
   import { TABS_ROUTES } from '@/enums/cacheEnum';
   import { useTabsViewStore, blackList } from '@/store/modules/tabsView';
   import { useKeepAliveStore } from '@/store/modules/keepAlive';
+  import { useLayoutSettingStore } from '@/store/modules/layoutSetting';
 
   type RouteItem = Omit<RouteLocation, 'matched' | 'redirectedFrom'>;
   type TabsOperatorInstance = InstanceType<typeof TabsOperator>;
@@ -60,6 +61,7 @@
   const router = useRouter();
   const tabsViewStore = useTabsViewStore();
   const keepAliveStore = useKeepAliveStore();
+  const layoutSettingStore = useLayoutSettingStore();
 
   const itemRefs: Recordable<TabsOperatorInstance | null> = {};
 
@@ -68,9 +70,16 @@
   const activeKey = computed(() => tabsViewStore.getCurrentTab?.fullPath);
   // 标签页列表
   const tabList = computed(() => tabsViewStore.getTabsList);
-
   // 缓存的路由组件列表
   const keepAliveComponents = computed(() => keepAliveStore.list);
+  /** 过渡动画 */
+  const transitionName = computed(() => {
+    const name = route.meta?.transitionName;
+    if (name === false) {
+      return '';
+    }
+    return name ?? 'fade-slide';
+  });
 
   // 获取简易的路由对象
   const getSimpleRoute = (route): RouteItem => {
@@ -84,6 +93,7 @@
     const routesStr = Storage.get(TABS_ROUTES) as string | null | undefined;
     routes = routesStr ? JSON.parse(routesStr).filter(Boolean) : [getSimpleRoute(route)];
   } catch (e) {
+    console.log(e);
     routes = [getSimpleRoute(route)];
   }
 
@@ -102,7 +112,9 @@
 
   // 在页面关闭或刷新之前，保存数据
   window.addEventListener('beforeunload', () => {
-    if (tabsViewStore.getCurrentTab) {
+    if (layoutSettingStore.layoutSetting.cacheTabs) {
+      Storage.set(TABS_ROUTES, JSON.stringify(tabsViewStore.tabsList));
+    } else if (tabsViewStore.getCurrentTab) {
       Storage.set(TABS_ROUTES, JSON.stringify([tabsViewStore.getCurrentTab]));
     }
   });
diff --git a/src/router/helper/routeHelper.tsx b/src/router/helper/routeHelper.tsx
index 979c3484e..01514218e 100644
--- a/src/router/helper/routeHelper.tsx
+++ b/src/router/helper/routeHelper.tsx
@@ -1,6 +1,4 @@
-import { RouterView } from 'vue-router';
 import { asyncRoutes } from '../asyncModules';
-import outsideLayout from '../routes/outsideLayout';
 import type { RouteMeta, RouteRecordRaw } from 'vue-router';
 import IFramePage from '@/components/basic/iframe-page';
 import { warn } from '@/utils/log';
@@ -8,6 +6,7 @@ import { rootRoute } from '@/router/routes';
 import router from '@/router';
 import basic from '@/router/routes/basic';
 import routeModules from '@/router/routes/modules';
+import { uniqueSlash } from '@/utils/urlUtils';
 
 export const transformMenuToRoutes = (routeList: RouteRecordRaw[]) => {
   routeList.forEach((route) => {
@@ -19,7 +18,15 @@ export const transformMenuToRoutes = (routeList: RouteRecordRaw[]) => {
     route.meta.hideInMenu ??= !show;
 
     if (type === 0) {
-      route.component = RouterView;
+      route.component = null;
+      if (route.children?.length) {
+        const redirectChild = route.children.find((n) => !n.meta?.isExt);
+        if (!redirectChild) {
+          Reflect.deleteProperty(route, 'redirect');
+        } else {
+          route.redirect ??= uniqueSlash(`/${route.path}/${redirectChild.path}`);
+        }
+      }
     } else if (type === 1) {
       // 内嵌页面
       if (isExt && extOpenMode === 2) {
@@ -47,21 +54,7 @@ export const generateDynamicRoutes = (menus: RouteRecordRaw[]) => {
   const allRoute = [...routes, ...basic];
   genNamePathForRoutes(allRoute);
   rootRoute.children = allRoute;
-  // 1. 让 vue-router 先帮我们拍平路由
-  const removeRoute = router.addRoute(rootRoute);
-  // 2. 获取所有没有包含 children 的路由，也就是页面级路由
-  const filterRoutes = router.getRoutes().filter((item) => {
-    const isLeaf = !item.children.length || Object.is(item.meta?.hideChildrenInMenu, true);
-    const isOutsideRoute = outsideLayout.some((n) => n.name === item.name);
-    return isLeaf && !isOutsideRoute;
-  });
-  // 3. 清空所有路由
-  removeRoute();
-  rootRoute.children = [...filterRoutes];
-  // 4.重新添加拍平后的路由
   router.addRoute(rootRoute);
-  // console.log('routes', router.getRoutes());
-
   return routes;
 };
 
diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts
index 866bbf30a..5c5487afa 100644
--- a/src/router/router-guards.ts
+++ b/src/router/router-guards.ts
@@ -7,14 +7,17 @@ import type { Router, RouteLocationNormalized } from 'vue-router';
 import { useUserStore } from '@/store/modules/user';
 import { useKeepAliveStore } from '@/store/modules/keepAlive';
 import { to as _to } from '@/utils/awaitTo';
+import { transformI18n } from '@/hooks/useI18n';
 
 NProgress.configure({ showSpinner: false }); // NProgress Configuration
 
 const defaultRoutePath = '/dashboard/welcome';
 
 export function createRouterGuards(router: Router, whiteNameList: WhiteNameList) {
-  router.beforeEach(async (to, _, next) => {
-    NProgress.start(); // start progress bar
+  router.beforeEach(async (to, from, next) => {
+    if (!from.meta?.hideProgressBar || !to.meta?.hideProgressBar) {
+      NProgress.start(); // start progress bar
+    }
     const userStore = useUserStore();
 
     if (userStore.token) {
@@ -56,9 +59,14 @@ export function createRouterGuards(router: Router, whiteNameList: WhiteNameList)
   });
 
   /** 获取路由对应的组件名称 */
-  const getComponentName = (route: RouteLocationNormalized) => {
-    const comp = route.matched.at(-1)?.components?.default;
-    return comp?.name ?? (comp as any)?.type?.name;
+  const getComponentName = (route: RouteLocationNormalized): string[] => {
+    return route.matched
+      .map((n) => {
+        if (!n.meta?.keepAlive) return;
+        const comp = n.components?.default;
+        return comp?.name ?? (comp as any)?.type?.name;
+      })
+      .filter(Boolean);
   };
 
   router.afterEach((to, from, failure) => {
@@ -69,6 +77,11 @@ export function createRouterGuards(router: Router, whiteNameList: WhiteNameList)
       return;
     }
 
+    if (to.meta?.title) {
+      // 设置网页标题
+      document.title = transformI18n(to.meta.title);
+    }
+
     const keepAliveStore = useKeepAliveStore();
 
     // 在这里设置需要缓存的组件名称
@@ -99,6 +112,7 @@ export function createRouterGuards(router: Router, whiteNameList: WhiteNameList)
     if (!userStore.token) {
       keepAliveStore.clear();
     }
+    // console.log('keepAliveStore', keepAliveStore.list);
     NProgress.done(); // finish progress bar
   });
 
diff --git a/src/router/routes/modules/demos.ts b/src/router/routes/modules/demos.ts
index cdcf58688..2d7a8de81 100644
--- a/src/router/routes/modules/demos.ts
+++ b/src/router/routes/modules/demos.ts
@@ -176,9 +176,10 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
           title: '嵌套路由',
           icon: 'ant-design:desktop-outlined',
-          keepAlive: false,
           hideChildrenInMenu: false,
           transitionName: false,
+          keepAlive: true,
+          hideProgressBar: true,
         },
         component: () => import('@/views/demos/nested-routes/index.vue'),
         children: [
@@ -189,7 +190,6 @@ const routes: Array<RouteRecordRaw> = [
               title: '路由一',
               icon: 'ant-design:desktop-outlined',
               hideInMenu: false,
-              activeMenu: `${moduleName}-nested-routes`,
             },
             component: () => import('@/views/demos/nested-routes/route-one.vue'),
           },
@@ -200,7 +200,6 @@ const routes: Array<RouteRecordRaw> = [
               title: '路由二',
               icon: 'ant-design:desktop-outlined',
               hideInMenu: false,
-              activeMenu: `${moduleName}-nested-routes`,
             },
             component: () => import('@/views/demos/nested-routes/route-two.vue'),
           },
@@ -211,7 +210,6 @@ const routes: Array<RouteRecordRaw> = [
               title: '路由三',
               icon: 'ant-design:desktop-outlined',
               hideInMenu: false,
-              activeMenu: `${moduleName}-nested-routes`,
             },
             component: () => import('@/views/demos/nested-routes/route-three.vue'),
           },
diff --git a/src/store/modules/layoutSetting.ts b/src/store/modules/layoutSetting.ts
index d8e5561b9..33b0bf854 100644
--- a/src/store/modules/layoutSetting.ts
+++ b/src/store/modules/layoutSetting.ts
@@ -29,6 +29,8 @@ export type LayoutSetting = {
   title: string;
   pwa: false;
   iconfontUrl: string;
+  /** 是否缓存标签页 */
+  cacheTabs: boolean;
   // production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
 };
 
@@ -46,6 +48,7 @@ export const defaultSetting: LayoutSetting = {
   title: 'vite-antdv-admin',
   pwa: false,
   iconfontUrl: '',
+  cacheTabs: false,
   // production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true',
 };
 
diff --git a/src/views/account/about.vue b/src/views/account/about.vue
index 59bd54af4..ac4520d3f 100644
--- a/src/views/account/about.vue
+++ b/src/views/account/about.vue
@@ -21,14 +21,6 @@
         <Descriptions.Item label="预览地址">
           <BlankLink :url="pkg.homepage" text="预览地址" />
         </Descriptions.Item>
-        <Descriptions.Item label="QQ交流群" label-align="left" align="left">
-          <a
-            href="https://qm.qq.com/cgi-bin/qm/qr?k=ID-KcAOdPUPWVgAnsPLF3gRdHLc8GURO&jump_from=webapi"
-            target="_blank"
-          >
-            点击链接加入群聊
-          </a>
-        </Descriptions.Item>
       </Descriptions>
     </Card>
     <Card class="mt-3">
diff --git a/src/views/demos/nested-routes/index.vue b/src/views/demos/nested-routes/index.vue
index 506d790a5..59b6fc559 100644
--- a/src/views/demos/nested-routes/index.vue
+++ b/src/views/demos/nested-routes/index.vue
@@ -1,14 +1,15 @@
 <template>
-  <div>
-    <Tabs v-model:activeKey="activeKey">
+  <a-card class="h-full">
+    <a-typography-title :level="3">{{ $route.fullPath }}</a-typography-title>
+    <Tabs :activeKey="activeKey" type="card" @tabClick="handleTabClick">
       <Tabs.TabPane v-for="item in tabs" :key="item.name" :tab="item.title" />
     </Tabs>
     <router-view #="{ Component }">
       <KeepAlive>
-        <component :is="Component" />
+        <component :is="Component" :key="$route.fullPath" />
       </KeepAlive>
     </router-view>
-  </div>
+  </a-card>
 </template>
 
 <script lang="ts" setup>
@@ -38,9 +39,20 @@
     },
   ];
 
-  const activeKey = ref((route.name as string) || tabs[0].name);
+  const activeKey = ref();
 
-  watch(activeKey, (name) => {
-    router.push({ name });
-  });
+  const handleTabClick = (key) => {
+    activeKey.value = key;
+    router.push({ name: key });
+  };
+
+  watch(
+    () => route.name,
+    (val: string) => {
+      activeKey.value = val;
+    },
+    {
+      immediate: true,
+    },
+  );
 </script>
diff --git a/src/views/demos/nested-routes/route-one.vue b/src/views/demos/nested-routes/route-one.vue
index e09b54785..82a313a9c 100644
--- a/src/views/demos/nested-routes/route-one.vue
+++ b/src/views/demos/nested-routes/route-one.vue
@@ -1,4 +1,9 @@
-<template><div>路由一</div></template>
+<template>
+  <div>
+    <div>路由一</div>
+    <a-input />
+  </div>
+</template>
 
 <script lang="ts" setup>
   defineOptions({
diff --git a/src/views/demos/nested-routes/route-three.vue b/src/views/demos/nested-routes/route-three.vue
index b2edd0801..3154c8e3f 100644
--- a/src/views/demos/nested-routes/route-three.vue
+++ b/src/views/demos/nested-routes/route-three.vue
@@ -1,4 +1,9 @@
-<template><div>路由三</div></template>
+<template>
+  <div>
+    <div>路由三</div>
+    <a-input />
+  </div>
+</template>
 
 <script lang="ts" setup>
   defineOptions({
diff --git a/src/views/demos/nested-routes/route-two.vue b/src/views/demos/nested-routes/route-two.vue
index b6e277842..ef7e7a1dc 100644
--- a/src/views/demos/nested-routes/route-two.vue
+++ b/src/views/demos/nested-routes/route-two.vue
@@ -1,4 +1,9 @@
-<template><div>路由二</div></template>
+<template>
+  <div>
+    <div>路由二</div>
+    <a-input />
+  </div>
+</template>
 
 <script lang="ts" setup>
   defineOptions({
diff --git a/types/global.d.ts b/types/global.d.ts
index 604cb371a..4328def85 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -1,4 +1,4 @@
-import packageJSON from '../package.json';
+import type packageJSON from '../package.json';
 import type {
   ComponentRenderProxy,
   VNode,
diff --git a/types/modules.d.ts b/types/modules.d.ts
index 8a97a9009..e298a9938 100644
--- a/types/modules.d.ts
+++ b/types/modules.d.ts
@@ -1,5 +1,5 @@
 declare module '*.vue' {
-  import { DefineComponent } from 'vue';
+  import type { DefineComponent } from 'vue';
   const Component: DefineComponent<{}, {}, any>;
   export default Component;
 }
@@ -10,7 +10,7 @@ declare module 'mitt' {
 }
 
 declare module 'ant-design-vue/es/locale/*' {
-  import { Locale } from 'ant-design-vue/types/locale-provider';
+  import type { Locale } from 'ant-design-vue/types/locale-provider';
   const locale: Locale & ReadonlyRecordable;
   export default locale as Locale & ReadonlyRecordable;
 }
diff --git a/types/shims/shims-tsx.d.ts b/types/shims/shims-tsx.d.ts
index ebc740058..4285d5f9c 100644
--- a/types/shims/shims-tsx.d.ts
+++ b/types/shims/shims-tsx.d.ts
@@ -1,4 +1,5 @@
-import Vue, { VNode } from 'vue';
+import type { VNode } from 'vue';
+import type Vue from 'vue';
 
 declare module '*.tsx' {
   import Vue from 'compatible-vue';
diff --git a/types/vue-router.d.ts b/types/vue-router.d.ts
index 1c96f9ff1..f4f567941 100644
--- a/types/vue-router.d.ts
+++ b/types/vue-router.d.ts
@@ -1,6 +1,6 @@
-import { type RouteMeta as VRouteMeta } from 'vue-router';
-import { type PermissionType } from '@/permission/permCode/';
-import { type LocaleType } from '@/locales/config';
+import type { RouteMeta as VRouteMeta } from 'vue-router';
+import type { PermissionType } from '@/permission/permCode/';
+import type { LocaleType } from '@/locales/config';
 
 declare global {
   type Title18n = {
@@ -47,5 +47,7 @@ declare module 'vue-router' {
      * 2: 内嵌 iframe
      */
     extOpenMode?: 1 | 2;
+    /** 是否隐藏页面加载进度条 */
+    hideProgressBar?: boolean;
   }
 }