version: v5.0.6

CHANGELOG.md

@@ -1,5 +1,33 @@
 # CHANGE LOG
 
+## 5.0.6
+
+## Feats
+
+- 新增 `useChartProvider` 方法，允许注入 `RCharts` 组件配置
+- 更新 `echarts` 版本至 `5.5.1`
+- 更新 `vue` 版本至 `3.5.13`
+- 更新 `@vueuse/core` 版本至 `11.2.0`
+- 修改 `SettingDrawer` 组件的 `defaultOptions` 配置项管理方式，现在迁移至 `store.setting` 包中
+- 重构 `cache` 工具模块，更有好的类型推导、更少的代码量
+- 重构 `precision` 工具模块，更好的类型推导、更少的代码量
+- 重写 `updateObjectValue` 方法，现在类型提示更加准确
+- 全局使用 `useTemplateRef`, `shallowRef` 方法替代 `ref` 注册模板引用，减少不必要的响应式代理
+- 优化 `MenuTag` 组件的关闭按钮样式
+- `LockScreen` 组件新增头像展示
+- `AppAvatar` 组件现在默认获取 `avatar` 字段为空的时候，展示名字的首字
+- 优化 `UnlockScreen` 组件样式，现在会根据主题自动调整背景颜色
+- 优化内容区域过度动画效果
+
+## Fixes
+
+- 修复 `404` 页面【返回】按钮不能准确返回的问题
+- 修复 `usePagination.getCallback` 方法类型丢失问题；修复该方法获取实时回调不准确的问题
+- 修复初始化时，菜单滚动条不能准确滚动到当前激活项的问题
+- 修复 `UnlockScreen` 组件在白色主题下，导致样式显示差异问题，现在统一为黑色主题配置覆盖
+- 修复 `LockScreen` 组件在退出锁屏时，没有及时更新 `localStorage` 缓存的问题
+- 修复 `setupDayjs` 初始化不准确的问题
+
 ## 5.0.5
 
 ## Feats

__test__/utils/createRefElement.tsx

@@ -13,6 +13,7 @@ import { mount } from '@vue/test-utils'
  *
  * const text = wrapper.find('div').text() // hello
  */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 const createRefElement = (slots?: Record<string, Function>) => {
   const wrapper = mount(
     defineComponent({

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ray-template",
   "private": false,
-  "version": "5.0.5",
+  "version": "5.0.6",
   "type": "module",
   "engines": {
     "node": "^18.0.0 || >=20.0.0",
@@ -35,12 +35,12 @@
   "dependencies": {
     "@logicflow/core": "2.0.6",
     "@logicflow/extension": "2.0.10",
-    "@vueuse/core": "^11.1.0",
+    "@vueuse/core": "^11.2.0",
     "axios": "^1.7.5",
     "clipboard": "^2.0.11",
     "currency.js": "^2.0.4",
     "dayjs": "^1.11.10",
-    "echarts": "^5.5.0",
+    "echarts": "^5.5.1",
     "html-to-image": "1.11.11",
     "interactjs": "1.10.26",
     "jsbarcode": "3.11.6",
@@ -50,7 +50,7 @@
     "pinia": "^2.2.4",
     "pinia-plugin-persistedstate": "^4.1.1",
     "print-js": "^1.6.0",
-    "vue": "^3.5.12",
+    "vue": "^3.5.13",
     "vue-demi": "0.14.6",
     "vue-hooks-plus": "2.2.1",
     "vue-i18n": "^9.13.1",

pnpm-lock.yaml

@@ -15,8 +15,8 @@ importers:
         specifier: 2.0.10
         version: 2.0.10(@logicflow/core@2.0.6)
       '@vueuse/core':
-        specifier: ^11.1.0
+        specifier: ^11.2.0
-        version: 11.1.0(vue@3.5.12(typescript@5.6.3))
+        version: 11.2.0(vue@3.5.13(typescript@5.6.3))
       axios:
         specifier: ^1.7.5
         version: 1.7.5
@@ -30,8 +30,8 @@ importers:
         specifier: ^1.11.10
         version: 1.11.10
       echarts:
-        specifier: ^5.5.0
+        specifier: ^5.5.1
-        version: 5.5.0
+        version: 5.5.1
       html-to-image:
         specifier: 1.11.11
         version: 1.11.11
@@ -49,31 +49,31 @@ importers:
         version: 1.1.0
       naive-ui:
         specifier: ^2.40.1
-        version: 2.40.1(vue@3.5.12(typescript@5.6.3))
+        version: 2.40.1(vue@3.5.13(typescript@5.6.3))
       pinia:
         specifier: ^2.2.4
-        version: 2.2.4(typescript@5.6.3)(vue@3.5.12(typescript@5.6.3))
+        version: 2.2.4(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
       pinia-plugin-persistedstate:
         specifier: ^4.1.1
-        version: 4.1.1(pinia@2.2.4(typescript@5.6.3)(vue@3.5.12(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3)
+        version: 4.1.1(pinia@2.2.4(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3)
       print-js:
         specifier: ^1.6.0
         version: 1.6.0
       vue:
-        specifier: ^3.5.12
+        specifier: ^3.5.13
-        version: 3.5.12(typescript@5.6.3)
+        version: 3.5.13(typescript@5.6.3)
       vue-demi:
         specifier: 0.14.6
-        version: 0.14.6(vue@3.5.12(typescript@5.6.3))
+        version: 0.14.6(vue@3.5.13(typescript@5.6.3))
       vue-hooks-plus:
         specifier: 2.2.1
-        version: 2.2.1(vue@3.5.12(typescript@5.6.3))
+        version: 2.2.1(vue@3.5.13(typescript@5.6.3))
       vue-i18n:
         specifier: ^9.13.1
-        version: 9.13.1(vue@3.5.12(typescript@5.6.3))
+        version: 9.13.1(vue@3.5.13(typescript@5.6.3))
       vue-router:
         specifier: ^4.3.2
-        version: 4.3.2(vue@3.5.12(typescript@5.6.3))
+        version: 4.3.2(vue@3.5.13(typescript@5.6.3))
       vue3-next-qrcode:
         specifier: 2.0.10
         version: 2.0.10(typescript@5.6.3)
@@ -89,7 +89,7 @@ importers:
         version: 1.10.21
       '@intlify/unplugin-vue-i18n':
         specifier: ^4.0.0
-        version: 4.0.0(rollup@4.20.0)(vue-i18n@9.13.1(vue@3.5.12(typescript@5.6.3)))
+        version: 4.0.0(rollup@4.20.0)(vue-i18n@9.13.1(vue@3.5.13(typescript@5.6.3)))
       '@types/crypto-js':
         specifier: ^4.2.2
         version: 4.2.2
@@ -110,10 +110,10 @@ importers:
         version: 8.13.0(eslint@8.57.0)(typescript@5.6.3)
       '@vitejs/plugin-vue':
         specifier: ^5.1.0
-        version: 5.1.0(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.12(typescript@5.6.3))
+        version: 5.1.0(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.13(typescript@5.6.3))
       '@vitejs/plugin-vue-jsx':
         specifier: ^4.0.1
-        version: 4.0.1(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.12(typescript@5.6.3))
+        version: 4.0.1(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.13(typescript@5.6.3))
       '@vitest/ui':
         specifier: 1.4.0
         version: 1.4.0(vitest@1.5.2)
@@ -125,7 +125,7 @@ importers:
         version: 12.0.0(eslint-plugin-vue@9.25.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.6.3)
       '@vue/test-utils':
         specifier: 2.4.3
-        version: 2.4.3(@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.6.3)))(vue@3.5.12(typescript@5.6.3))
+        version: 2.4.3(@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))
       autoprefixer:
         specifier: ^10.4.16
         version: 10.4.16(postcss@8.4.38)
@@ -182,10 +182,10 @@ importers:
         version: 5.6.3
       unplugin-auto-import:
         specifier: ^0.18.2
-        version: 0.18.2(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(@vueuse/core@11.1.0(vue@3.5.12(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3)
+        version: 0.18.2(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(@vueuse/core@11.2.0(vue@3.5.13(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3)
       unplugin-vue-components:
         specifier: ^0.27.4
-        version: 0.27.4(@babel/parser@7.25.8)(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(rollup@4.20.0)(vue@3.5.12(typescript@5.6.3))(webpack-sources@3.2.3)
+        version: 0.27.4(@babel/parser@7.26.2)(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(rollup@4.20.0)(vue@3.5.13(typescript@5.6.3))(webpack-sources@3.2.3)
       vite:
         specifier: ^5.4.3
         version: 5.4.3(@types/node@20.5.1)(sass@1.71.1)
@@ -375,6 +375,11 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.26.2':
+    resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   '@babel/plugin-syntax-jsx@7.24.1':
     resolution: {integrity: sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==}
     engines: {node: '>=6.9.0'}
@@ -1317,6 +1322,9 @@ packages:
   '@vue/compiler-core@3.5.12':
     resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
 
+  '@vue/compiler-core@3.5.13':
+    resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
+
   '@vue/compiler-dom@3.4.21':
     resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
 
@@ -1326,6 +1334,9 @@ packages:
   '@vue/compiler-dom@3.5.12':
     resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
 
+  '@vue/compiler-dom@3.5.13':
+    resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
+
   '@vue/compiler-sfc@3.4.21':
     resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}
 
@@ -1335,6 +1346,9 @@ packages:
   '@vue/compiler-sfc@3.5.12':
     resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
 
+  '@vue/compiler-sfc@3.5.13':
+    resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==}
+
   '@vue/compiler-ssr@3.4.21':
     resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}
 
@@ -1344,6 +1358,9 @@ packages:
   '@vue/compiler-ssr@3.5.12':
     resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
 
+  '@vue/compiler-ssr@3.5.13':
+    resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==}
+
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
 
@@ -1378,19 +1395,19 @@ packages:
       typescript:
         optional: true
 
-  '@vue/reactivity@3.5.12':
+  '@vue/reactivity@3.5.13':
-    resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
+    resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
 
-  '@vue/runtime-core@3.5.12':
+  '@vue/runtime-core@3.5.13':
-    resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
+    resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==}
 
-  '@vue/runtime-dom@3.5.12':
+  '@vue/runtime-dom@3.5.13':
-    resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
+    resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==}
 
-  '@vue/server-renderer@3.5.12':
+  '@vue/server-renderer@3.5.13':
-    resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
+    resolution: {integrity: sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==}
     peerDependencies:
-      vue: 3.5.12
+      vue: 3.5.13
 
   '@vue/shared@3.4.21':
     resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
@@ -1401,6 +1418,9 @@ packages:
   '@vue/shared@3.5.12':
     resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
 
+  '@vue/shared@3.5.13':
+    resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
+
   '@vue/test-utils@2.4.3':
     resolution: {integrity: sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==}
     peerDependencies:
@@ -1410,14 +1430,14 @@ packages:
       '@vue/server-renderer':
         optional: true
 
-  '@vueuse/core@11.1.0':
+  '@vueuse/core@11.2.0':
-    resolution: {integrity: sha512-P6dk79QYA6sKQnghrUz/1tHi0n9mrb/iO1WTMk/ElLmTyNqgDeSZ3wcDf6fRBGzRJbeG1dxzEOvLENMjr+E3fg==}
+    resolution: {integrity: sha512-JIUwRcOqOWzcdu1dGlfW04kaJhW3EXnnjJJfLTtddJanymTL7lF1C0+dVVZ/siLfc73mWn+cGP1PE1PKPruRSA==}
 
-  '@vueuse/metadata@11.1.0':
+  '@vueuse/metadata@11.2.0':
-    resolution: {integrity: sha512-l9Q502TBTaPYGanl1G+hPgd3QX5s4CGnpXriVBR5fEZ/goI6fvDaVmIl3Td8oKFurOxTmbXvBPSsgrd6eu6HYg==}
+    resolution: {integrity: sha512-L0ZmtRmNx+ZW95DmrgD6vn484gSpVeRbgpWevFKXwqqQxW9hnSi2Ppuh2BzMjnbv4aJRiIw8tQatXT9uOB23dQ==}
 
-  '@vueuse/shared@11.1.0':
+  '@vueuse/shared@11.2.0':
-    resolution: {integrity: sha512-YUtIpY122q7osj+zsNMFAfMTubGz0sn5QzE5gPzAIiCmtt2ha3uQUY1+JPyL4gRCTsLPX82Y9brNbo/aqlA91w==}
+    resolution: {integrity: sha512-VxFjie0EanOudYSgMErxXfq6fo8vhr5ICI+BuE3I9FnX7ePllEsVrRQ7O6Q1TLgApeLuPKcHQxAXpP+KnlrJsg==}
 
   '@xn-sakina/rml-darwin-arm64@2.3.0':
     resolution: {integrity: sha512-3CxaA3NRBo6pd9i6Ih5FL+3qmCrYt4nlc1dAw+VhvyUImkSt1tt9WVvm955i2YJVEjQydgsE+U1xhxKJnFa8Hg==}
@@ -2227,8 +2247,8 @@ packages:
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
-  echarts@5.5.0:
+  echarts@5.5.1:
-    resolution: {integrity: sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==}
+    resolution: {integrity: sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==}
 
   editorconfig@1.0.4:
     resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
@@ -3333,6 +3353,9 @@ packages:
   magic-string@0.30.11:
     resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
 
+  magic-string@0.30.12:
+    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
+
   magic-string@0.30.8:
     resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
     engines: {node: '>=12'}
@@ -3594,8 +3617,8 @@ packages:
   object-inspect@1.13.1:
     resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
 
-  object-inspect@1.13.2:
+  object-inspect@1.13.3:
-    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
     engines: {node: '>= 0.4'}
 
   object-keys@1.1.1:
@@ -3826,6 +3849,10 @@ packages:
     resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postcss@8.4.49:
+    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
+    engines: {node: ^10 || ^12 || >=14}
+
   posthtml-parser@0.2.1:
     resolution: {integrity: sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==}
 
@@ -4850,8 +4877,8 @@ packages:
   vue3-next-qrcode@2.0.10:
     resolution: {integrity: sha512-YwdQ1YjbHzcUsA7Vj5ziQLoX7oQZGWDZNaAadLu7EZzV9UU8Dd2IXAxGobF7dIHamgz5mPiOgH1Xb3qO8bCGDA==}
 
-  vue@3.5.12:
+  vue@3.5.13:
-    resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==}
+    resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -4988,8 +5015,8 @@ packages:
     resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
     engines: {node: '>=12.20'}
 
-  zrender@5.5.0:
+  zrender@5.6.0:
-    resolution: {integrity: sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==}
+    resolution: {integrity: sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==}
 
 snapshots:
 
@@ -5207,6 +5234,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.26.0
 
+  '@babel/parser@7.26.2':
+    dependencies:
+      '@babel/types': 7.26.0
+
   '@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.7)':
     dependencies:
       '@babel/core': 7.24.7
@@ -5400,9 +5431,9 @@ snapshots:
     dependencies:
       css-render: 0.15.14
 
-  '@css-render/vue3-ssr@0.15.14(vue@3.5.12(typescript@5.6.3))':
+  '@css-render/vue3-ssr@0.15.14(vue@3.5.13(typescript@5.6.3))':
     dependencies:
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   '@emotion/hash@0.8.0': {}
 
@@ -5585,7 +5616,7 @@ snapshots:
 
   '@interactjs/types@1.10.26': {}
 
-  '@intlify/bundle-utils@8.0.0(vue-i18n@9.13.1(vue@3.5.12(typescript@5.6.3)))':
+  '@intlify/bundle-utils@8.0.0(vue-i18n@9.13.1(vue@3.5.13(typescript@5.6.3)))':
     dependencies:
       '@intlify/message-compiler': 9.13.1
       '@intlify/shared': 9.13.1
@@ -5597,7 +5628,7 @@ snapshots:
       source-map-js: 1.2.0
       yaml-eslint-parser: 1.2.2
     optionalDependencies:
-      vue-i18n: 9.13.1(vue@3.5.12(typescript@5.6.3))
+      vue-i18n: 9.13.1(vue@3.5.13(typescript@5.6.3))
 
   '@intlify/core-base@9.13.1':
     dependencies:
@@ -5611,9 +5642,9 @@ snapshots:
 
   '@intlify/shared@9.13.1': {}
 
-  '@intlify/unplugin-vue-i18n@4.0.0(rollup@4.20.0)(vue-i18n@9.13.1(vue@3.5.12(typescript@5.6.3)))':
+  '@intlify/unplugin-vue-i18n@4.0.0(rollup@4.20.0)(vue-i18n@9.13.1(vue@3.5.13(typescript@5.6.3)))':
     dependencies:
-      '@intlify/bundle-utils': 8.0.0(vue-i18n@9.13.1(vue@3.5.12(typescript@5.6.3)))
+      '@intlify/bundle-utils': 8.0.0(vue-i18n@9.13.1(vue@3.5.13(typescript@5.6.3)))
       '@intlify/shared': 9.13.1
       '@rollup/pluginutils': 5.1.0(rollup@4.20.0)
       '@vue/compiler-sfc': 3.4.27
@@ -5626,7 +5657,7 @@ snapshots:
       source-map-js: 1.2.0
       unplugin: 1.10.1
     optionalDependencies:
-      vue-i18n: 9.13.1(vue@3.5.12(typescript@5.6.3))
+      vue-i18n: 9.13.1(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -6072,20 +6103,20 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.12(typescript@5.6.3))':
+  '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.13(typescript@5.6.3))':
     dependencies:
       '@babel/core': 7.24.7
       '@babel/plugin-transform-typescript': 7.24.8(@babel/core@7.24.7)
       '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.24.7)
       vite: 5.4.3(@types/node@20.5.1)(sass@1.71.1)
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.1.0(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.12(typescript@5.6.3))':
+  '@vitejs/plugin-vue@5.1.0(vite@5.4.3(@types/node@20.5.1)(sass@1.71.1))(vue@3.5.13(typescript@5.6.3))':
     dependencies:
       vite: 5.4.3(@types/node@20.5.1)(sass@1.71.1)
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   '@vitest/expect@1.5.2':
     dependencies:
@@ -6199,6 +6230,14 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
+  '@vue/compiler-core@3.5.13':
+    dependencies:
+      '@babel/parser': 7.26.2
+      '@vue/shared': 3.5.13
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.1
+
   '@vue/compiler-dom@3.4.21':
     dependencies:
       '@vue/compiler-core': 3.4.21
@@ -6214,6 +6253,11 @@ snapshots:
       '@vue/compiler-core': 3.5.12
       '@vue/shared': 3.5.12
 
+  '@vue/compiler-dom@3.5.13':
+    dependencies:
+      '@vue/compiler-core': 3.5.13
+      '@vue/shared': 3.5.13
+
   '@vue/compiler-sfc@3.4.21':
     dependencies:
       '@babel/parser': 7.24.1
@@ -6250,6 +6294,18 @@ snapshots:
       postcss: 8.4.47
       source-map-js: 1.2.1
 
+  '@vue/compiler-sfc@3.5.13':
+    dependencies:
+      '@babel/parser': 7.26.2
+      '@vue/compiler-core': 3.5.13
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
+      estree-walker: 2.0.2
+      magic-string: 0.30.12
+      postcss: 8.4.49
+      source-map-js: 1.2.1
+
   '@vue/compiler-ssr@3.4.21':
     dependencies:
       '@vue/compiler-dom': 3.4.21
@@ -6265,6 +6321,11 @@ snapshots:
       '@vue/compiler-dom': 3.5.12
       '@vue/shared': 3.5.12
 
+  '@vue/compiler-ssr@3.5.13':
+    dependencies:
+      '@vue/compiler-dom': 3.5.13
+      '@vue/shared': 3.5.13
+
   '@vue/compiler-vue2@2.7.16':
     dependencies:
       de-indent: 1.0.2
@@ -6308,27 +6369,27 @@ snapshots:
     optionalDependencies:
       typescript: 5.6.3
 
-  '@vue/reactivity@3.5.12':
+  '@vue/reactivity@3.5.13':
     dependencies:
-      '@vue/shared': 3.5.12
+      '@vue/shared': 3.5.13
 
-  '@vue/runtime-core@3.5.12':
+  '@vue/runtime-core@3.5.13':
     dependencies:
-      '@vue/reactivity': 3.5.12
+      '@vue/reactivity': 3.5.13
-      '@vue/shared': 3.5.12
+      '@vue/shared': 3.5.13
 
-  '@vue/runtime-dom@3.5.12':
+  '@vue/runtime-dom@3.5.13':
     dependencies:
-      '@vue/reactivity': 3.5.12
+      '@vue/reactivity': 3.5.13
-      '@vue/runtime-core': 3.5.12
+      '@vue/runtime-core': 3.5.13
-      '@vue/shared': 3.5.12
+      '@vue/shared': 3.5.13
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.6.3))':
+  '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.6.3))':
     dependencies:
-      '@vue/compiler-ssr': 3.5.12
+      '@vue/compiler-ssr': 3.5.13
-      '@vue/shared': 3.5.12
+      '@vue/shared': 3.5.13
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   '@vue/shared@3.4.21': {}
 
@@ -6336,29 +6397,31 @@ snapshots:
 
   '@vue/shared@3.5.12': {}
 
-  '@vue/test-utils@2.4.3(@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.6.3)))(vue@3.5.12(typescript@5.6.3))':
+  '@vue/shared@3.5.13': {}
+
+  '@vue/test-utils@2.4.3(@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))':
     dependencies:
       js-beautify: 1.14.11
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
       vue-component-type-helpers: 1.8.26
     optionalDependencies:
-      '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.6.3))
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.6.3))
 
-  '@vueuse/core@11.1.0(vue@3.5.12(typescript@5.6.3))':
+  '@vueuse/core@11.2.0(vue@3.5.13(typescript@5.6.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
-      '@vueuse/metadata': 11.1.0
+      '@vueuse/metadata': 11.2.0
-      '@vueuse/shared': 11.1.0(vue@3.5.12(typescript@5.6.3))
+      '@vueuse/shared': 11.2.0(vue@3.5.13(typescript@5.6.3))
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.3))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/metadata@11.1.0': {}
+  '@vueuse/metadata@11.2.0': {}
 
-  '@vueuse/shared@11.1.0(vue@3.5.12(typescript@5.6.3))':
+  '@vueuse/shared@11.2.0(vue@3.5.13(typescript@5.6.3))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.3))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -7183,10 +7246,10 @@ snapshots:
 
   eastasianwidth@0.2.0: {}
 
-  echarts@5.5.0:
+  echarts@5.5.1:
     dependencies:
       tslib: 2.3.0
-      zrender: 5.5.0
+      zrender: 5.6.0
 
   editorconfig@1.0.4:
     dependencies:
@@ -7256,7 +7319,7 @@ snapshots:
       is-string: 1.0.7
       is-typed-array: 1.1.13
       is-weakref: 1.0.2
-      object-inspect: 1.13.2
+      object-inspect: 1.13.3
       object-keys: 1.1.1
       object.assign: 4.1.5
       regexp.prototype.flags: 1.5.2
@@ -8421,6 +8484,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
+  magic-string@0.30.12:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
+
   magic-string@0.30.8:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
@@ -8610,10 +8677,10 @@ snapshots:
       arrify: 2.0.1
       minimatch: 3.1.2
 
-  naive-ui@2.40.1(vue@3.5.12(typescript@5.6.3)):
+  naive-ui@2.40.1(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       '@css-render/plugin-bem': 0.15.14(css-render@0.15.14)
-      '@css-render/vue3-ssr': 0.15.14(vue@3.5.12(typescript@5.6.3))
+      '@css-render/vue3-ssr': 0.15.14(vue@3.5.13(typescript@5.6.3))
       '@types/katex': 0.16.7
       '@types/lodash': 4.17.6
       '@types/lodash-es': 4.17.12
@@ -8628,10 +8695,10 @@ snapshots:
       lodash-es: 4.17.21
       seemly: 0.3.8
       treemate: 0.3.11
-      vdirs: 0.1.8(vue@3.5.12(typescript@5.6.3))
+      vdirs: 0.1.8(vue@3.5.13(typescript@5.6.3))
-      vooks: 0.2.12(vue@3.5.12(typescript@5.6.3))
+      vooks: 0.2.12(vue@3.5.13(typescript@5.6.3))
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
-      vueuc: 0.4.64(vue@3.5.12(typescript@5.6.3))
+      vueuc: 0.4.64(vue@3.5.13(typescript@5.6.3))
 
   nanoid@3.3.7: {}
 
@@ -8710,7 +8777,7 @@ snapshots:
 
   object-inspect@1.13.1: {}
 
-  object-inspect@1.13.2: {}
+  object-inspect@1.13.3: {}
 
   object-keys@1.1.1: {}
 
@@ -8858,25 +8925,25 @@ snapshots:
 
   pidtree@0.6.0: {}
 
-  pinia-plugin-persistedstate@4.1.1(pinia@2.2.4(typescript@5.6.3)(vue@3.5.12(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3):
+  pinia-plugin-persistedstate@4.1.1(pinia@2.2.4(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3):
     dependencies:
       '@nuxt/kit': 3.13.2(rollup@4.20.0)(webpack-sources@3.2.3)
       deep-pick-omit: 1.2.1
       defu: 6.1.4
       destr: 2.0.3
     optionalDependencies:
-      pinia: 2.2.4(typescript@5.6.3)(vue@3.5.12(typescript@5.6.3))
+      pinia: 2.2.4(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - magicast
       - rollup
       - supports-color
       - webpack-sources
 
-  pinia@2.2.4(typescript@5.6.3)(vue@3.5.12(typescript@5.6.3)):
+  pinia@2.2.4(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       '@vue/devtools-api': 6.6.3
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.3))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3))
     optionalDependencies:
       typescript: 5.6.3
 
@@ -8934,6 +9001,12 @@ snapshots:
       picocolors: 1.1.0
       source-map-js: 1.2.1
 
+  postcss@8.4.49:
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
   posthtml-parser@0.2.1:
     dependencies:
       htmlparser2: 3.10.1
@@ -9741,7 +9814,7 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-auto-import@0.18.2(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(@vueuse/core@11.1.0(vue@3.5.12(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3):
+  unplugin-auto-import@0.18.2(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(@vueuse/core@11.2.0(vue@3.5.13(typescript@5.6.3)))(rollup@4.20.0)(webpack-sources@3.2.3):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.20.0)
@@ -9753,12 +9826,12 @@ snapshots:
       unplugin: 1.13.1(webpack-sources@3.2.3)
     optionalDependencies:
       '@nuxt/kit': 3.13.2(rollup@4.20.0)(webpack-sources@3.2.3)
-      '@vueuse/core': 11.1.0(vue@3.5.12(typescript@5.6.3))
+      '@vueuse/core': 11.2.0(vue@3.5.13(typescript@5.6.3))
     transitivePeerDependencies:
       - rollup
       - webpack-sources
 
-  unplugin-vue-components@0.27.4(@babel/parser@7.25.8)(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(rollup@4.20.0)(vue@3.5.12(typescript@5.6.3))(webpack-sources@3.2.3):
+  unplugin-vue-components@0.27.4(@babel/parser@7.26.2)(@nuxt/kit@3.13.2(rollup@4.20.0)(webpack-sources@3.2.3))(rollup@4.20.0)(vue@3.5.13(typescript@5.6.3))(webpack-sources@3.2.3):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.20.0)
@@ -9770,9 +9843,9 @@ snapshots:
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.13.1(webpack-sources@3.2.3)
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
     optionalDependencies:
-      '@babel/parser': 7.25.8
+      '@babel/parser': 7.26.2
       '@nuxt/kit': 3.13.2(rollup@4.20.0)(webpack-sources@3.2.3)
     transitivePeerDependencies:
       - rollup
@@ -9858,10 +9931,10 @@ snapshots:
 
   vary@1.1.2: {}
 
-  vdirs@0.1.8(vue@3.5.12(typescript@5.6.3)):
+  vdirs@0.1.8(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       evtd: 0.2.4
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   vite-bundle-analyzer@0.9.4:
     dependencies:
@@ -10031,22 +10104,22 @@ snapshots:
       - supports-color
       - terser
 
-  vooks@0.2.12(vue@3.5.12(typescript@5.6.3)):
+  vooks@0.2.12(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       evtd: 0.2.4
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   vscode-uri@3.0.8: {}
 
   vue-component-type-helpers@1.8.26: {}
 
-  vue-demi@0.14.10(vue@3.5.12(typescript@5.6.3)):
+  vue-demi@0.14.10(vue@3.5.13(typescript@5.6.3)):
     dependencies:
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
-  vue-demi@0.14.6(vue@3.5.12(typescript@5.6.3)):
+  vue-demi@0.14.6(vue@3.5.13(typescript@5.6.3)):
     dependencies:
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   vue-eslint-parser@9.3.2(eslint@8.57.0):
     dependencies:
@@ -10074,7 +10147,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-hooks-plus@2.2.1(vue@3.5.12(typescript@5.6.3)):
+  vue-hooks-plus@2.2.1(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       '@types/js-cookie': 3.0.6
       '@vue/devtools-api': 6.6.3
@@ -10083,19 +10156,19 @@ snapshots:
       qs: 6.12.1
       query-string: 7.1.3
       screenfull: 5.2.0
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
-  vue-i18n@9.13.1(vue@3.5.12(typescript@5.6.3)):
+  vue-i18n@9.13.1(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       '@intlify/core-base': 9.13.1
       '@intlify/shared': 9.13.1
       '@vue/devtools-api': 6.6.1
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
-  vue-router@4.3.2(vue@3.5.12(typescript@5.6.3)):
+  vue-router@4.3.2(vue@3.5.13(typescript@5.6.3)):
     dependencies:
       '@vue/devtools-api': 6.6.1
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   vue-tsc@2.1.10(typescript@5.6.3):
     dependencies:
@@ -10107,30 +10180,30 @@ snapshots:
   vue3-next-qrcode@2.0.10(typescript@5.6.3):
     dependencies:
       js-binary-schema-parser: 2.0.3
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
     transitivePeerDependencies:
       - typescript
 
-  vue@3.5.12(typescript@5.6.3):
+  vue@3.5.13(typescript@5.6.3):
     dependencies:
-      '@vue/compiler-dom': 3.5.12
+      '@vue/compiler-dom': 3.5.13
-      '@vue/compiler-sfc': 3.5.12
+      '@vue/compiler-sfc': 3.5.13
-      '@vue/runtime-dom': 3.5.12
+      '@vue/runtime-dom': 3.5.13
-      '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.6.3))
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.6.3))
-      '@vue/shared': 3.5.12
+      '@vue/shared': 3.5.13
     optionalDependencies:
       typescript: 5.6.3
 
-  vueuc@0.4.64(vue@3.5.12(typescript@5.6.3)):
+  vueuc@0.4.64(vue@3.5.13(typescript@5.6.3)):
     dependencies:
-      '@css-render/vue3-ssr': 0.15.14(vue@3.5.12(typescript@5.6.3))
+      '@css-render/vue3-ssr': 0.15.14(vue@3.5.13(typescript@5.6.3))
       '@juggle/resize-observer': 3.4.0
       css-render: 0.15.14
       evtd: 0.2.4
       seemly: 0.3.8
-      vdirs: 0.1.8(vue@3.5.12(typescript@5.6.3))
+      vdirs: 0.1.8(vue@3.5.13(typescript@5.6.3))
-      vooks: 0.2.12(vue@3.5.12(typescript@5.6.3))
+      vooks: 0.2.12(vue@3.5.13(typescript@5.6.3))
-      vue: 3.5.12(typescript@5.6.3)
+      vue: 3.5.13(typescript@5.6.3)
 
   webidl-conversions@7.0.0: {}
 
@@ -10243,6 +10316,6 @@ snapshots:
 
   yocto-queue@1.0.0: {}
 
-  zrender@5.5.0:
+  zrender@5.6.0:
     dependencies:
       tslib: 2.3.0

src/app-components/app/AppAvatar/index.tsx

@@ -54,7 +54,14 @@ const AppAvatar = defineComponent({
             objectFit="cover"
             round
             size={avatarSize}
-          />
+          >
+            {{
+              default: () =>
+                getSigningCallback.avatar
+                  ? null
+                  : getSigningCallback?.name?.[0],
+            }}
+          </NAvatar>
           {getSigningCallback?.name}
         </NFlex>
       </NButton>

src/app-components/app/AppLockScreen/components/LockScreen/index.tsx

@@ -1,16 +1,18 @@
 import { NInput, NForm, NFormItem, NButton } from 'naive-ui'
+import AppAvatar from '@/app-components/app/AppAvatar'
 
 import useAppLockScreen from '@/app-components/app/AppLockScreen/appLockVar'
 import { rules, useCondition } from '@/app-components/app/AppLockScreen/shared'
-import { useSettingGetters, useSettingActions } from '@/store'
+import { useSettingActions } from '@/store'
+import { useTemplateRef } from 'vue'
 
 import type { FormInst, InputInst } from 'naive-ui'
 
 const LockScreen = defineComponent({
   name: 'LockScreen',
   setup() {
-    const formInstRef = ref<FormInst | null>(null)
+    const formInstRef = useTemplateRef<FormInst | null>('formInstRef')
-    const inputInstRef = ref<InputInst | null>(null)
+    const inputInstRef = useTemplateRef<InputInst | null>('inputInstRef')
 
     const { setLockAppScreen } = useAppLockScreen()
     const { updateSettingState } = useSettingActions()
@@ -19,7 +21,6 @@ const LockScreen = defineComponent({
       lockCondition: useCondition(),
     })
 
-    /** 锁屏 */
     const lockScreen = () => {
       formInstRef.value?.validate((error) => {
         if (!error) {
@@ -48,6 +49,11 @@ const LockScreen = defineComponent({
     return (
       <div class="app-lock-screen__content">
         <div class="app-lock-screen__input">
+          <AppAvatar
+            avatarSize={52}
+            style="pointer-events: none;margin: 24px 0;"
+            vertical
+          />
           <NForm
             ref="formInstRef"
             model={this.lockCondition}

src/app-components/app/AppLockScreen/components/UnlockScreen/index.tsx

@@ -8,14 +8,15 @@ import { useSigningActions, useSettingActions } from '@/store'
 import { rules, useCondition } from '@/app-components/app/AppLockScreen/shared'
 import useAppLockScreen from '@/app-components/app/AppLockScreen/appLockVar'
 import { useDevice } from '@/hooks'
+import { useTemplateRef } from 'vue'
 
 import type { FormInst, InputInst } from 'naive-ui'
 
 export default defineComponent({
   name: 'UnlockScreen',
   setup() {
-    const formRef = ref<FormInst | null>(null)
+    const formRef = useTemplateRef<FormInst | null>('formRef')
-    const inputInstRef = ref<InputInst | null>(null)
+    const inputInstRef = useTemplateRef<InputInst | null>('inputInstRef')
 
     const { logout } = useSigningActions()
     const { updateSettingState } = useSettingActions()
@@ -24,13 +25,13 @@ export default defineComponent({
 
     const HH_MM_FORMAT = 'HH:mm'
     const AM_PM_FORMAT = 'A'
-    const YY_MM_DD_FORMAT = 'YY年MM月DD日'
+    const YY_MM_DD_FORMAT = 'YYYY-MM-DD'
     const DDD_FORMAT = 'ddd'
 
     const state = reactive({
       lockCondition: useCondition(),
       HH_MM: dayjs().format(HH_MM_FORMAT),
-      AM_PM: dayjs().locale('en').format(AM_PM_FORMAT),
+      AM_PM: dayjs().format(AM_PM_FORMAT),
       YY_MM_DD: dayjs().format(YY_MM_DD_FORMAT),
       DDD: dayjs().format(DDD_FORMAT),
     })
@@ -43,7 +44,6 @@ export default defineComponent({
       state.DDD = dayjs().format(DDD_FORMAT)
     }, 86_400_000)
 
-    /** 退出登陆并且回到登陆页 */
     const backToSigning = () => {
       window.$dialog.warning({
         title: '警告',
@@ -51,15 +51,14 @@ export default defineComponent({
         positiveText: '确定',
         negativeText: '取消',
         onPositiveClick: () => {
-          logout()
+          updateSettingState('lockScreenSwitch', false)
           setTimeout(() => {
-            updateSettingState('lockScreenSwitch', false)
+            logout()
-          })
+          }, 100)
         },
       })
     }
 
-    /** 解锁 */
     const unlockScreen = () => {
       formRef.value?.validate((error) => {
         if (!error) {
@@ -71,6 +70,11 @@ export default defineComponent({
       })
     }
 
+    onMounted(() => {
+      nextTick(() => {
+        inputInstRef.value?.focus()
+      })
+    })
     onBeforeUnmount(() => {
       clearInterval(dayInterval)
       clearInterval(yearInterval)
@@ -126,7 +130,6 @@ export default defineComponent({
                     placeholder="请输入解锁密码"
                     clearable
                     minlength={6}
-                    maxlength={12}
                     onKeydown={(e: KeyboardEvent) => {
                       if (e.code === 'Enter') {
                         unlockScreen()
@@ -153,11 +156,8 @@ export default defineComponent({
               </NForm>
             </div>
             <div class="app-lock-screen__unlock__content-date">
-              <div class="current-date">
-                {HH_MM}&nbsp;<span>{AM_PM}</span>
-              </div>
               <div class="current-year">
-                {YY_MM_DD}&nbsp;<span>{DDD}</span>
+                {YY_MM_DD}&nbsp;<span>{DDD}</span>&nbsp;<span>{AM_PM}</span>
               </div>
             </div>
           </div>

src/app-components/app/AppLockScreen/index.scss

@@ -36,7 +36,7 @@
           width: 100%;
           height: 100%;
           @include flexCenter;
-          font-size: 320px;
+          font-size: 16.67rem;
           gap: 80px;
           z-index: 0;
 
@@ -85,9 +85,23 @@
 
         & .current-year,
         & .current-date span {
-          font-size: 1.5rem;
+          font-size: 1.875rem;
+          line-height: 2.25rem;
         }
       }
     }
   }
 }
+
+.ray-template--light {
+  .app-lock-screen__unlock__content-bg__wrapper {
+    background-color: #fff !important;
+  }
+
+  .app-lock-screen__unlock__content-bg {
+    & .left,
+    & .right {
+      background-color: rgba(244, 244, 245, 1) !important;
+    }
+  }
+}

src/app-components/provider/AppVersionProvider/index.tsx

@@ -28,18 +28,10 @@ export default defineComponent({
       if (version !== cacheVersion) {
         modalShow.value = true
 
-        setStorage<string>(
+        setStorage(APP_CATCH_KEY.appVersionProvider, version, 'localStorage')
-          APP_CATCH_KEY.appVersionProvider,
-          version,
-          'localStorage',
-        )
       }
     } else {
-      setStorage<string>(
+      setStorage(APP_CATCH_KEY.appVersionProvider, version, 'localStorage')
-        APP_CATCH_KEY.appVersionProvider,
-        version,
-        'localStorage',
-      )
     }
 
     return {

src/app-config/router-config.ts

@@ -4,7 +4,7 @@ import type { Ref } from 'vue'
 /**
  *
  * @description
- * 内容区域 ref 注册
+ * 内容区域 shallowRef 注册
  * 可以控制内容区域当前滚动位置
  * 如果你需要在切换路由时候配置自定义滚动到某个视图区域时, 可以使用该属性提供的方法(scrollTo)
  *
@@ -16,12 +16,12 @@ import type { Ref } from 'vue'
  * })
  */
 export const LAYOUT_CONTENT_REF: Readonly<Ref<LayoutInst | null>> =
-  ref<LayoutInst | null>(null)
+  shallowRef<LayoutInst | null>(null)
 
 /**
  *
  * @description
- * 侧边滚动栏滚动 ref 注册。
+ * 侧边滚动栏滚动 shallowRef 注册。
  * 可以控制侧边滚动栏滚动位置。
  *
  * 请注意使用时机。建议使用 nextTick() 等待 dom 挂载后再执行该方法。
@@ -31,7 +31,7 @@ export const LAYOUT_CONTENT_REF: Readonly<Ref<LayoutInst | null>> =
  * })
  */
 export const LAYOUT_SIDER_REF: Readonly<Ref<LayoutInst | null>> =
-  ref<LayoutInst | null>(null)
+  shallowRef<LayoutInst | null>(null)
 
 export const SETUP_ROUTER_ACTION = {
   /** 是否启用路由切换时顶部加载条 */

src/axios/axios-interceptor/request/plugins/request-headers.ts

@@ -16,7 +16,7 @@ import type {
  * 当然你也可以根据 request instance 来特殊处理, 这里暂时不做演示
  */
 const requestHeaderToken = (ins: RequestInterceptorConfig, mode: string) => {
-  const token = getStorage<string>(APP_CATCH_KEY.token, 'localStorage')
+  const token = getStorage<string | null>(APP_CATCH_KEY.token, 'localStorage')
 
   if (ins.url) {
     // TODO: 根据 url 不同是否设置 token

src/axios/index.ts

@@ -40,14 +40,14 @@ function useRequest<
   fetchOptions: AppRawRequestConfig<Response>,
   option?: UseRequestOptions<Response, HookPlusParams, HookPlusPlugin>,
 ) {
-  const fc = () => {
+  const fn = () => {
     const cb = request<Response>(fetchOptions)
 
     return cb
   }
 
   const hooks = useHookPlusRequest<Response, HookPlusParams>(
-    fc,
+    fn,
     Object.assign({}, option),
   )
 

src/components/base/RChart/src/config.ts

@@ -0,0 +1,6 @@
+import type { InjectionKey } from 'vue'
+import type { ChartProviderOptions } from './hooks/useChartProvider'
+
+export const USE_CHART_PROVIDER_KEY: InjectionKey<
+  Partial<ChartProviderOptions>
+> = Symbol('USE_CHART_PROVIDER_KEY')

src/components/base/RChart/src/hooks/useChartProvider.ts

@@ -0,0 +1,18 @@
+import { USE_CHART_PROVIDER_KEY } from '../config'
+
+import type { ChartTheme } from '../types'
+
+export interface ChartProviderOptions {
+  theme: ChartTheme
+}
+
+/**
+ *
+ * @param 配置项
+ *
+ * @description
+ * 全局 chart 配置项。
+ */
+export const useChartProvider = (options: Partial<ChartProviderOptions>) => {
+  provide(USE_CHART_PROVIDER_KEY, options)
+}

src/components/base/RChart/src/index.tsx

@@ -36,6 +36,7 @@ import {
 import { RMoreDropdown } from '@/components'
 import { useSettingGetters } from '@/store'
 import { useTemplateRef } from 'vue'
+import { USE_CHART_PROVIDER_KEY } from './config'
 
 import type { WatchStopHandle } from 'vue'
 import type { AnyFC } from '@/types'
@@ -124,6 +125,7 @@ export default defineComponent({
     const __catch = {
       aria: props.showAria,
     }
+    const chartProvideOptions = inject(USE_CHART_PROVIDER_KEY, {})
 
     /**
      *
@@ -174,10 +176,19 @@ export default defineComponent({
      * 但是，如果未获取到 echartTheme 属性，则会使用默认样式。
      */
     const updateChartTheme = () => {
+      const { theme: providerTheme } = chartProvideOptions || {}
+
       if (echartInstanceRef.value) {
         destroyChart()
       }
 
+      // 如果配置了全局配置主题，则忽略后面所有逻辑
+      if (providerTheme) {
+        renderChart(providerTheme)
+
+        return
+      }
+
       if (props.theme === 'default') {
         props.autoChangeTheme ? renderChart('dark') : renderChart('')
 

src/components/base/RForm/src/hooks/useForm.ts

@@ -40,7 +40,7 @@ const useForm = <T extends Recordable, R extends RFormRules>(
   model?: T,
   rules?: R,
 ) => {
-  const formRef = ref<RFormInst>()
+  const formRef = shallowRef<RFormInst>()
 
   const register = (inst: RFormInst) => {
     if (inst) {

src/components/base/RTable/src/hooks/useTable.ts

@@ -41,7 +41,7 @@ import type { PrintDomOptions } from '@/utils'
  * })
  */
 const useTable = () => {
-  const tableRef = ref<RTableInst>()
+  const tableRef = shallowRef<RTableInst>()
   let extra = {} as TableProvider
 
   const register: UseTableRegister = (inst, extraInfo) => {

src/dayjs/index.ts

@@ -1,6 +1,10 @@
 import dayjs from 'dayjs'
 import { DEFAULT_DAYJS_LOCAL } from '@/app-config'
 import 'dayjs/locale/zh-cn'
+import { getStorage } from '@/utils'
+import { APP_CATCH_KEY, DAYJS_LOCAL_MAP } from '@/app-config'
+
+import type { SettingState } from '@/store/modules/setting/types'
 
 /**
  *
@@ -10,5 +14,16 @@ import 'dayjs/locale/zh-cn'
  * 初始化 dayjs 的语言环境。
  */
 export const setupDayjs = () => {
-  dayjs.locale(DEFAULT_DAYJS_LOCAL)
+  const { localeLanguage } = getStorage<SettingState>(
+    APP_CATCH_KEY.appPiniaSettingStore,
+    'localStorage',
+    {
+      defaultValue: {} as SettingState,
+    },
+  )
+  const local =
+    DAYJS_LOCAL_MAP[localeLanguage as keyof typeof DAYJS_LOCAL_MAP] ||
+    DEFAULT_DAYJS_LOCAL
+
+  dayjs.locale(local)
 }

src/directives/utils/combine.ts

@@ -8,10 +8,10 @@ export const combineDirective = <
 ) => {
   const directives = Object.keys(directiveModules).reduce(
     (pre, curr) => {
-      const fc = directiveModules[curr]?.default
+      const fn = directiveModules[curr]?.default
 
-      if (typeof fc === 'function') {
+      if (typeof fn === 'function') {
-        pre[curr as K] = fc
+        pre[curr as K] = fn
 
         return pre
       } else {

src/hooks/components/useContextmenuCoordinate.ts

@@ -23,10 +23,11 @@ export interface UseContextmenuCoordinateOptions {
  *
  * @param target 绑定元素
  *
- * 右键点击元素时，获取鼠标坐标。该方法结合 NDropdown 组件使用，可以实现右键菜单功能
+ * @description
+ * 右键点击元素时，获取鼠标坐标。该方法结合 NDropdown 组件使用，可以实现右键菜单功能。
  *
  * @example
- * const target = ref<HTMLElement | null>(null)
+ * const target = useTemplateRef<HTMLElement | null>('target')
  * const { x, y, show, stop } = useContextmenuCoordinate(target)
  *
  * 如果需要手动停止右键菜单，可以调用 stop 方法
@@ -44,6 +45,13 @@ export const useContextmenuCoordinate = (
   const show = ref(false) // 是否显示右键菜单
   const { clickOutside } = options ?? {}
 
+  /**
+   *
+   * @param value 是否显示右键菜单
+   *
+   * @description
+   * 更新右键菜单的显示状态。
+   */
   const updateShow = (value: boolean) => {
     show.value = value
   }
@@ -52,8 +60,9 @@ export const useContextmenuCoordinate = (
    *
    * @param evt 鼠标事件
    *
-   * 鼠标右键点击事件，并且阻止默认事件
+   * @description
-   * 设置坐标后激活右键菜单
+   * 鼠标右键点击事件，并且阻止默认事件。
+   * 设置坐标后激活右键菜单。
    */
   const bindContextMenuEvent = (evt: Event) => {
     evt.preventDefault()
@@ -73,7 +82,8 @@ export const useContextmenuCoordinate = (
   if (clickOutside) {
     /**
      *
-     * 自定义点击元素外部时的回调函数
+     * @description
+     * 自定义点击元素外部时的回调函数。
      */
     onClickOutside(target as MaybeElementRef<MaybeElement>, (detectIframe) => {
       clickOutside(detectIframe)
@@ -82,7 +92,8 @@ export const useContextmenuCoordinate = (
 
   /**
    *
-   * 为传递 ref dom 绑定右键菜单事件
+   * @description
+   * 为传递 ref dom 绑定右键菜单事件。
    */
   const cleanupContextmenu = useEventListener(
     target,
@@ -90,9 +101,11 @@ export const useContextmenuCoordinate = (
     bindContextMenuEvent,
     options,
   )
+
   /**
    *
-   * 为传递 ref dom 绑定点击事件
+   * @description
+   * 为传递 ref dom 绑定点击事件。
    */
   const cleanupClick = useEventListener(target, 'click', () => {
     updateShow(false)
@@ -100,8 +113,9 @@ export const useContextmenuCoordinate = (
 
   /**
    *
-   * 注销绑定的右键菜单事件、点击事件
+   * @description
-   * 仅注销该方法绑定的事件
+   * 注销绑定的右键菜单事件、点击事件。
+   * 仅注销该方法绑定的事件。
    */
   const stop = () => {
     cleanupContextmenu()

src/hooks/template/useSiderBar.ts

@@ -10,17 +10,17 @@ export type CloseMenuTag = Key | MenuTagOptions
 /**
  *
  * @param target 标签页对象、索引、key
- * @param fc 触发函数
+ * @param fn 触发函数
  *
  * 该方法用于统一获取目标标签页方法
  */
-const normalMenuTagOption = (target: CloseMenuTag, fc: string) => {
+const normalMenuTagOption = (target: CloseMenuTag, fn: string) => {
   const { getMenuTagOptions } = useMenuGetters()
 
   if (typeof target === 'number') {
     // 判断是否为 NaN
     if (isNaN(target)) {
-      console.warn(`${fc}: The ${target} is NaN, expect number.`)
+      console.warn(`${fn}: The ${target} is NaN, expect number.`)
 
       return
     }
@@ -28,7 +28,7 @@ const normalMenuTagOption = (target: CloseMenuTag, fc: string) => {
     // 判断是否超出当前标签页列表最大长度或者是否为负数
     if (target > getMenuTagOptions.value.length || target < -1) {
       console.warn(
-        `${fc}: The incoming index ${target} did not match the corresponding item.`,
+        `${fn}: The incoming index ${target} did not match the corresponding item.`,
       )
 
       return
@@ -50,7 +50,7 @@ const normalMenuTagOption = (target: CloseMenuTag, fc: string) => {
           index,
         }
       : console.warn(
-          `${fc}: The incoming key ${target} did not match the corresponding item.`,
+          `${fn}: The incoming key ${target} did not match the corresponding item.`,
         )
   } else {
     const { fullPath } = target
@@ -60,7 +60,7 @@ const normalMenuTagOption = (target: CloseMenuTag, fc: string) => {
 
     if (index === -1) {
       console.warn(
-        `${fc}: The incoming menuTag option ${target.fullPath} did not match the corresponding item.`,
+        `${fn}: The incoming menuTag option ${target.fullPath} did not match the corresponding item.`,
       )
 
       return

src/hooks/web/useDomToImage.ts

@@ -85,7 +85,7 @@ const domToImageMethods = {
 
 /**
  *
- * @param target ref dom
+ * @param target useTemplateRef dom
  * @param options html-to-image options
  *
  * @see https://github.com/bubkoo/html-to-image
@@ -99,7 +99,7 @@ const domToImageMethods = {
  * 如果都未传递，则默认使用 jpeg。
  *
  * @example
- * const refDom = ref<HTMLElement>()
+ * const refDom = useTemplateRef<HTMLElement>('refDom')
  * const { create, stop } = useDomToImage(refDom, {
  *   beforeCreate: (element) => { ... },
  *   created: (element, result) => { ... },

src/hooks/web/useElementFullscreen.ts

@@ -82,7 +82,7 @@ const styleElement = document.createElement('style')
  *  <div ref="refDom" />
  * </template>
  * <script lang="ts" setup>
- * const refDom = ref<HTMLElement>()
+ * const refDom = useTemplateRef<HTMLElement>('refDom')
  * const { enter, exit, toggleFullscreen } = useElementFullscreen(refDom, { UseElementFullscreenOptions })
  *
  * enter() // 进入全屏

src/hooks/web/usePagination.ts

@@ -17,7 +17,7 @@ type OmitKeys =
 
 export interface UsePaginationOptions extends Omit<PaginationProps, OmitKeys> {}
 
-const defaultOptions: UsePaginationOptions = {
+const DEFAULT_OPTIONS: UsePaginationOptions = {
   page: 1,
   pageSize: 10,
   showSizePicker: true,
@@ -36,16 +36,8 @@ export const usePagination = <T extends AnyFC>(
   callback?: T,
   options?: UsePaginationOptions,
 ) => {
-  const callbackRef = ref(callback)
+  const callbackRef = shallowRef(callback)
-  const omitOptions = omit(options, [
+  const paginationMethods = {
-    'on-update:page',
-    'on-update:page-size',
-    'onUpdatePage',
-    'onUpdatePageSize',
-    'onUpdate:page',
-    'onUpdate:page-size',
-  ])
-  const methodsOptions = {
     onUpdatePage: (page: number) => {
       paginationRef.value.page = page
 
@@ -53,16 +45,30 @@ export const usePagination = <T extends AnyFC>(
     },
     onUpdatePageSize: (pageSize: number) => {
       paginationRef.value.pageSize = pageSize
-      paginationRef.value.page = 1
+      paginationRef.value.page = DEFAULT_OPTIONS.page
 
       callbackRef.value?.()
     },
   }
-  const paginationRef = ref<PaginationProps>(
+  // 使用 computed 优化配置合并
-    Object.assign({}, defaultOptions, omitOptions, methodsOptions),
+  const mergedOptions = computed(() => ({
-  )
+    ...DEFAULT_OPTIONS,
+    ...omit(options, [
+      'on-update:page',
+      'on-update:page-size',
+      'onUpdatePage',
+      'onUpdatePageSize',
+      'onUpdate:page',
+      'onUpdate:page-size',
+    ]),
+    ...paginationMethods,
+  }))
+  const paginationRef = ref<PaginationProps>(mergedOptions.value)
 
+  // 更新分页页数
   const updatePage = paginationRef.value.onUpdatePage as (page: number) => void
+
+  // 更新分页每页条数
   const updatePageSize = paginationRef.value.onUpdatePageSize as (
     pageSize: number,
   ) => void
@@ -137,7 +143,7 @@ export const usePagination = <T extends AnyFC>(
    * @description
    * 获取回调函数。
    */
-  const getCallback = callback
+  const getCallback = callbackRef.value as T
 
   /**
    *
@@ -149,9 +155,8 @@ export const usePagination = <T extends AnyFC>(
    * @example
    * setCallback(() => {})
    */
-  const setCallback = (callback: T) => {
+  const setCallback = (callback: AnyFC) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    callbackRef.value = callback
-    callbackRef.value = callback as any
   }
 
   /**
@@ -165,8 +170,9 @@ export const usePagination = <T extends AnyFC>(
   const resetPagination = () => {
     const { pageSizes } = paginationRef.value
 
-    paginationRef.value.page = 1
+    paginationRef.value.page = DEFAULT_OPTIONS.page
-    paginationRef.value.pageSize = (pageSizes?.[0] as number) || 10
+    paginationRef.value.pageSize =
+      (pageSizes?.[0] as number) || DEFAULT_OPTIONS.pageSize
   }
 
   effectDispose(() => {

src/hooks/web/usePrint.ts

@@ -16,16 +16,16 @@ export type UsePrintTarget<T = unknown> =
 
 /**
  *
- * @param target ref dom
+ * @param target useTemplateRef dom
  * @param options print-js options
  *
  * @see https://printjs.crabbly.com/
  *
  * @description
- * 拓展 print-js 的 usePrint 方法，允许 ref Dom 直接调用打印，其余的不变。
+ * 拓展 print-js 的 usePrint 方法，允许 useTemplateRef Dom 直接调用打印，其余的不变。
  *
  * @example
- * const refDom = ref<HTMLElement>()
+ * const refDom = useTemplateRef<HTMLElement>('refDom')
  *
  * const { print } = usePrint(refDom, {})
  *

src/layout/components/Menu/components/SiderBarLogo/index.tsx

@@ -6,7 +6,7 @@ import { RIcon } from '@/components'
 import { isValueType, renderNode } from '@/utils'
 import { useSettingGetters } from '@/store'
 
-export const SIDER_BAR_LOGO = ref<HTMLElement>()
+export const SIDER_BAR_LOGO = shallowRef<HTMLElement>()
 
 export default defineComponent({
   name: 'SiderBarLogo',

src/layout/components/Menu/index.tsx

@@ -7,6 +7,7 @@ import { LAYOUT_SIDER_REF } from '@/app-config'
 import { useDevice } from '@/hooks'
 import { getVariableToRefs, setVariable } from '@/global-variable'
 import { useMenuGetters, useMenuActions, useSettingGetters } from '@/store'
+import { positionSelectedMenuItem } from '@/utils'
 
 import type { MenuInst } from 'naive-ui'
 import type { NaiveMenuOptions } from '@/types'
@@ -15,7 +16,8 @@ import type { AppMenuOption } from '@/types'
 export default defineComponent({
   name: 'AppMenu',
   setup() {
-    const menuRef = ref<MenuInst | null>(null)
+    // 这里使用 shallowRef 而不是 useTemplateRef 是因为在这里有一个特殊情况，会导致一个 readonly 的警告
+    const menuRef = shallowRef<MenuInst | null>()
 
     const { changeMenuModelValue, collapsedMenu, updateMenuState } =
       useMenuActions()
@@ -23,17 +25,18 @@ export default defineComponent({
     const { getMenuOptions, getCollapsed, getMenuKey } = useMenuGetters()
     const modelMenuKey = computed({
       get: () => {
+        /**
+         *
+         * @description
+         * 禁用该 eslint 规则，因为在 computed 中使用了异步操作。
+         * 该规则只是为了避免异步的 computed get 获取值出现问题；
+         * 但是，在这里获取值的操作是同步行为，只是为了在获取值以后将对应菜单项展开；
+         * 所以，这里不会出现异步获取值的问题，所以可以禁用该规则。
+         */
         // eslint-disable-next-line vue/no-async-in-computed-properties
         setTimeout(() => {
-          /**
-           *
-           * @description
-           * 禁用该 eslint 规则，因为在 computed 中使用了异步操作。
-           * 该规则只是为了避免异步的 computed get 获取值出现问题；
-           * 但是，在这里获取值的操作是同步行为，只是为了在获取值以后将对应菜单项展开；
-           * 所以，这里不会出现异步获取值的问题，所以可以禁用该规则。
-           */
           showMenuOption()
+          positionSelectedMenuItem()
         }, 300)
 
         return getMenuKey.value

src/layout/components/MenuTag/index.scss

@@ -25,46 +25,36 @@ $menuTagWrapperWidth: 76px;
 }
 
 // 激活标签页关闭按钮样式
-.menu-tag {
+.menu-tag .menu-tag__btn {
-  .menu-tag__btn {
+  transition:
-    .menu-tag__btn-icon--hidden {
+    color 0.3s var(--n-bezier),
-      display: none !important;
+    background-color 0.3s var(--n-bezier),
-    }
+    opacity 0.3s var(--n-bezier),
+    border-color 0.3s var(--n-bezier),
+    width 0.3s var(--n-bezier);
 
-    .menu-tag__btn-icon {
+  .n-button__icon {
-      display: inline;
+    opacity: 0;
-      margin-left: 0;
+    width: 0;
-      width: 0;
+    height: var(--n-icon-size);
-      height: 0;
+    transition: all 0.3s var(--r-bezier);
+    margin-left: 0px;
+    transform: translateX(4px);
+  }
+
+  &:hover {
+    .n-button__icon {
+      opacity: 1;
+      width: var(--n-icon-size);
       transition: all 0.3s var(--r-bezier);
-      overflow: hidden;
-      opacity: 0;
-
-      & .ray-icon {
-        width: 11px !important;
-        height: 11px !important;
-      }
-    }
-
-    &:hover {
-      .menu-tag__btn-icon {
-        width: 14px;
-        height: 14px;
-        margin-left: 5px;
-        font-size: 12px;
-        background-color: rgba(0, 0, 0, 0.12);
-        border-radius: 50%;
-        padding: 1px;
-        transition: all 0.3s var(--r-bezier);
-        opacity: 1;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
     }
   }
 }
 
+.menu-tag__btn-icon:hover {
+  filter: brightness(0.8);
+}
+
 // 设置 dropdown animate svg 尺寸
 .menu-tag__dropdown {
   & .menu-tag__icon {

src/layout/components/MenuTag/index.tsx

@@ -517,6 +517,7 @@ export default defineComponent({
                     }}
                     size="small"
                     focusable={false}
+                    iconPlacement="right"
                   >
                     {{
                       default: () => (
@@ -533,16 +534,18 @@ export default defineComponent({
                               },
                             }}
                           </span>
-                          <NIcon
-                            class="menu-tag__btn-icon"
-                            {...{
-                              onMousedown: closeCurrentMenuTag.bind(this, idx),
-                            }}
-                          >
-                            <RIcon name="close" size="14" />
-                          </NIcon>
                         </>
                       ),
+                      icon: () => (
+                        <RIcon
+                          customClassName="menu-tag__btn-icon"
+                          name="close"
+                          size="15"
+                          {...{
+                            onMousedown: closeCurrentMenuTag.bind(this, idx),
+                          }}
+                        />
+                      ),
                     }}
                   </NButton>
                 ))}

src/layout/components/SiderBar/components/SettingDrawer/constant.ts

@@ -2,85 +2,8 @@ import type { SettingState } from '@/store/modules/setting/types'
 import type { InjectionKey, Reactive } from 'vue'
 import type { DebouncedFunc } from 'lodash-es'
 
-type OmitKeys =
-  | 'contentTransition'
-  | 'watermarkSwitch'
-  | 'keepAliveConfig'
-  | 'menuConfig'
-  | 'menuTagSwitch'
-  | 'breadcrumbSwitch'
-  | 'copyrightSwitch'
-  | 'drawerPlacement'
-  | 'colorWeakness'
-  | 'watermarkConfig'
-  | 'dynamicDocumentTitle'
-
-interface Config extends Pick<SettingState, OmitKeys> {}
-
-// SettingDrawer 默认配置系统配置项
-const defaultSettingConfig: Readonly<Partial<Config>> = {
-  contentTransition: 'scale',
-  watermarkSwitch: false,
-  keepAliveConfig: {
-    maxKeepAliveLength: 10,
-    setupKeepAlive: true,
-    keepAliveExclude: [],
-  },
-  menuConfig: {
-    collapsedWidth: 64,
-    collapsedMode: 'width',
-    collapsedIconSize: 16,
-    collapsedIndent: 24,
-    accordion: false,
-    menuSiderBarLogo: true,
-    iconSize: 16,
-    menuWidth: 272,
-    inverted: false,
-    nativeScrollbar: false,
-  },
-  menuTagSwitch: true,
-  breadcrumbSwitch: true,
-  copyrightSwitch: true,
-  drawerPlacement: 'right',
-  colorWeakness: false,
-  watermarkConfig: {
-    content: 'Trying be better~',
-    fontSize: 16,
-    lineHeight: 16,
-    width: 384,
-    height: 384,
-    xOffset: 12,
-    yOffset: 60,
-    rotate: -15,
-    xGap: 0,
-    yGap: 0,
-    cross: true,
-  },
-  dynamicDocumentTitle: true,
-}
-
-/**
- *
- * @description
- * 获取默认配置。
- */
-export const getDefaultSettingConfig = (): Partial<Config> => {
-  return defaultSettingConfig
-}
-
-/**
- *
- * @param config 配置项
- *
- * @description
- * 更新默认配置。
- */
-export const updateDefaultSettingConfig = (config: Partial<SettingState>) => {
-  Object.assign(defaultSettingConfig, config)
-}
-
 interface SettingDrawerInjectKey extends SettingState {
-  throttleSetupAppMenu: DebouncedFunc<() => Promise<void>>
+  throttleSetupAppMenu: DebouncedFunc<() => void>
 }
 
 export const SETTING_DRAWER_INJECT_KEY: Reactive<

src/layout/components/SiderBar/components/SettingDrawer/index.tsx

@@ -15,10 +15,11 @@ import SegmentViewsWatermark from './segment-views/Watermark'
 import SegmentViewsCustomMenu from './segment-views/CustomMenu'
 
 import { useSettingGetters, useSettingActions, useMenuActions } from '@/store'
-import { getDefaultSettingConfig, SETTING_DRAWER_INJECT_KEY } from './constant'
+import { SETTING_DRAWER_INJECT_KEY } from './constant'
 import { forIn, throttle } from 'lodash-es'
 import { drawerProps } from 'naive-ui'
 import { useModal } from '@/components'
+import { getDefaultSettingConfig } from '@/store/modules/setting/constant'
 
 import type { SettingState } from '@/store/modules/setting/types'
 

src/layout/index.tsx

@@ -29,9 +29,9 @@ import { useSettingGetters } from '@/store'
 export default defineComponent({
   name: 'RLayout',
   setup() {
-    const layoutSiderBarRef = ref<HTMLElement>() // 顶部操作栏 ref
+    const layoutSiderBarRef = shallowRef<HTMLElement>() // 顶部操作栏 shallowRef
-    const layoutMenuTagRef = ref<HTMLElement>() // 标签页 ref
+    const layoutMenuTagRef = shallowRef<HTMLElement>() // 标签页 shallowRef
-    const layoutFooterRef = ref<HTMLElement>() // 底部版权 ref
+    const layoutFooterRef = shallowRef<HTMLElement>() // 底部版权 shallowRef
 
     const { getMenuTagSwitch, getCopyrightSwitch } = useSettingGetters()
     const { getLockAppScreen } = useAppLockScreen()

src/store/hooks/useKeepAliveStore.ts

@@ -5,7 +5,8 @@ export const useKeepAliveGetters = () => {
 
   /**
    *
-   * @remark 获取当前可缓存项 name
+   * @@description
+   * 获取当前可缓存项 name。
    */
   const getKeepAliveInclude = computed(() => variable.keepAliveInclude)
 

src/store/hooks/useMenuStore.ts

@@ -6,22 +6,29 @@ export const useMenuGetters = () => {
 
   /**
    *
-   * @remark 获取菜单列表
+   * @description
+   * 获取菜单列表。
    */
   const getMenuOptions = computed(() => variable.options)
+
   /**
    *
-   * @remark 获取面包屑列表
+   * @description
+   * 获取面包屑列表。
    */
   const getBreadcrumbOptions = computed(() => variable.breadcrumbOptions)
+
   /**
    *
-   * @remark 获取菜单当前 key
+   * @description
+   * 获取菜单当前 key。
    */
   const getMenuKey = computed(() => variable.menuKey)
+
   /**
    *
-   * @remark 获取菜单标签列表
+   * @description
+   * 获取菜单标签列表。
    */
   const getMenuTagOptions = computed(() => {
     const { getRootPath } = useAppRoot()
@@ -44,14 +51,18 @@ export const useMenuGetters = () => {
       return curr
     })
   })
+
   /**
    *
-   * @remark 获取当前菜单项
+   * @description
+   * 获取当前菜单项。
    */
   const getCurrentMenuOption = computed(() => variable.currentMenuOption)
+
   /**
    *
-   * @remark 获取是否折叠
+   * @description
+   * 获取是否折叠。
    */
   const getCollapsed = computed(() => variable.collapsed)
 

src/store/modules/menu/index.ts

@@ -1,20 +1,3 @@
-/**
- *
- * 该文件为 menu 菜单 pinia store
- *
- * 说明:
- *   - BreadcrumbMenu、TagMenu、Menu 统一管理
- *   - BreadcrumbMenu、TagMenu、Menu 属性值重度依赖 vue-router routers, 所以需要按照该项目约定方法进行配置
- *
- * 缓存(sessionStorage):
- *   - breadcrumbOptions
- *   - menuKey
- *   - menuTagOptions
- *
- * 备注:
- *   - parseAndFindMatchingNodes: 如果需要反向查找完整的父子节点，可以使用该方法
- */
-
 import { NEllipsis } from 'naive-ui'
 
 import { setStorage, equalRouterPath, updateObjectValue } from '@/utils'
@@ -33,10 +16,9 @@ import { APP_CATCH_KEY } from '@/app-config'
 import { pick } from 'lodash-es'
 import { pickRouteRecordNormalizedConstant } from './constant'
 
-import type { AppMenuOption, MenuTagOptions } from '@/types'
+import type { AppMenuOption, MenuTagOptions, AnyFC } from '@/types'
 import type { MenuState } from '@/store/modules/menu/types'
 import type { LocationQuery } from 'vue-router'
-import type { UpdateMenuState } from './types'
 
 let cachePreNormal: AppMenuOption | undefined = void 0
 
@@ -101,12 +83,17 @@ export const piniaMenuStore = defineStore(
      *
      * @param key menu state key
      * @param value updated value
+     * @param cb callback function
      *
      * @description
      * 更新 menu state 指定 key 的值。
      */
-    const updateMenuState: UpdateMenuState = (key, value, cb) => {
+    const updateMenuState = <T extends keyof MenuState>(
-      updateObjectValue(menuState, key, value, cb)
+      key: T,
+      value: Partial<MenuState[T]>,
+      cb?: AnyFC,
+    ) => {
+      updateObjectValue(menuState, key, value as MenuState[T], cb)
     }
 
     /**
@@ -169,10 +156,8 @@ export const piniaMenuStore = defineStore(
      * 如果识别到为平级模式，则会自动追加一层面包屑。
      */
     const setBreadcrumbOptions = (key: string | number) => {
-      menuState.breadcrumbOptions = parseAndFindMatchingNodes(
+      menuState.breadcrumbOptions = unref(
-        menuState.options,
+        parseAndFindMatchingNodes(menuState.options, 'fullPath', key),
-        'fullPath',
-        key,
       )
     }
 
@@ -254,22 +239,22 @@ export const piniaMenuStore = defineStore(
 
         const { sameLevel } = meta
 
-        /** 更新缓存队列 */
+        // 更新缓存队列
         setKeepAliveInclude(option)
-        /** 更新浏览器标题 */
+        // 更新浏览器标题
         updateDocumentTitle(option)
 
         // 如果不为 sameLevel，则会执行更新：覆盖更新面包屑、添加标签菜单、更新缓存
         if (!sameLevel) {
-          /** 更新标签菜单 */
+          // 更新标签菜单
           setMenuTagOptionsWhenMenuValueChange(key, option)
-          /** 更新面包屑 */
+          // 更新面包屑
           setBreadcrumbOptions(key)
 
           menuState.menuKey = key
           menuState.currentMenuOption = option
 
-          /** 缓存菜单 key(sessionStorage) */
+          // 缓存菜单 key(sessionStorage)
           setStorage(APP_CATCH_KEY.appMenuKey, key)
         } else {
           // 使用 pick 提取仅需要的字段，避免 vue 抛错空引用，导致性能损耗

src/store/modules/menu/types.ts

@@ -8,11 +8,3 @@ export interface MenuState {
   breadcrumbOptions: AppMenuOption[]
   currentMenuOption: AppMenuOption | null
 }
-
-type PickUpdateKeys = 'collapsed' | 'currentMenuOption'
-
-export type UpdateMenuState = <T extends keyof Pick<MenuState, PickUpdateKeys>>(
-  key: T,
-  value: Partial<MenuState[T]>,
-  cb?: AnyFC,
-) => void

src/store/modules/setting/constant.ts

@@ -0,0 +1,89 @@
+import type { SettingState } from './types'
+
+type OmitKeys =
+  | 'contentTransition'
+  | 'watermarkSwitch'
+  | 'keepAliveConfig'
+  | 'menuConfig'
+  | 'menuTagSwitch'
+  | 'breadcrumbSwitch'
+  | 'copyrightSwitch'
+  | 'drawerPlacement'
+  | 'colorWeakness'
+  | 'watermarkConfig'
+  | 'dynamicDocumentTitle'
+
+interface Config extends Pick<SettingState, OmitKeys> {}
+
+// SettingDrawer 默认配置系统配置项
+const defaultSettingConfig: Readonly<Config> = {
+  // 切换过渡效果
+  contentTransition: 'scale',
+  // 水印开关
+  watermarkSwitch: false,
+  // 缓存动态设置
+  keepAliveConfig: {
+    maxKeepAliveLength: 10,
+    setupKeepAlive: true,
+    keepAliveExclude: [],
+  },
+  // 菜单配置
+  menuConfig: {
+    collapsedWidth: 64,
+    collapsedMode: 'width',
+    collapsedIconSize: 16,
+    collapsedIndent: 24,
+    accordion: false,
+    menuSiderBarLogo: true,
+    iconSize: 16,
+    menuWidth: 272,
+    inverted: false,
+    nativeScrollbar: false,
+  },
+  // 多标签页开关
+  menuTagSwitch: true,
+  // 面包屑开关
+  breadcrumbSwitch: true,
+  // 底部区域开关
+  copyrightSwitch: true,
+  // 默认设置出现位置
+  drawerPlacement: 'right',
+  // 色弱模式
+  colorWeakness: false,
+  // 水印
+  watermarkConfig: {
+    content: 'Trying be better~',
+    fontSize: 16,
+    lineHeight: 16,
+    width: 384,
+    height: 384,
+    xOffset: 12,
+    yOffset: 60,
+    rotate: -15,
+    xGap: 0,
+    yGap: 0,
+    cross: true,
+  },
+  // 动态标题
+  dynamicDocumentTitle: true,
+}
+
+/**
+ *
+ * @description
+ * 获取默认配置。
+ */
+export const getDefaultSettingConfig = (): Readonly<Config> => {
+  return defaultSettingConfig
+}
+
+/**
+ *
+ * @param config 配置项
+ *
+ * @description
+ * 更新默认配置。
+ */
+export const updateDefaultSettingConfig = (config: Partial<SettingState>) => {
+  Object.assign(defaultSettingConfig, config)
+}

src/store/modules/setting/index.ts

@@ -2,6 +2,7 @@ import { getAppDefaultLanguage } from '@/locales/utils'
 import { colorToRgba, setStorage, updateObjectValue, setStyle } from '@/utils'
 import { useI18n, useDayjs } from '@/hooks'
 import { APP_CATCH_KEY, APP_THEME, GLOBAL_CLASS_NAMES } from '@/app-config'
+import { getDefaultSettingConfig } from './constant'
 
 import type { SettingState } from '@/store/modules/setting/types'
 import type { LocalKey } from '@/hooks'
@@ -17,8 +18,6 @@ export const piniaSettingStore = defineStore(
     const { locale: dayjsLocal } = useDayjs()
 
     const settingState = reactive<SettingState>({
-      // 默认设置出现位置
-      drawerPlacement: 'right',
       // 默认主题色
       primaryColorOverride: {
         common: {
@@ -27,37 +26,14 @@ export const piniaSettingStore = defineStore(
           primaryColorPressed: primaryColor,
         },
       },
-      // true 为黑夜主题, false 为明亮主题
+      // 内部使用，用于判断是否为黑夜主题（为了兼容历史遗留版本）；true 为黑夜主题，false 为明亮主题
       _appTheme: false,
+      // 当前主题样式
       appTheme: 'light',
-      // 多标签页开关
-      menuTagSwitch: true,
-      // 面包屑开关
-      breadcrumbSwitch: true,
       // 默认国际化语言
       localeLanguage: getAppDefaultLanguage(),
       // 锁屏开关
       lockScreenSwitch: false,
-      // 底部区域开关
-      copyrightSwitch: true,
-      // 切换过渡效果
-      contentTransition: 'scale',
-      // 水印开关
-      watermarkSwitch: false,
-      // 水印
-      watermarkConfig: {
-        content: 'Trying be better~',
-        fontSize: 16,
-        lineHeight: 16,
-        width: 384,
-        height: 384,
-        xOffset: 12,
-        xGap: 0,
-        yGap: 0,
-        yOffset: 60,
-        rotate: -15,
-        cross: true,
-      },
       // 根路由信息
       appRootRoute: {
         name: 'Dashboard',
@@ -70,29 +46,7 @@ export const piniaSettingStore = defineStore(
         url: '/dashboard',
         jumpType: 'station',
       },
-      // 缓存动态设置
+      ...getDefaultSettingConfig(),
-      keepAliveConfig: {
-        setupKeepAlive: true,
-        keepAliveExclude: [],
-        maxKeepAliveLength: 10,
-      },
-      // 菜单配置
-      menuConfig: {
-        collapsedWidth: 64,
-        collapsedMode: 'width',
-        collapsedIconSize: 16,
-        collapsedIndent: 24,
-        accordion: false,
-        menuSiderBarLogo: true,
-        iconSize: 16,
-        menuWidth: 272,
-        inverted: false,
-        nativeScrollbar: false,
-      },
-      // 色弱模式
-      colorWeakness: false,
-      // 动态标题
-      dynamicDocumentTitle: true,
     })
 
     // 修改当前语言
@@ -150,7 +104,7 @@ export const piniaSettingStore = defineStore(
       value: Partial<V[T]>,
       cb?: C,
     ) => {
-      updateObjectValue(settingState, key, value, cb)
+      updateObjectValue(settingState, key, value as V[T], cb)
     }
 
     const toggleColorWeakness = (bool: boolean) => {

src/store/modules/signing/index.ts

@@ -90,6 +90,7 @@ export const piniaSigningStore = defineStore(
       removeStorage(token, 'localStorage')
       removeStorage(signing, 'localStorage')
       removeStorage(appMenuKey, 'localStorage')
+      removeStorage(APP_CATCH_KEY.isAppLockScreen, 'localStorage')
       // 关闭所有侧边栏标签
       closeAll()
 

src/styles/animate.scss

@@ -22,21 +22,27 @@
 }
 
 /* scale-transform */
-.scale-transform-enter-active,
+.scale-transform-enter-active {
+  transition:
+    transform 0.35s cubic-bezier(0.33, 1, 0.68, 1),
+    opacity 0.25s cubic-bezier(0.33, 1, 0.68, 1);
+  transition-delay: 0.25s;
+}
+
 .scale-transform-leave-active {
   transition:
-    transform 0.4s var(--r-bezier),
+    transform 0.35s cubic-bezier(0.32, 0, 0.67, 0),
-    opacity 0.45s var(--r-bezier);
+    opacity 0.25s ease-out;
 }
 
 .scale-transform-enter-from {
   opacity: 0;
-  transform: scale(0.92);
+  transform: scale(0.95);
 }
 
 .scale-transform-leave-to {
   opacity: 0;
-  transform: scale(1.06);
+  transform: scale(1.03);
 }
 
 /* opacity-transform */
@@ -54,35 +60,49 @@
 }
 
 /* fade-bottom-transform */
-.fade-bottom-transform-enter-active,
+.fade-bottom-transform-enter-active {
+  transition:
+    transform 0.35s cubic-bezier(0.33, 1, 0.68, 1),
+    opacity 0.25s cubic-bezier(0.33, 1, 0.68, 1);
+  transition-delay: 0.25s;
+}
+
 .fade-bottom-transform-leave-active {
   transition:
-    opacity 0.55s var(--r-bezier),
+    transform 0.35s cubic-bezier(0.32, 0, 0.67, 0),
-    transform 0.45s var(--r-bezier);
+    opacity 0.25s ease-out;
 }
 
 .fade-bottom-transform-enter-from {
   opacity: 0;
-  transform: translateY(-10%);
+  transform: translateY(-15px);
 }
 
 .fade-bottom-transform-leave-to {
   opacity: 0;
-  transform: translateY(10%);
+  transform: translateY(15px);
 }
 
 /* fade-scale-transform */
-.fade-scale-transform-leave-active,
 .fade-scale-transform-enter-active {
-  transition: all 0.48s var(--r-bezier);
+  transition:
+    transform 0.35s cubic-bezier(0.33, 1, 0.68, 1),
+    opacity 0.25s cubic-bezier(0.33, 1, 0.68, 1);
+  transition-delay: 0.25s;
+}
+
+.fade-scale-transform-leave-active {
+  transition:
+    transform 0.25s cubic-bezier(0.32, 0, 0.67, 0),
+    opacity 0.25s ease-out;
 }
 
 .fade-scale-transform-enter-from {
   opacity: 0;
-  transform: scale(1.2);
+  transform: scale(1.1);
 }
 
 .fade-scale-transform-leave-to {
   opacity: 0;
-  transform: scale(0.8);
+  transform: scale(0.85);
 }

src/utils/basic.ts

@@ -209,6 +209,31 @@ export const downloadAnyFile = (
   })
 }
 
+/**
+ *
+ * @param file file object
+ *
+ * @description
+ * 将 File 文件对象转换为 base64。
+ *
+ * @example
+ * const base64 = await fileToBase64(file) // 'data:image/png;base64,...'
+ */
+export const fileToBase64 = (file: File) => {
+  return new Promise<string>((resolve, reject) => {
+    const reader = new FileReader()
+
+    reader.onload = () => {
+      resolve(reader.result as string)
+    }
+    reader.onerror = (error) => {
+      reject(error)
+    }
+
+    reader.readAsDataURL(file)
+  })
+}
+
 /**
  *
  * @param func 待判断的函数
@@ -254,7 +279,7 @@ export const isPromise = <T>(value: unknown): value is Promise<T> => {
 
 /**
  *
- * @param fc 正常执行的函数
+ * @param fn 正常执行的函数
  * @param errorCallback 错误回调
  * @param args 当前传递函数参数
  *
@@ -266,14 +291,14 @@ export const isPromise = <T>(value: unknown): value is Promise<T> => {
  * callWithErrorHandling((x: number) => { throw new Error('error') }, (error) => { console.log(error) }, [123]) => undefined
  */
 export const callWithErrorHandling = <T extends AnyFC, E extends Error>(
-  fc: T,
+  fn: T,
   errorCallback: AnyFC<E, void>,
   args?: Parameters<T>,
 ) => {
   let result: ReturnType<T> | undefined
 
   try {
-    result = args ? fc(...args) : fc()
+    result = args ? fn(...args) : fn()
   } catch (error) {
     errorCallback(error as E)
   }
@@ -299,16 +324,16 @@ export const callWithAsyncErrorHandling = async <
   T extends AnyFC,
   E extends Error,
 >(
-  fc: T,
+  fn: T,
   errorCallback: (error: E) => void,
   args?: Parameters<T>,
 ): Promise<ReturnType<T> | undefined> => {
   try {
-    if (!isPromise(fc)) {
+    if (!isPromise(fn)) {
-      return Promise.resolve(callWithErrorHandling(fc, errorCallback, args))
+      return Promise.resolve(callWithErrorHandling(fn, errorCallback, args))
     }
 
-    return await fc(...(args as Parameters<T>))
+    return await fn(...(args as Parameters<T>))
   } catch (error) {
     errorCallback(error as E)
 

src/utils/cache.ts

@@ -3,14 +3,31 @@ import { APP_CATCH_KEY_PREFIX } from '@/app-config'
 import type { StorageLike, StorageOptions, RemoveStorageFC } from '@/types'
 
 /**
- *
+ * @param type 存储类型
- * @param key 需要删除的缓存值key
+ * @returns Storage 实例
- * @param storageType 需要删除的缓存类型
+ */
+const getStorageInstance = (type: StorageLike = 'sessionStorage'): Storage =>
+  type === 'localStorage' ? window.localStorage : window.sessionStorage
+
+/**
+ * 获取带前缀的键名
+ * @param key 原始键名
+ * @param options 配置项
+ * @returns 处理后的键名
+ */
+const getKeyWithPrefix = (key: string, options?: StorageOptions): string => {
+  const { prefix, prefixKey } = options ?? {}
+
+  return prefix ? (prefixKey || APP_CATCH_KEY_PREFIX) + key : key
+}
+
+/**
+ * @param key 需要查找的缓存值key
+ * @param storageType 需要查找的缓存类型
  * @param options 配置项
  *
  * @description
  * 查找当前缓存中是否含有某个 key。
- *
  * 默认查找 sessionStorage。
  *
  * @example
@@ -21,23 +38,20 @@ function hasStorage(
   storageType: StorageLike = 'sessionStorage',
   options?: StorageOptions,
 ) {
-  const { prefix, prefixKey } = options ?? {}
+  const prefixedKey = getKeyWithPrefix(key, options)
-  const _prefix = prefix ? prefixKey || APP_CATCH_KEY_PREFIX : ''
+  const storage = getStorageInstance(storageType)
-  const storage =
-    storageType === 'localStorage' ? window.localStorage : window.sessionStorage
 
-  return !!Object.keys(storage).find((curr) => curr === _prefix + key)
+  return Object.keys(storage).includes(prefixedKey)
 }
 
 /**
- *
+ * @param key 需要设置的缓存值key
- * @param key 需要删除的缓存值key
+ * @param value 需要设置的值
- * @param type 需要删除的缓存类型
+ * @param storageType 需要设置的缓存类型
  * @param options 配置项
  *
  * @description
  * 设置缓存值，默认设置 sessionStorage。
- *
  * 如果 key 为空，则会打印错误信息。
  *
  * @example
@@ -52,22 +66,16 @@ function setStorage<T = unknown>(
   options?: StorageOptions,
 ) {
   if (!key) {
-    console.error(
+    console.error('[setStorage]: Failed to set stored data: key is empty')
-      `[setStorage]: Failed to set stored data: key ${key} is empty`,
-    )
 
     return
   }
 
-  const { prefix, prefixKey } = options ?? {}
+  const prefixedKey = getKeyWithPrefix(key, options)
-  const _prefix = prefix ? prefixKey || APP_CATCH_KEY_PREFIX : ''
+  const storage = getStorageInstance(storageType)
 
   try {
-    const waitCacheValue = JSON.stringify(value)
+    storage.setItem(prefixedKey, JSON.stringify(value))
-
-    storageType === 'localStorage'
-      ? window.localStorage.setItem(_prefix + key, waitCacheValue)
-      : window.sessionStorage.setItem(_prefix + key, waitCacheValue)
   } catch (error) {
     console.error(
       `[setStorage]: Failed to set stored data for key '${key}'`,
@@ -79,26 +87,23 @@ function setStorage<T = unknown>(
 function getStorage<T = unknown>(
   key: string,
   storageType: StorageLike,
-  options?: StorageOptions<T>,
+  options: StorageOptions<T> & { defaultValue: T },
 ): T
 
 function getStorage<T = unknown>(
   key: string,
   storageType?: StorageLike,
-  options?: StorageOptions<T>,
+  options?: Omit<StorageOptions<T>, 'defaultValue'>,
 ): T | null
 
 /**
- *
+ * @param key 需要获取的缓存值key
- * @param key 需要删除的缓存值key
+ * @param storageType 需要获取的缓存类型
- * @param type 需要删除的缓存类型
  * @param options 配置项
  *
  * @description
  * 获取缓存值。
- *
  * 默认获取 sessionStorage。
- *
  * 如果 key 为空，则会打印错误信息。
  *
  * @example
@@ -111,20 +116,14 @@ function getStorage<T = unknown>(
   storageType: StorageLike = 'sessionStorage',
   options?: StorageOptions<T>,
 ): T | null {
-  const { prefix, prefixKey, defaultValue } = options ?? {}
+  const prefixedKey = getKeyWithPrefix(key, options)
-  const _prefix = prefix ? prefixKey || APP_CATCH_KEY_PREFIX : ''
+  const storage = getStorageInstance(storageType)
+  const { defaultValue } = options ?? {}
 
   try {
-    const data =
+    const data = storage.getItem(prefixedKey)
-      storageType === 'localStorage'
-        ? window.localStorage.getItem(_prefix + key)
-        : window.sessionStorage.getItem(_prefix + key)
 
-    if (data === null) {
+    return data === null ? defaultValue ?? null : (JSON.parse(data) as T)
-      return defaultValue ?? null
-    }
-
-    return JSON.parse(data) as T
   } catch (error) {
     console.error(
       `[getStorage]: Failed to get stored data for key '${key}'`,
@@ -136,16 +135,13 @@ function getStorage<T = unknown>(
 }
 
 /**
- *
  * @param key 需要删除的缓存值key
- * @param type 需要删除的缓存类型
+ * @param storageType 需要删除的缓存类型
  * @param options 配置项
  *
  * @description
  * 删除缓存值。
- *
  * 默认删除 sessionStorage。
- *
  * 预保留了 __all__、__all_sessionStorage__、__all_localStorage__ 三个 key，
  * 分别代表清空所有缓存、清空 sessionStorage 缓存、清空 localStorage 缓存。
  *
@@ -153,63 +149,47 @@ function getStorage<T = unknown>(
  * removeStorage('__all__', 'all') // 清空所有缓存
  * removeStorage('__all_sessionStorage__', 'sessionStorage') // 清空 sessionStorage 缓存
  * removeStorage('__all_localStorage__', 'localStorage') // 清空 localStorage 缓存
- * removeStorage('signing', 'sessionStorage' || 'localStorage') // 清空 session 中 signing 缓存字段
+ * removeStorage('signing', 'sessionStorage' || 'localStorage') // 清空 session 或者 localStorage 中 signing 缓存字段
  */
 const removeStorage: RemoveStorageFC = (key, storageType, options) => {
   if (!key) {
-    console.error(
+    console.error('[removeStorage]: Failed to remove stored data: key is empty')
-      `[removeStorage]: Failed to remove stored data: key ${key} is empty or undefined`,
-    )
 
     return
   }
 
-  const { prefix, prefixKey } = options ?? {}
+  const prefixedKey = getKeyWithPrefix(key, options)
-  const _prefix = prefix ? prefixKey || APP_CATCH_KEY_PREFIX : ''
+  const localStorage = window.localStorage
-  const localStorageKeys = Object.keys(window.localStorage)
+  const sessionStorage = window.sessionStorage
-  const sessionStorageKeys = Object.keys(window.sessionStorage)
 
-  const remove = (isAll: boolean, removeType?: StorageLike) => {
+  /**
-    const keys = isAll
+   * @param storage 存储实例
-      ? [...sessionStorageKeys, ...localStorageKeys]
+   */
-      : removeType === 'localStorage'
+  const removeFromStorage = (storage: Storage) => {
-        ? localStorageKeys
+    Object.keys(storage).forEach((k) =>
-        : sessionStorageKeys
+      storage.removeItem(getKeyWithPrefix(k, options)),
-
+    )
-    keys.forEach((curr) => {
-      if (key === '__all__') {
-        window.sessionStorage.removeItem(_prefix + curr)
-        window.localStorage.removeItem(_prefix + curr)
-      } else {
-        removeType === 'localStorage'
-          ? window.localStorage.removeItem(_prefix + curr)
-          : window.sessionStorage.removeItem(_prefix + curr)
-      }
-    })
   }
 
   switch (key) {
     case '__all__':
-      remove(true)
+      removeFromStorage(localStorage)
+      removeFromStorage(sessionStorage)
 
       break
 
     case '__all_sessionStorage__':
-      remove(false, 'sessionStorage')
+      removeFromStorage(sessionStorage)
 
       break
 
     case '__all_localStorage__':
-      remove(false, 'localStorage')
+      removeFromStorage(localStorage)
 
       break
 
     default:
-      storageType === 'localStorage'
+      getStorageInstance(storageType as StorageLike).removeItem(prefixedKey)
-        ? window.localStorage.removeItem(_prefix + key)
-        : window.sessionStorage.removeItem(_prefix + key)
-
-      break
   }
 }
 

src/utils/element.ts

@@ -300,6 +300,7 @@ export const removeStyle = (
  *
  * @param color 颜色格式
  * @param alpha 透明度
+ * @param defaultColor 默认颜色值
  *
  * @description
  * 将任意颜色值转为 rgba，如果本身为 rgba 或者其它非法颜色值则直接返回。
@@ -309,36 +310,70 @@ export const removeStyle = (
  * colorToRgba('rgb(18, 54, 50)', 0.8) // rgba(18, 54, 50, 0.8)
  * colorToRgba('#ee4f12', 0.3) // rgba(238, 79, 18, 0.3)
  * colorToRgba('rgba(238, 79, 18, 0.3)', 0.3) // rgba(238, 79, 18, 0.3)
- * colorToRgba('not a color', 0.3) // not a color
+ * colorToRgba('not a color', 0.3, '#000') // #000
+ * colorToRgba('hsl(0, 100%, 50%)', 0.5) // hsla(0, 100%, 50%, 0.5)
+ * colorToRgba('not a color') // not a color
  */
-export const colorToRgba = (color: string, alpha = 1) => {
+export const colorToRgba = (
-  if (color.includes('rgba')) {
+  color: string,
-    return color
+  alpha = 1,
+  defaultColor?: string,
+) => {
+  if (!color) {
+    return defaultColor || color
   }
 
-  if (color.includes('rgb')) {
+  // 处理 rgba 格式 - 替换原有的 alpha 值
+  if (color.includes('rgba')) {
+    return color.replace(
+      /rgba\((.*?),(.*?),(.*?),.*?\)/,
+      `rgba($1,$2,$3,${alpha})`,
+    )
+  }
+
+  // 处理 rgb 格式
+  if (color.includes('rgb(')) {
     return color.replace('rgb', 'rgba').replace(')', `, ${alpha})`)
   }
 
-  if (color.includes('#')) {
+  // 处理 hsla 格式 - 替换原有的 alpha 值
+  if (color.includes('hsla')) {
+    return color.replace(
+      /hsla\((.*?),(.*?),(.*?),.*?\)/,
+      `hsla($1,$2,$3,${alpha})`,
+    )
+  }
+
+  // 处理 hsl 格式
+  if (color.includes('hsl(')) {
+    return color.replace('hsl', 'hsla').replace(')', `, ${alpha})`)
+  }
+
+  // 处理 hex 格式
+  if (color.startsWith('#')) {
     const hex = color.replace('#', '')
 
-    switch (hex.length) {
+    try {
-      case 3:
+      switch (hex.length) {
-        return `rgba(${parseInt(hex[0] + hex[0], 16)}, ${parseInt(hex[1] + hex[1], 16)}, ${parseInt(hex[2] + hex[2], 16)}, ${alpha})`
+        case 3:
+          return `rgba(${parseInt(hex[0] + hex[0], 16)}, ${parseInt(hex[1] + hex[1], 16)}, ${parseInt(hex[2] + hex[2], 16)}, ${alpha})`
 
-      case 6:
+        case 6:
-        return `rgba(${parseInt(hex.slice(0, 2), 16)}, ${parseInt(hex.slice(2, 4), 16)}, ${parseInt(hex.slice(4, 6), 16)}, ${alpha})`
+          return `rgba(${parseInt(hex.slice(0, 2), 16)}, ${parseInt(hex.slice(2, 4), 16)}, ${parseInt(hex.slice(4, 6), 16)}, ${alpha})`
 
-      case 8:
+        case 8:
-        return `rgba(${parseInt(hex.slice(0, 2), 16)}, ${parseInt(hex.slice(2, 4), 16)}, ${parseInt(hex.slice(4, 6), 16)}, ${(parseInt(hex.slice(6, 8), 16) / 255).toFixed(2)})`
+          return `rgba(${parseInt(hex.slice(0, 2), 16)}, ${parseInt(hex.slice(2, 4), 16)}, ${parseInt(hex.slice(4, 6), 16)}, ${alpha})`
 
-      default:
+        default:
-        return color
+          return defaultColor || color
+      }
+    } catch {
+      return defaultColor || color
     }
   }
 
-  return color
+  // 返回原始字符串或默认值
+  return defaultColor || color
 }
 
 /**

src/utils/position-selected-menu-item.ts

@@ -3,8 +3,12 @@ import { useSiderScroll } from '@/hooks'
 import { unrefElement } from '@/utils'
 import { SIDER_BAR_LOGO } from '@/layout/components/Menu/components/SiderBarLogo'
 
-const MENU_ITEM_SELECTED = '.n-menu-item-content--selected' // 菜单激活样式 class name
+// 菜单激活样式 class name
-const MENU_ITEM = 'n-menu-item'
+const MENU_ITEM_SELECTED = '.n-menu-item-content--selected'
+// 菜单项 class name
+const MENU_ITEM = '.n-menu-item'
+// 折叠菜单激活样式 class name
+const MENU_COLLAPSED_ITEM_SELECTED = '.n-menu-item-content--child-active'
 
 /**
  *
@@ -20,36 +24,61 @@ const MENU_ITEM = 'n-menu-item'
  * positionSelectedMenuItem() // 滚动到当前激活菜单项的位置
  */
 export const positionSelectedMenuItem = () => {
+  // 获取 Sider 元素
   const siderEl = unrefElement(LAYOUT_SIDER_REF as Ref<HTMLElement>)
-  const selectedEl = siderEl?.querySelector<HTMLElement>(MENU_ITEM_SELECTED)
+  // 获取激活的菜单项元素
+  const selectedEl =
+    siderEl?.querySelector<HTMLElement>(MENU_ITEM_SELECTED) ||
+    siderEl?.querySelector<HTMLElement>(MENU_COLLAPSED_ITEM_SELECTED)
+  // 获取 Sider 栏 Logo 元素
   const siderBarLogoEl = unrefElement(SIDER_BAR_LOGO)
+  // Sider 栏 Logo 高度
   let siderBarLogoHeight: number = 0
+  // 获取菜单项元素
   const menuItemEl = siderEl?.querySelector<HTMLElement>(MENU_ITEM)
 
+  // 获取 Sider 栏 Logo 高度
   if (siderBarLogoEl) {
     const { height } = siderBarLogoEl.getBoundingClientRect()
 
     siderBarLogoHeight = height
   }
 
+  // 如果激活的菜单项元素和 Sider 元素存在，则滚动 Sider 栏
   if (selectedEl && siderEl) {
-    const siderScroll = useSiderScroll()
+    // 获取元素相对于视口的位置信息
-    const { top: siderTop } = siderEl.getBoundingClientRect()
+    const selectedRect = selectedEl.getBoundingClientRect()
-    const { top: selectedTop } = selectedEl.getBoundingClientRect()
+    const siderRect = siderEl.getBoundingClientRect()
-    const siderScrollTop = siderEl.scrollTop
-    const menuItemMarginTop = menuItemEl
-      ? parseInt(window.getComputedStyle(menuItemEl).marginTop)
-      : 6
 
-    siderScroll({
+    // 检查 selectedEl 是否在 sider 的可视区域内
-      top:
+    const isInViewport =
-        selectedTop -
+      selectedRect.top >= siderRect.top + siderBarLogoHeight &&
-        siderTop +
+      selectedRect.bottom <= siderRect.bottom
-        siderScrollTop -
+
-        siderBarLogoHeight -
+    // 如果不在可视区域内，才执行滚动
-        menuItemMarginTop,
+    if (!isInViewport) {
-      left: 0,
+      // 获取 Sider 滚动条
-      behavior: 'smooth',
+      const siderScroll = useSiderScroll()
-    })
+      // 获取 Sider 元素当前滚动条的位置
+      const siderScrollTop = siderEl.scrollTop
+      // 获取菜单项元素的 margin-top 值，如果菜单项元素不存在，则使用默认值 6（测试得出 6px 是最佳值）
+      const menuItemMarginTop = menuItemEl
+        ? parseInt(window.getComputedStyle(menuItemEl).marginTop)
+        : 6
+
+      siderScroll({
+        // 滚动到激活的菜单项位置，减去 Sider 栏 Logo 高度和菜单项的 margin-top 值
+        top:
+          selectedRect.top -
+          siderRect.top +
+          siderScrollTop -
+          siderBarLogoHeight -
+          menuItemMarginTop,
+        // 水平滚动到 0 位置
+        left: 0,
+        // 平滑滚动
+        behavior: 'smooth',
+      })
+    }
   }
 }

src/utils/precision.ts

@@ -21,7 +21,6 @@ import { cloneDeep } from 'lodash-es'
 import { isValueType } from '@/utils'
 
 import type { Options } from 'currency.js'
-import type { AnyFC } from '@/types'
 
 export type CurrencyArguments = string | number | currency
 
@@ -35,7 +34,7 @@ export interface CurrencyOptions extends Options {
 const defaultOptions: Partial<CurrencyOptions> = {
   precision: 8,
   decimal: '.',
-}
+} as const
 // currency.js 原型属性集合
 const currencyPrototypeKeys = [
   's',
@@ -52,7 +51,7 @@ const currencyPrototypeKeys = [
   'multiply',
   'subtract',
   'toString',
-]
+] as const
 
 /**
  *
@@ -66,23 +65,28 @@ const currencyPrototypeKeys = [
 const basic = (
   valueOptions: CurrencyArguments[],
   dividend: CurrencyArguments,
-  cb: AnyFC,
+  cb: (
-) => {
+    pre: currency,
+    curr: CurrencyArguments,
+    idx: number,
+    arr: CurrencyArguments[],
+  ) => currency,
+): currency => {
+  // 如果 valueOptions 为空，则返回 0
   if (!valueOptions?.length) {
-    return 0
+    return currency(0, defaultOptions)
   }
 
+  // 如果 valueOptions 长度为 1，则返回 valueOptions[0]
   if (valueOptions.length === 1) {
     return currency(valueOptions[0], defaultOptions)
   }
 
-  const result = valueOptions.reduce((pre, curr, idx, arr) => {
+  // 初始值
-    pre = cb?.(pre, curr, idx, arr)
+  const initialValue = currency(dividend, defaultOptions)
 
-    return pre
+  // 计算
-  }, dividend)
+  return valueOptions.reduce(cb, initialValue)
-
-  return result
 }
 
 /**
@@ -98,16 +102,14 @@ const basic = (
  * isCurrency({ s: 1, intValue: 1, p: 1, value: 1 }) // false
  * isCurrency(currency(1)) // true
  */
-export const isCurrency = (value: unknown) => {
+export const isCurrency = (value: unknown): value is currency => {
-  if (typeof value === 'string' || typeof value === 'number') {
+  // 如果 value 不是对象类型，则返回 false
+  if (!isValueType<object>(value, 'Object')) {
     return false
   }
 
-  if (isValueType<object>(value, 'Object')) {
+  // 如果 value 对象的属性在 currencyPrototypeKeys 中，则返回 true
-    return currencyPrototypeKeys.every((key) => Reflect.has(value, key))
+  return currencyPrototypeKeys.every((key) => key in value)
-  }
-
-  return false
 }
 
 /**
@@ -124,13 +126,16 @@ export const isCurrency = (value: unknown) => {
  * format(0.1, { symbol: '¥' }) // ¥0.1
  */
 export const format = (value: CurrencyArguments, options?: CurrencyOptions) => {
-  const assignOptions = Object.assign({}, defaultOptions, options)
+  // 合并默认配置和传入配置
+  const assignOptions = { ...defaultOptions, ...options }
+  // 将 value 转换为 currency 对象
   const v = currency(value, assignOptions)
+  // 获取 type 配置，如果 type 不存在，则使用 'number'
   const { type = 'number' } = assignOptions
 
+  // 如果 type 为 'number'，则返回 value 的值，否则返回 value 的字符串
   return type === 'number' ? v.value : v.toString()
 }
-
 /**
  *
  * @description
@@ -140,14 +145,19 @@ export const format = (value: CurrencyArguments, options?: CurrencyOptions) => {
  * format(add(0.1, 0.2)) // 0.3
  * format(add(0.2, 0.33)) // 0.53
  */
-export const add = (...args: CurrencyArguments[]) => {
+export const add = (...args: CurrencyArguments[]): currency => {
+  // 如果 args 为空，则返回 0
+  if (!args.length) {
+    return currency(0, defaultOptions)
+  }
+
+  // 如果 args 长度为 1，则返回 args[0] 加上 0
   if (args.length === 1) {
     return currency(args[0], defaultOptions).add(0)
   }
 
-  return basic(args, 0, (pre, curr) => {
+  // 计算
-    return currency(pre, defaultOptions).add(curr)
+  return basic(args, 0, (pre, curr) => pre.add(curr))
-  })
 }
 
 /**
@@ -159,27 +169,27 @@ export const add = (...args: CurrencyArguments[]) => {
  * format(subtract(0.1, 0.12312)) // -0.02
  * format(subtract(0.2, 0.33)) // -0.13
  */
-export const subtract = (...args: CurrencyArguments[]) => {
+export const subtract = (...args: CurrencyArguments[]): currency => {
+  // 如果 args 为空，则返回 0
+  if (!args.length) {
+    return currency(0, defaultOptions)
+  }
+
+  // 如果 args 长度为 1，则返回 args[0] 减去 0
   if (args.length === 1) {
     return currency(args[0], defaultOptions).subtract(0)
   }
 
+  // 如果 args 长度为 2，则返回 args[0] 减去 args[1]
   if (args.length === 2) {
     const [one, two] = args
 
     return currency(one, defaultOptions).subtract(two)
   }
 
-  const cloneDeepArgs = cloneDeep(args)
+  const [first, ...rest] = args
-  const dividend = cloneDeepArgs.shift() as CurrencyArguments
 
-  if (!cloneDeepArgs.length) {
+  return basic(rest, first, (pre, curr) => pre.subtract(curr))
-    return dividend
-  }
-
-  return basic(cloneDeepArgs, dividend, (pre, curr) => {
-    return currency(pre, defaultOptions).subtract(curr)
-  })
 }
 
 /**
@@ -192,10 +202,12 @@ export const subtract = (...args: CurrencyArguments[]) => {
  * format(multiply(0.2, 0.33)) // 0.07
  */
 export const multiply = (...args: CurrencyArguments[]) => {
+  // 如果 args 长度为 1，则返回 args[0] 乘以 1
   if (args.length === 1) {
     return currency(args[0], defaultOptions).multiply(1)
   }
 
+  // 计算
   return basic(args, 1, (pre, curr) => {
     return currency(pre, defaultOptions).multiply(curr)
   })
@@ -211,17 +223,21 @@ export const multiply = (...args: CurrencyArguments[]) => {
  * format(divide(0.2, 0.33)) // 0.61
  */
 export const divide = (...args: CurrencyArguments[]) => {
+  // 如果 args 为空，则返回 0
   if (args.length === 1) {
     return currency(args[0], defaultOptions).divide(1)
   }
 
+  // 如果 args 长度为 2，则返回 args[0] 除以 args[1]
   if (args.length === 2) {
     const [one, two] = args
 
     return currency(one, defaultOptions).divide(two)
   }
 
+  // 深度克隆 args
   const cloneDeepArgs = cloneDeep(args)
+  // 获取 dividend
   const dividend = cloneDeepArgs.shift() as CurrencyArguments
 
   return basic(cloneDeepArgs, dividend, (pre, curr) => {
@@ -245,15 +261,18 @@ export const distribute = (
   length: number,
   options?: CurrencyOptions,
 ) => {
+  // 如果 length 小于等于 1，则返回一个包含 value 的数组
   if (length <= 1) {
     return [value ? value : 0]
   } else {
+    // 如果 value 为 undefined null，则返回一个长度为 length 的 0 数组
     if (!value) {
       return new Array(length).fill(0)
     }
   }
 
-  const assignOptions = Object.assign({}, defaultOptions, options)
+  // 合并配置项
+  const assignOptions = { ...defaultOptions, ...options }
 
   const result = currency(value, assignOptions)
     .distribute(length)

src/utils/update-object-value.ts

@@ -22,27 +22,34 @@ import type { Recordable, AnyFC } from '@/types'
 export const updateObjectValue = <
   Target extends Recordable,
   Key extends keyof Target,
-  Value extends Partial<Target[Key]>,
+  Value extends Target[Key], // 移除 Partial，使类型更准确
-  Callback extends AnyFC,
+  Callback extends AnyFC = AnyFC, // 添加默认类型
 >(
   targetObject: Target,
   key: Key,
   value: Value,
   callback?: Callback,
-) => {
+): void => {
   if (!targetObject || typeof targetObject !== 'object') {
     console.warn(
-      `[updateObjectValue]: targetObject must be an object, expected ${typeof targetObject}`,
+      `[updateObjectValue]: targetObject must be an object, received ${typeof targetObject}`,
     )
 
     return
   }
 
-  if (Object.hasOwn(targetObject, key)) {
+  if (!Object.hasOwn(targetObject, key)) {
-    typeof value === 'object'
+    return
-      ? (targetObject[key] = Object.assign({}, targetObject[key], value))
-      : (targetObject[key] = value)
-
-    callback?.()
   }
+
+  if (typeof value === 'object' && value !== null) {
+    targetObject[key] = {
+      ...targetObject[key],
+      ...value,
+    } as Target[Key]
+  } else {
+    targetObject[key] = value
+  }
+
+  callback?.()
 }

src/utils/vue/effect-dispose.ts

@@ -4,7 +4,7 @@ import type { AnyFC } from '@/types'
 
 /**
  *
- * @param fc effect 作用域卸载时需执行函数
+ * @param fn effect 作用域卸载时需执行函数
  *
  * @description
  * 返回 true 表示获取到 effect 作用域并且卸载；false 表示未存在 effect 作用域。
@@ -16,9 +16,9 @@ import type { AnyFC } from '@/types'
  * effectDispose(watchStop)
  * effectDispose(watchEffectStop)
  */
-export function effectDispose<T extends AnyFC>(fc: T) {
+export function effectDispose<T extends AnyFC>(fn: T) {
   if (getCurrentScope()) {
-    onScopeDispose(fc)
+    onScopeDispose(fn)
 
     return true
   }

src/utils/vue/watch-effect-with-target.ts

@@ -5,7 +5,7 @@ import type { AnyFC } from '@/types'
 
 /**
  *
- * @param fc 副作用函数
+ * @param fn 副作用函数
  * @param watchOptions watchEffect 配置项
  *
  * @description
@@ -19,10 +19,10 @@ import type { AnyFC } from '@/types'
  * watchEffectWithTarget(watcher)
  */
 export function watchEffectWithTarget<T extends AnyFC>(
-  fc: T,
+  fn: T,
   watchOptions?: WatchOptionsBase,
 ) {
-  const stop = watchEffect(fc, watchOptions)
+  const stop = watchEffect(fn, watchOptions)
 
   effectDispose(stop)
 }

src/views/error/PageResult/index.tsx

@@ -12,9 +12,7 @@ import { NResult, NButton, NFlex } from 'naive-ui'
 
 import { redirectRouterToDashboard } from '@/router/utils'
 import { resultProps } from 'naive-ui'
-import { getStorage } from '@/utils'
+import { useSettingGetters } from '@/store'
-import { useVueRouter } from '@/hooks'
-import { APP_CATCH_KEY } from '@/app-config'
 
 import type { ResultProps } from 'naive-ui'
 
@@ -24,16 +22,13 @@ const PageResult = defineComponent({
     ...resultProps,
   },
   setup() {
-    const { router } = useVueRouter()
+    const { replace } = useRouter()
 
     const goBack = () => {
-      const { appMenuKey } = APP_CATCH_KEY
+      const { getAppRootRoute } = useSettingGetters()
-      const key = getStorage(appMenuKey, 'sessionStorage', {
-        defaultValue: '',
-      })
 
-      if (key) {
+      if (getAppRootRoute.value?.path) {
-        router.replace(key)
+        replace(getAppRootRoute.value.path)
       }
     }
 

src/views/login/components/Signing/index.tsx

@@ -1,16 +1,18 @@
 import { NForm, NFormItem, NInput, NButton } from 'naive-ui'
+import { RForm } from '@/components'
 
 import { setStorage } from '@/utils'
 import { useI18n, useAppRoot } from '@/hooks'
 import { APP_CATCH_KEY } from '@/app-config'
 import { useSigningActions } from '@/store'
+import { useForm } from '@/components'
 
 import type { FormInst } from 'naive-ui'
 
 export default defineComponent({
   name: 'RSigning',
   setup() {
-    const loginFormRef = ref<FormInst>()
+    const [register, { validate }] = useForm()
 
     const { t } = useI18n()
     const { signing } = useSigningActions()
@@ -40,45 +42,43 @@ export default defineComponent({
 
     /** 普通登陆形式 */
     const handleLogin = () => {
-      loginFormRef.value?.validate((valid) => {
+      validate().then(() => {
-        if (!valid) {
+        loading.value = true
-          loading.value = true
 
-          signing(signingForm.value)
+        signing(signingForm.value)
-            .then((res) => {
+          .then((res) => {
-              if (res.code === 0) {
+            if (res.code === 0) {
-                setTimeout(() => {
+              setTimeout(() => {
-                  window.$message.success(`欢迎${signingForm.value.name}登陆~`)
+                window.$message.success(`欢迎${signingForm.value.name}登陆~`)
 
-                  setStorage(APP_CATCH_KEY.token, 'tokenValue', 'localStorage')
+                setStorage(APP_CATCH_KEY.token, 'tokenValue', 'localStorage')
-                  setStorage(APP_CATCH_KEY.signing, res.data, 'localStorage')
+                setStorage(APP_CATCH_KEY.signing, res.data, 'localStorage')
 
-                  router.push(getRootPath.value)
+                router.push(getRootPath.value)
 
-                  loading.value = false
+                loading.value = false
-                }, 2 * 1000)
+              }, 2 * 1000)
-              }
+            }
-            })
+          })
-            .catch(() => {
+          .catch(() => {
-              window.$message.error('不可以这样哟, 不可以哟')
+            window.$message.error('不可以这样哟, 不可以哟')
-            })
+          })
-        }
       })
     }
 
     return {
       signingForm,
-      loginFormRef,
+      register,
       handleLogin,
       rules,
       loading,
     }
   },
   render() {
-    const { $t, loading } = this
+    const { $t, loading, register } = this
 
     return (
-      <NForm model={this.signingForm} ref="loginFormRef" rules={this.rules}>
+      <RForm model={this.signingForm} onRegister={register} rules={this.rules}>
         <NFormItem label={$t('views.login.index.Name')} path="name">
           <NInput
             v-model:value={this.signingForm.name}
@@ -102,7 +102,7 @@ export default defineComponent({
         >
           {$t('views.login.index.Login')}
         </NButton>
-      </NForm>
+      </RForm>
     )
   },
 })