diff --git a/CHANGELOG.md b/CHANGELOG.md index 0220ff48..b1aea878 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/__test__/utils/createRefElement.tsx b/__test__/utils/createRefElement.tsx index f97f83c1..52708ddd 100644 --- a/__test__/utils/createRefElement.tsx +++ b/__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) => { const wrapper = mount( defineComponent({ diff --git a/package.json b/package.json index 639fe304..841f2e7c 100755 --- a/package.json +++ b/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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b2869d1..f9c698ca 100644 --- a/pnpm-lock.yaml +++ b/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 - version: 11.1.0(vue@3.5.12(typescript@5.6.3)) + specifier: ^11.2.0 + 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 - version: 5.5.0 + specifier: ^5.5.1 + 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 - version: 3.5.12(typescript@5.6.3) + specifier: ^3.5.13 + 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': - resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==} + '@vue/reactivity@3.5.13': + resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==} - '@vue/runtime-core@3.5.12': - resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==} + '@vue/runtime-core@3.5.13': + resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==} - '@vue/runtime-dom@3.5.12': - resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==} + '@vue/runtime-dom@3.5.13': + resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==} - '@vue/server-renderer@3.5.12': - resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==} + '@vue/server-renderer@3.5.13': + 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': - resolution: {integrity: sha512-P6dk79QYA6sKQnghrUz/1tHi0n9mrb/iO1WTMk/ElLmTyNqgDeSZ3wcDf6fRBGzRJbeG1dxzEOvLENMjr+E3fg==} + '@vueuse/core@11.2.0': + resolution: {integrity: sha512-JIUwRcOqOWzcdu1dGlfW04kaJhW3EXnnjJJfLTtddJanymTL7lF1C0+dVVZ/siLfc73mWn+cGP1PE1PKPruRSA==} - '@vueuse/metadata@11.1.0': - resolution: {integrity: sha512-l9Q502TBTaPYGanl1G+hPgd3QX5s4CGnpXriVBR5fEZ/goI6fvDaVmIl3Td8oKFurOxTmbXvBPSsgrd6eu6HYg==} + '@vueuse/metadata@11.2.0': + resolution: {integrity: sha512-L0ZmtRmNx+ZW95DmrgD6vn484gSpVeRbgpWevFKXwqqQxW9hnSi2Ppuh2BzMjnbv4aJRiIw8tQatXT9uOB23dQ==} - '@vueuse/shared@11.1.0': - resolution: {integrity: sha512-YUtIpY122q7osj+zsNMFAfMTubGz0sn5QzE5gPzAIiCmtt2ha3uQUY1+JPyL4gRCTsLPX82Y9brNbo/aqlA91w==} + '@vueuse/shared@11.2.0': + 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: - resolution: {integrity: sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==} + echarts@5.5.1: + 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: - resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==} + object-inspect@1.13.3: + 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: - resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==} + vue@3.5.13: + 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: - resolution: {integrity: sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==} + zrender@5.6.0: + 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/shared': 3.5.12 + '@vue/reactivity': 3.5.13 + '@vue/shared': 3.5.13 - '@vue/runtime-dom@3.5.12': + '@vue/runtime-dom@3.5.13': dependencies: - '@vue/reactivity': 3.5.12 - '@vue/runtime-core': 3.5.12 - '@vue/shared': 3.5.12 + '@vue/reactivity': 3.5.13 + '@vue/runtime-core': 3.5.13 + '@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/shared': 3.5.12 - vue: 3.5.12(typescript@5.6.3) + '@vue/compiler-ssr': 3.5.13 + '@vue/shared': 3.5.13 + 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/shared': 11.1.0(vue@3.5.12(typescript@5.6.3)) - vue-demi: 0.14.10(vue@3.5.12(typescript@5.6.3)) + '@vueuse/metadata': 11.2.0 + '@vueuse/shared': 11.2.0(vue@3.5.13(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)) - vooks: 0.2.12(vue@3.5.12(typescript@5.6.3)) - vue: 3.5.12(typescript@5.6.3) - vueuc: 0.4.64(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.13(typescript@5.6.3)) + vue: 3.5.13(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-demi: 0.14.10(vue@3.5.12(typescript@5.6.3)) + vue: 3.5.13(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-sfc': 3.5.12 - '@vue/runtime-dom': 3.5.12 - '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.6.3)) - '@vue/shared': 3.5.12 + '@vue/compiler-dom': 3.5.13 + '@vue/compiler-sfc': 3.5.13 + '@vue/runtime-dom': 3.5.13 + '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.6.3)) + '@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)) - vooks: 0.2.12(vue@3.5.12(typescript@5.6.3)) - 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.13(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 diff --git a/src/app-components/app/AppAvatar/index.tsx b/src/app-components/app/AppAvatar/index.tsx index ef4655c5..5d863b52 100644 --- a/src/app-components/app/AppAvatar/index.tsx +++ b/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], + }} + {getSigningCallback?.name} diff --git a/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx b/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx index c730116d..c773223e 100644 --- a/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx +++ b/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(null) - const inputInstRef = ref(null) + const formInstRef = useTemplateRef('formInstRef') + const inputInstRef = useTemplateRef('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 (
+ (null) - const inputInstRef = ref(null) + const formRef = useTemplateRef('formRef') + const inputInstRef = useTemplateRef('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({
-
- {HH_MM} {AM_PM} -
- {YY_MM_DD} {DDD} + {YY_MM_DD} {DDD} {AM_PM}
diff --git a/src/app-components/app/AppLockScreen/index.scss b/src/app-components/app/AppLockScreen/index.scss index 9236bfb6..8b4dbb9c 100644 --- a/src/app-components/app/AppLockScreen/index.scss +++ b/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; + } + } +} diff --git a/src/app-components/provider/AppVersionProvider/index.tsx b/src/app-components/provider/AppVersionProvider/index.tsx index 86453308..e843477d 100644 --- a/src/app-components/provider/AppVersionProvider/index.tsx +++ b/src/app-components/provider/AppVersionProvider/index.tsx @@ -28,18 +28,10 @@ export default defineComponent({ if (version !== cacheVersion) { modalShow.value = true - setStorage( - APP_CATCH_KEY.appVersionProvider, - version, - 'localStorage', - ) + setStorage(APP_CATCH_KEY.appVersionProvider, version, 'localStorage') } } else { - setStorage( - APP_CATCH_KEY.appVersionProvider, - version, - 'localStorage', - ) + setStorage(APP_CATCH_KEY.appVersionProvider, version, 'localStorage') } return { diff --git a/src/app-config/router-config.ts b/src/app-config/router-config.ts index ff1bcc4d..7b71084f 100644 --- a/src/app-config/router-config.ts +++ b/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(null) + shallowRef(null) /** * * @description - * 侧边滚动栏滚动 ref 注册。 + * 侧边滚动栏滚动 shallowRef 注册。 * 可以控制侧边滚动栏滚动位置。 * * 请注意使用时机。建议使用 nextTick() 等待 dom 挂载后再执行该方法。 @@ -31,7 +31,7 @@ export const LAYOUT_CONTENT_REF: Readonly> = * }) */ export const LAYOUT_SIDER_REF: Readonly> = - ref(null) + shallowRef(null) export const SETUP_ROUTER_ACTION = { /** 是否启用路由切换时顶部加载条 */ diff --git a/src/axios/axios-interceptor/request/plugins/request-headers.ts b/src/axios/axios-interceptor/request/plugins/request-headers.ts index 19a817fe..6db36f2b 100644 --- a/src/axios/axios-interceptor/request/plugins/request-headers.ts +++ b/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(APP_CATCH_KEY.token, 'localStorage') + const token = getStorage(APP_CATCH_KEY.token, 'localStorage') if (ins.url) { // TODO: 根据 url 不同是否设置 token diff --git a/src/axios/index.ts b/src/axios/index.ts index 01e1020e..0b3e12d6 100644 --- a/src/axios/index.ts +++ b/src/axios/index.ts @@ -40,14 +40,14 @@ function useRequest< fetchOptions: AppRawRequestConfig, option?: UseRequestOptions, ) { - const fc = () => { + const fn = () => { const cb = request(fetchOptions) return cb } const hooks = useHookPlusRequest( - fc, + fn, Object.assign({}, option), ) diff --git a/src/components/base/RChart/src/config.ts b/src/components/base/RChart/src/config.ts new file mode 100644 index 00000000..6f73fa88 --- /dev/null +++ b/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 +> = Symbol('USE_CHART_PROVIDER_KEY') diff --git a/src/components/base/RChart/src/hooks/useChartProvider.ts b/src/components/base/RChart/src/hooks/useChartProvider.ts new file mode 100644 index 00000000..201c5897 --- /dev/null +++ b/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) => { + provide(USE_CHART_PROVIDER_KEY, options) +} diff --git a/src/components/base/RChart/src/index.tsx b/src/components/base/RChart/src/index.tsx index 7d42d485..abf191d8 100644 --- a/src/components/base/RChart/src/index.tsx +++ b/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('') diff --git a/src/components/base/RForm/src/hooks/useForm.ts b/src/components/base/RForm/src/hooks/useForm.ts index 6dda2959..3b928040 100644 --- a/src/components/base/RForm/src/hooks/useForm.ts +++ b/src/components/base/RForm/src/hooks/useForm.ts @@ -40,7 +40,7 @@ const useForm = ( model?: T, rules?: R, ) => { - const formRef = ref() + const formRef = shallowRef() const register = (inst: RFormInst) => { if (inst) { diff --git a/src/components/base/RTable/src/hooks/useTable.ts b/src/components/base/RTable/src/hooks/useTable.ts index 357fa894..f3be398f 100644 --- a/src/components/base/RTable/src/hooks/useTable.ts +++ b/src/components/base/RTable/src/hooks/useTable.ts @@ -41,7 +41,7 @@ import type { PrintDomOptions } from '@/utils' * }) */ const useTable = () => { - const tableRef = ref() + const tableRef = shallowRef() let extra = {} as TableProvider const register: UseTableRegister = (inst, extraInfo) => { diff --git a/src/dayjs/index.ts b/src/dayjs/index.ts index 352eb91d..90a0eb87 100644 --- a/src/dayjs/index.ts +++ b/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( + 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) } diff --git a/src/directives/utils/combine.ts b/src/directives/utils/combine.ts index 58f9f2d2..b5c92735 100644 --- a/src/directives/utils/combine.ts +++ b/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') { - pre[curr as K] = fc + if (typeof fn === 'function') { + pre[curr as K] = fn return pre } else { diff --git a/src/hooks/components/useContextmenuCoordinate.ts b/src/hooks/components/useContextmenuCoordinate.ts index bfbc7a3b..45be4129 100644 --- a/src/hooks/components/useContextmenuCoordinate.ts +++ b/src/hooks/components/useContextmenuCoordinate.ts @@ -23,10 +23,11 @@ export interface UseContextmenuCoordinateOptions { * * @param target 绑定元素 * - * 右键点击元素时，获取鼠标坐标。该方法结合 NDropdown 组件使用，可以实现右键菜单功能 + * @description + * 右键点击元素时，获取鼠标坐标。该方法结合 NDropdown 组件使用，可以实现右键菜单功能。 * * @example - * const target = ref(null) + * const target = useTemplateRef('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, (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() diff --git a/src/hooks/template/useSiderBar.ts b/src/hooks/template/useSiderBar.ts index 4e5f4358..68ea8b5c 100644 --- a/src/hooks/template/useSiderBar.ts +++ b/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 diff --git a/src/hooks/web/useDomToImage.ts b/src/hooks/web/useDomToImage.ts index 31a8ef18..65270df5 100644 --- a/src/hooks/web/useDomToImage.ts +++ b/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() + * const refDom = useTemplateRef('refDom') * const { create, stop } = useDomToImage(refDom, { * beforeCreate: (element) => { ... }, * created: (element, result) => { ... }, diff --git a/src/hooks/web/useElementFullscreen.ts b/src/hooks/web/useElementFullscreen.ts index 072cceeb..366ed42e 100644 --- a/src/hooks/web/useElementFullscreen.ts +++ b/src/hooks/web/useElementFullscreen.ts @@ -82,7 +82,7 @@ const styleElement = document.createElement('style') *
* *