diff --git a/.vscode/settings.json b/.vscode/settings.json index 2ad5cc54..2af112a1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,6 +25,7 @@ "domtoimage", "EDITMSG", "iife", + "linebreak", "macarons", "menutag", "ndata", @@ -32,6 +33,7 @@ "Popselect", "precommit", "siderbar", + "stylelint", "WUJIE", "zlevel" ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a214632..8fb39b90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,48 @@ # CHANGE LOG +## 4.7.0 + +做了一些核心依赖的升级操作。 + +并且规范了整个模板的包命名，这个一直算是遗留问题，有些包名不够语意化与有点混乱，现在终于统一了。 + +## Feats + +- `useDomToImage` 相关 + - 优化 `ts` 类型提示 +- `usePrint` 相关 + - 现在会强制剔除 `printable` 配置项 +- 移除 `rollup-plugin-visualizer` 体积分析插件，使用 `vite-bundle-analyzer` 替换 + +```sh +# 执行 +pnpm report + +# 等待构建后，会自动打开浏览器。 +``` + +- 移除 `report` 模式的 `eslint` 检查 +- `axios` 相关 + - `BeforeFetchFunction` 类型更名为 `FetchFunction` + - `AppRawRequestConfig` 类型新增 `__CANCELER_TAG_RAY_TEMPLATE__` 标记，用于标记是否需要可以被取消 + - 优化 `ts` 类型标注 +- 将所有 `type.ts` 包重命名为 `types.ts` 符合语义 +- 更新 `vueuse` 版本至 `10.9.0` +- 更新 `vite` 版本至 `5.1.5` +- 更新 `vue` 版本至 `3.4.21` +- 将所有 `helper.ts, helper file` 统一更改为 `utils.ts`, `utils file` 方式管理 +- 重构 `app/prefixCacheKey` 方法，现在支持自定义前缀 +- 优化 `GlobalSearch` 搜索待选项样式 +- `__ray-template` 包现在只会在 `__DEV__` 环境下才会做检查 +- 新增 `ellipsis` 指令，并且补充所有自定义指令的注释 +- `router` 包相关 + - 修改 `router` 注册形式，改为同步注册 + - 修改 `routes` 包导出形式，改为导出一个数组 + +## Fixes + +- 修复 `useVueRouter` 方法 `HMR` 时可能会报错的问题 + ## 4.6.4 稳定了 `4.6.4` 版本。 @@ -208,7 +251,7 @@ remove('your key', 'all') import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const cacheDemo: AppRouteRecordRaw = { // ...your route config, diff --git a/package.json b/package.json index 116f1fb9..9786c04a 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ray-template", "private": false, - "version": "4.6.4", + "version": "4.7.0", "type": "module", "engines": { "node": "^18.0.0 || >=20.0.0", @@ -32,7 +32,7 @@ ] }, "dependencies": { - "@vueuse/core": "^10.7.1", + "@vueuse/core": "^10.9.0", "awesome-qr": "2.1.5-rc.0", "axios": "^1.6.7", "clipboard": "^2.0.11", @@ -48,7 +48,7 @@ "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.0", "print-js": "^1.6.0", - "vue": "^3.4.20", + "vue": "^3.4.21", "vue-demi": "0.14.6", "vue-hooks-plus": "1.8.8", "vue-i18n": "^9.9.0", @@ -87,13 +87,13 @@ "postcss": "^8.4.31", "postcss-px-to-viewport-8-plugin": "1.2.3", "prettier": "^3.2.5", - "rollup-plugin-visualizer": "^5.12.0", "sass": "1.71.1", "svg-sprite-loader": "^6.0.11", "typescript": "^5.2.2", "unplugin-auto-import": "^0.17.5", "unplugin-vue-components": "^0.26.0", - "vite": "^5.1.4", + "vite": "^5.1.5", + "vite-bundle-analyzer": "0.8.1", "vite-plugin-cdn2": "0.15.4", "vite-plugin-compression": "^0.5.1", "vite-plugin-ejs": "^1.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f0b6496..f8178276 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@vueuse/core': - specifier: ^10.7.1 - version: 10.7.1(vue@3.4.20) + specifier: ^10.9.0 + version: 10.9.0(vue@3.4.21) awesome-qr: specifier: 2.1.5-rc.0 version: 2.1.5-rc.0 @@ -43,10 +43,10 @@ dependencies: version: 1.1.0 naive-ui: specifier: ^2.38.1 - version: 2.38.1(vue@3.4.20) + version: 2.38.1(vue@3.4.21) pinia: specifier: ^2.1.7 - version: 2.1.7(typescript@5.2.2)(vue@3.4.20) + version: 2.1.7(typescript@5.2.2)(vue@3.4.21) pinia-plugin-persistedstate: specifier: ^3.2.0 version: 3.2.0(pinia@2.1.7) @@ -54,20 +54,20 @@ dependencies: specifier: ^1.6.0 version: 1.6.0 vue: - specifier: ^3.4.20 - version: 3.4.20(typescript@5.2.2) + specifier: ^3.4.21 + version: 3.4.21(typescript@5.2.2) vue-demi: specifier: 0.14.6 - version: 0.14.6(vue@3.4.20) + version: 0.14.6(vue@3.4.21) vue-hooks-plus: specifier: 1.8.8 - version: 1.8.8(vue@3.4.20) + version: 1.8.8(vue@3.4.21) vue-i18n: specifier: ^9.9.0 - version: 9.9.0(vue@3.4.20) + version: 9.9.0(vue@3.4.21) vue-router: specifier: ^4.2.5 - version: 4.2.5(vue@3.4.20) + version: 4.2.5(vue@3.4.21) devDependencies: '@babel/core': @@ -108,10 +108,10 @@ devDependencies: version: 6.5.0(eslint@8.56.0)(typescript@5.2.2) '@vitejs/plugin-vue': specifier: ^5.0.4 - version: 5.0.4(vite@5.1.4)(vue@3.4.20) + version: 5.0.4(vite@5.1.5)(vue@3.4.21) '@vitejs/plugin-vue-jsx': specifier: ^3.1.0 - version: 3.1.0(vite@5.1.4)(vue@3.4.20) + version: 3.1.0(vite@5.1.5)(vue@3.4.21) '@vue-hooks-plus/resolvers': specifier: 1.2.4 version: 1.2.4(vue-hooks-plus@1.8.8) @@ -166,9 +166,6 @@ devDependencies: prettier: specifier: ^3.2.5 version: 3.2.5 - rollup-plugin-visualizer: - specifier: ^5.12.0 - version: 5.12.0 sass: specifier: 1.71.1 version: 1.71.1 @@ -180,37 +177,40 @@ devDependencies: version: 5.2.2 unplugin-auto-import: specifier: ^0.17.5 - version: 0.17.5(@vueuse/core@10.7.1) + version: 0.17.5(@vueuse/core@10.9.0) unplugin-vue-components: specifier: ^0.26.0 - version: 0.26.0(vue@3.4.20) + version: 0.26.0(vue@3.4.21) vite: - specifier: ^5.1.4 - version: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + specifier: ^5.1.5 + version: 5.1.5(@types/node@20.4.7)(sass@1.71.1) + vite-bundle-analyzer: + specifier: 0.8.1 + version: 0.8.1 vite-plugin-cdn2: specifier: 0.15.4 version: 0.15.4 vite-plugin-compression: specifier: ^0.5.1 - version: 0.5.1(vite@5.1.4) + version: 0.5.1(vite@5.1.5) vite-plugin-ejs: specifier: ^1.7.0 - version: 1.7.0(vite@5.1.4) + version: 1.7.0(vite@5.1.5) vite-plugin-eslint: specifier: 1.8.1 - version: 1.8.1(eslint@8.56.0)(vite@5.1.4) + version: 1.8.1(eslint@8.56.0)(vite@5.1.5) vite-plugin-imp: specifier: ^2.4.0 - version: 2.4.0(vite@5.1.4) + version: 2.4.0(vite@5.1.5) vite-plugin-inspect: specifier: ^0.8.3 - version: 0.8.3(vite@5.1.4) + version: 0.8.3(vite@5.1.5) vite-plugin-mock-dev-server: specifier: 1.4.7 - version: 1.4.7(vite@5.1.4) + version: 1.4.7(vite@5.1.5) vite-plugin-svg-icons: specifier: ^2.0.1 - version: 2.0.1(vite@5.1.4) + version: 2.0.1(vite@5.1.5) vite-svg-loader: specifier: ^4.0.0 version: 4.0.0 @@ -299,7 +299,7 @@ packages: resolution: {integrity: sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.19 jsesc: 2.5.2 @@ -319,7 +319,7 @@ packages: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 dev: true /@babel/helper-compilation-targets@7.23.6: @@ -366,7 +366,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.15 - '@babel/types': 7.23.3 + '@babel/types': 7.24.0 dev: true /@babel/helper-function-name@7.23.0: @@ -374,28 +374,28 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.15 - '@babel/types': 7.23.3 + '@babel/types': 7.23.9 dev: true /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.3 + '@babel/types': 7.23.9 dev: true /@babel/helper-member-expression-to-functions@7.23.0: resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 dev: true /@babel/helper-module-imports@7.22.15: resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.3 + '@babel/types': 7.23.9 dev: true /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.9): @@ -416,7 +416,7 @@ packages: resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 dev: true /@babel/helper-plugin-utils@7.22.5: @@ -447,19 +447,14 @@ packages: resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 dev: true /@babel/helper-split-export-declaration@7.22.6: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.3 - dev: true - - /@babel/helper-string-parser@7.22.5: - resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} - engines: {node: '>=6.9.0'} + '@babel/types': 7.23.9 dev: true /@babel/helper-string-parser@7.23.4: @@ -509,7 +504,7 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.23.3 + '@babel/types': 7.24.0 dev: true /@babel/parser@7.23.3: @@ -517,15 +512,7 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.23.3 - dev: true - - /@babel/parser@7.23.6: - resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 dev: true /@babel/parser@7.23.9: @@ -534,6 +521,14 @@ packages: hasBin: true dependencies: '@babel/types': 7.23.9 + dev: true + + /@babel/parser@7.24.0: + resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.24.0 /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} @@ -580,8 +575,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.22.13 - '@babel/parser': 7.23.3 - '@babel/types': 7.23.3 + '@babel/parser': 7.24.0 + '@babel/types': 7.23.6 dev: true /@babel/template@7.23.9: @@ -604,7 +599,7 @@ packages: '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.23.3 - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -622,7 +617,7 @@ packages: '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.22.5 - '@babel/types': 7.23.3 + '@babel/types': 7.24.0 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -639,7 +634,7 @@ packages: '@babel/helper-function-name': 7.23.0 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.23.6 + '@babel/parser': 7.24.0 '@babel/types': 7.23.6 debug: 4.3.4 globals: 11.12.0 @@ -665,15 +660,6 @@ packages: - supports-color dev: true - /@babel/types@7.23.3: - resolution: {integrity: sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-string-parser': 7.22.5 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 - dev: true - /@babel/types@7.23.6: resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} @@ -690,6 +676,15 @@ packages: '@babel/helper-string-parser': 7.23.4 '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 + dev: true + + /@babel/types@7.24.0: + resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.23.4 + '@babel/helper-validator-identifier': 7.22.20 + to-fast-properties: 2.0.0 /@commitlint/cli@17.7.1: resolution: {integrity: sha512-BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g==} @@ -874,27 +869,18 @@ packages: css-render: 0.15.12 dev: false - /@css-render/vue3-ssr@0.15.12(vue@3.4.20): + /@css-render/vue3-ssr@0.15.12(vue@3.4.21): resolution: {integrity: sha512-AQLGhhaE0F+rwybRCkKUdzBdTEM/5PZBYy+fSYe1T9z9+yxMuV/k7ZRqa4M69X+EI1W8pa4kc9Iq2VjQkZx4rg==} peerDependencies: vue: ^3.0.11 dependencies: - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) dev: false /@emotion/hash@0.8.0: resolution: {integrity: sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==} dev: false - /@esbuild/aix-ppc64@0.19.10: - resolution: {integrity: sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - requiresBuild: true - dev: true - optional: true - /@esbuild/aix-ppc64@0.19.12: resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} engines: {node: '>=12'} @@ -904,15 +890,6 @@ packages: dev: true optional: true - /@esbuild/android-arm64@0.19.10: - resolution: {integrity: sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm64@0.19.12: resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} engines: {node: '>=12'} @@ -922,15 +899,6 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.19.10: - resolution: {integrity: sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.19.12: resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} engines: {node: '>=12'} @@ -940,15 +908,6 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.19.10: - resolution: {integrity: sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-x64@0.19.12: resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} engines: {node: '>=12'} @@ -958,15 +917,6 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.19.10: - resolution: {integrity: sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-arm64@0.19.12: resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} engines: {node: '>=12'} @@ -976,15 +926,6 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.19.10: - resolution: {integrity: sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-x64@0.19.12: resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} engines: {node: '>=12'} @@ -994,15 +935,6 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.19.10: - resolution: {integrity: sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-arm64@0.19.12: resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} engines: {node: '>=12'} @@ -1012,15 +944,6 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.19.10: - resolution: {integrity: sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-x64@0.19.12: resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} engines: {node: '>=12'} @@ -1030,15 +953,6 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.19.10: - resolution: {integrity: sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm64@0.19.12: resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} engines: {node: '>=12'} @@ -1048,15 +962,6 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.19.10: - resolution: {integrity: sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm@0.19.12: resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} engines: {node: '>=12'} @@ -1066,15 +971,6 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.19.10: - resolution: {integrity: sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ia32@0.19.12: resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} engines: {node: '>=12'} @@ -1084,15 +980,6 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.19.10: - resolution: {integrity: sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.19.12: resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} engines: {node: '>=12'} @@ -1102,15 +989,6 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.19.10: - resolution: {integrity: sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-mips64el@0.19.12: resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} engines: {node: '>=12'} @@ -1120,15 +998,6 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.19.10: - resolution: {integrity: sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ppc64@0.19.12: resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} engines: {node: '>=12'} @@ -1138,15 +1007,6 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.19.10: - resolution: {integrity: sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-riscv64@0.19.12: resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} engines: {node: '>=12'} @@ -1156,15 +1016,6 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.19.10: - resolution: {integrity: sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-s390x@0.19.12: resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} engines: {node: '>=12'} @@ -1174,15 +1025,6 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.19.10: - resolution: {integrity: sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-x64@0.19.12: resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} engines: {node: '>=12'} @@ -1192,15 +1034,6 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.19.10: - resolution: {integrity: sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/netbsd-x64@0.19.12: resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} engines: {node: '>=12'} @@ -1210,15 +1043,6 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.19.10: - resolution: {integrity: sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/openbsd-x64@0.19.12: resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} engines: {node: '>=12'} @@ -1228,15 +1052,6 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.19.10: - resolution: {integrity: sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /@esbuild/sunos-x64@0.19.12: resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} engines: {node: '>=12'} @@ -1246,15 +1061,6 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.19.10: - resolution: {integrity: sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-arm64@0.19.12: resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} engines: {node: '>=12'} @@ -1264,15 +1070,6 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.19.10: - resolution: {integrity: sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-ia32@0.19.12: resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} engines: {node: '>=12'} @@ -1282,15 +1079,6 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.19.10: - resolution: {integrity: sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-x64@0.19.12: resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} engines: {node: '>=12'} @@ -1386,7 +1174,7 @@ packages: magic-string: 0.30.7 mlly: 1.6.0 source-map-js: 1.0.2 - vue-i18n: 9.9.0(vue@3.4.20) + vue-i18n: 9.9.0(vue@3.4.21) yaml-eslint-parser: 1.2.2 dev: true @@ -1435,7 +1223,7 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 unplugin: 1.7.1 - vue-i18n: 9.9.0(vue@3.4.20) + vue-i18n: 9.9.0(vue@3.4.21) transitivePeerDependencies: - rollup - supports-color @@ -1570,104 +1358,104 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/rollup-android-arm-eabi@4.9.1: - resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} + /@rollup/rollup-android-arm-eabi@4.12.0: + resolution: {integrity: sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==} cpu: [arm] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-android-arm64@4.9.1: - resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} + /@rollup/rollup-android-arm64@4.12.0: + resolution: {integrity: sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-arm64@4.9.1: - resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} + /@rollup/rollup-darwin-arm64@4.12.0: + resolution: {integrity: sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-x64@4.9.1: - resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} + /@rollup/rollup-darwin-x64@4.12.0: + resolution: {integrity: sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.9.1: - resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} + /@rollup/rollup-linux-arm-gnueabihf@4.12.0: + resolution: {integrity: sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.9.1: - resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} + /@rollup/rollup-linux-arm64-gnu@4.12.0: + resolution: {integrity: sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.9.1: - resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} + /@rollup/rollup-linux-arm64-musl@4.12.0: + resolution: {integrity: sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.9.1: - resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} + /@rollup/rollup-linux-riscv64-gnu@4.12.0: + resolution: {integrity: sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==} cpu: [riscv64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.9.1: - resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} + /@rollup/rollup-linux-x64-gnu@4.12.0: + resolution: {integrity: sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.9.1: - resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} + /@rollup/rollup-linux-x64-musl@4.12.0: + resolution: {integrity: sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.9.1: - resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} + /@rollup/rollup-win32-arm64-msvc@4.12.0: + resolution: {integrity: sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.9.1: - resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} + /@rollup/rollup-win32-ia32-msvc@4.12.0: + resolution: {integrity: sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.9.1: - resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} + /@rollup/rollup-win32-x64-msvc@4.12.0: + resolution: {integrity: sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==} cpu: [x64] os: [win32] requiresBuild: true @@ -2060,7 +1848,7 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@vitejs/plugin-vue-jsx@3.1.0(vite@5.1.4)(vue@3.4.20): + /@vitejs/plugin-vue-jsx@3.1.0(vite@5.1.5)(vue@3.4.21): resolution: {integrity: sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2070,21 +1858,21 @@ packages: '@babel/core': 7.23.9 '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.9) '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.9) - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) - vue: 3.4.20(typescript@5.2.2) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) + vue: 3.4.21(typescript@5.2.2) transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue@5.0.4(vite@5.1.4)(vue@3.4.20): + /@vitejs/plugin-vue@5.0.4(vite@5.1.5)(vue@3.4.21): resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) - vue: 3.4.20(typescript@5.2.2) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) + vue: 3.4.21(typescript@5.2.2) dev: true /@volar/language-core@1.11.1: @@ -2113,7 +1901,7 @@ packages: vue-hooks-plus: ^1.5.2 dependencies: local-pkg: 0.4.3 - vue-hooks-plus: 1.8.8(vue@3.4.20) + vue-hooks-plus: 1.8.8(vue@3.4.21) dev: true /@vue/babel-helper-vue-transform-on@1.1.5: @@ -2142,7 +1930,7 @@ packages: /@vue/compiler-core@3.3.8: resolution: {integrity: sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g==} dependencies: - '@babel/parser': 7.23.3 + '@babel/parser': 7.24.0 '@vue/shared': 3.3.8 estree-walker: 2.0.2 source-map-js: 1.0.2 @@ -2158,11 +1946,11 @@ packages: source-map-js: 1.0.2 dev: true - /@vue/compiler-core@3.4.20: - resolution: {integrity: sha512-l7M+xUuL8hrGtRLkrf+62d9zucAdgqNBTbJ/NufCOIuJQhauhfyAKH9ra/qUctCXcULwmclGAVpvmxjbBO30qg==} + /@vue/compiler-core@3.4.21: + resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==} dependencies: - '@babel/parser': 7.23.9 - '@vue/shared': 3.4.20 + '@babel/parser': 7.24.0 + '@vue/shared': 3.4.21 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.0.2 @@ -2181,23 +1969,23 @@ packages: '@vue/shared': 3.4.19 dev: true - /@vue/compiler-dom@3.4.20: - resolution: {integrity: sha512-/cSBGL79HFBYgDnqCNKErOav3bPde3n0sJwJM2Z09rXlkiowV/2SG1tgDAiWS1CatS4Cvo0o74e1vNeCK1R3RA==} + /@vue/compiler-dom@3.4.21: + resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==} dependencies: - '@vue/compiler-core': 3.4.20 - '@vue/shared': 3.4.20 + '@vue/compiler-core': 3.4.21 + '@vue/shared': 3.4.21 /@vue/compiler-sfc@3.3.8: resolution: {integrity: sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA==} dependencies: - '@babel/parser': 7.23.3 + '@babel/parser': 7.24.0 '@vue/compiler-core': 3.3.8 '@vue/compiler-dom': 3.3.8 '@vue/compiler-ssr': 3.3.8 '@vue/reactivity-transform': 3.3.8 '@vue/shared': 3.3.8 estree-walker: 2.0.2 - magic-string: 0.30.7 + magic-string: 0.30.8 postcss: 8.4.31 source-map-js: 1.0.2 dev: true @@ -2216,16 +2004,16 @@ packages: source-map-js: 1.0.2 dev: true - /@vue/compiler-sfc@3.4.20: - resolution: {integrity: sha512-nPuTZz0yxTPzjyYe+9nQQsFYImcz/57UX8N3jyhl5oIUUs2jqqAMaULsAlJwve3qNYfjQzq0bwy3pqJrN9ecZw==} + /@vue/compiler-sfc@3.4.21: + resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} dependencies: - '@babel/parser': 7.23.9 - '@vue/compiler-core': 3.4.20 - '@vue/compiler-dom': 3.4.20 - '@vue/compiler-ssr': 3.4.20 - '@vue/shared': 3.4.20 + '@babel/parser': 7.24.0 + '@vue/compiler-core': 3.4.21 + '@vue/compiler-dom': 3.4.21 + '@vue/compiler-ssr': 3.4.21 + '@vue/shared': 3.4.21 estree-walker: 2.0.2 - magic-string: 0.30.7 + magic-string: 0.30.8 postcss: 8.4.35 source-map-js: 1.0.2 @@ -2243,11 +2031,11 @@ packages: '@vue/shared': 3.4.19 dev: true - /@vue/compiler-ssr@3.4.20: - resolution: {integrity: sha512-b3gFQPiHLvI12C56otzBPpQhZ5kgkJ5RMv/zpLjLC2BIFwX5GktDqYQ7xg0Q2grP6uFI8al3beVKvAVxFtXmIg==} + /@vue/compiler-ssr@3.4.21: + resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==} dependencies: - '@vue/compiler-dom': 3.4.20 - '@vue/shared': 3.4.20 + '@vue/compiler-dom': 3.4.21 + '@vue/shared': 3.4.21 /@vue/devtools-api@6.5.1: resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} @@ -2297,8 +2085,8 @@ packages: dependencies: '@volar/language-core': 1.11.1 '@volar/source-map': 1.11.1 - '@vue/compiler-dom': 3.4.19 - '@vue/shared': 3.4.19 + '@vue/compiler-dom': 3.4.21 + '@vue/shared': 3.4.21 computeds: 0.0.1 minimatch: 9.0.3 muggle-string: 0.3.1 @@ -2310,39 +2098,39 @@ packages: /@vue/reactivity-transform@3.3.8: resolution: {integrity: sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw==} dependencies: - '@babel/parser': 7.23.3 + '@babel/parser': 7.24.0 '@vue/compiler-core': 3.3.8 '@vue/shared': 3.3.8 estree-walker: 2.0.2 - magic-string: 0.30.7 + magic-string: 0.30.8 dev: true - /@vue/reactivity@3.4.20: - resolution: {integrity: sha512-P5LJcxUkG6inlHr6MHVA4AVFAmRYJQ7ONGWJILNjMjoYuEXFhYviSCb9BEMyszSG/1kWCZbtWQlKSLasFRpThw==} + /@vue/reactivity@3.4.21: + resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==} dependencies: - '@vue/shared': 3.4.20 + '@vue/shared': 3.4.21 - /@vue/runtime-core@3.4.20: - resolution: {integrity: sha512-MPvsQpGAxoBqLHjqopt4YPtUYBpq0K6oAWDTwIR1CTNZ3y9O/J2ZVh+i2JpxKNYwANJBiZ20O99NE20uisB7xw==} + /@vue/runtime-core@3.4.21: + resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==} dependencies: - '@vue/reactivity': 3.4.20 - '@vue/shared': 3.4.20 + '@vue/reactivity': 3.4.21 + '@vue/shared': 3.4.21 - /@vue/runtime-dom@3.4.20: - resolution: {integrity: sha512-OkbPVP69H+8m74543zMAAx/LIkajxufYyow41gc0s5iF0uplT5uTQ4llDYu1GeJZEI8wjL5ueiPQruk4qwOMmA==} + /@vue/runtime-dom@3.4.21: + resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==} dependencies: - '@vue/runtime-core': 3.4.20 - '@vue/shared': 3.4.20 + '@vue/runtime-core': 3.4.21 + '@vue/shared': 3.4.21 csstype: 3.1.3 - /@vue/server-renderer@3.4.20(vue@3.4.20): - resolution: {integrity: sha512-w3VH2GuwxQHA6pJo/HCV22OfVC8Mw4oeHQM+vKeqtRK0OPE1Wilnh+P/SDVGGxPjJsGmyfphi0dbw8UKZQJH9w==} + /@vue/server-renderer@3.4.21(vue@3.4.21): + resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==} peerDependencies: - vue: 3.4.20 + vue: 3.4.21 dependencies: - '@vue/compiler-ssr': 3.4.20 - '@vue/shared': 3.4.20 - vue: 3.4.20(typescript@5.2.2) + '@vue/compiler-ssr': 3.4.21 + '@vue/shared': 3.4.21 + vue: 3.4.21(typescript@5.2.2) /@vue/shared@3.3.8: resolution: {integrity: sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==} @@ -2352,27 +2140,27 @@ packages: resolution: {integrity: sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==} dev: true - /@vue/shared@3.4.20: - resolution: {integrity: sha512-KTEngal0aiUvNJ6I1Chk5Ew5XqChsFsxP4GKAYXWb99zKJWjNU72p2FWEOmZWHxHcqtniOJsgnpd3zizdpfEag==} + /@vue/shared@3.4.21: + resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} - /@vueuse/core@10.7.1(vue@3.4.20): - resolution: {integrity: sha512-74mWHlaesJSWGp1ihg76vAnfVq9NTv1YT0SYhAQ6zwFNdBkkP+CKKJmVOEHcdSnLXCXYiL5e7MaewblfiYLP7g==} + /@vueuse/core@10.9.0(vue@3.4.21): + resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==} dependencies: '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 10.7.1 - '@vueuse/shared': 10.7.1(vue@3.4.20) - vue-demi: 0.14.6(vue@3.4.20) + '@vueuse/metadata': 10.9.0 + '@vueuse/shared': 10.9.0(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue - /@vueuse/metadata@10.7.1: - resolution: {integrity: sha512-jX8MbX5UX067DYVsbtrmKn6eG6KMcXxLRLlurGkZku5ZYT3vxgBjui2zajvUZ18QLIjrgBkFRsu7CqTAg18QFw==} + /@vueuse/metadata@10.9.0: + resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==} - /@vueuse/shared@10.7.1(vue@3.4.20): - resolution: {integrity: sha512-v0jbRR31LSgRY/C5i5X279A/WQjD6/JsMzGa+eqt658oJ75IvQXAeONmwvEMrvJQKnRElq/frzBR7fhmWY5uLw==} + /@vueuse/shared@10.9.0(vue@3.4.21): + resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.6(vue@3.4.20) + vue-demi: 0.14.7(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -2799,6 +2587,11 @@ packages: pascalcase: 0.1.1 dev: true + /big-integer@1.6.52: + resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==} + engines: {node: '>=0.6'} + dev: true + /big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: true @@ -2816,6 +2609,13 @@ packages: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} dev: true + /bplist-parser@0.2.0: + resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==} + engines: {node: '>= 5.10.0'} + dependencies: + big-integer: 1.6.52 + dev: true + /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -2893,6 +2693,13 @@ packages: semver: 7.5.4 dev: true + /bundle-name@3.0.0: + resolution: {integrity: sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==} + engines: {node: '>=12'} + dependencies: + run-applescript: 5.0.0 + dev: true + /bundle-name@4.1.0: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} @@ -3453,11 +3260,29 @@ packages: engines: {node: '>=0.10.0'} dev: true + /default-browser-id@3.0.0: + resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==} + engines: {node: '>=12'} + dependencies: + bplist-parser: 0.2.0 + untildify: 4.0.0 + dev: true + /default-browser-id@5.0.0: resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==} engines: {node: '>=18'} dev: true + /default-browser@4.0.0: + resolution: {integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==} + engines: {node: '>=14.16'} + dependencies: + bundle-name: 3.0.0 + default-browser-id: 3.0.0 + execa: 7.2.0 + titleize: 3.0.0 + dev: true + /default-browser@5.2.1: resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==} engines: {node: '>=18'} @@ -3466,11 +3291,6 @@ packages: default-browser-id: 5.0.0 dev: true - /define-lazy-prop@2.0.0: - resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} - engines: {node: '>=8'} - dev: true - /define-lazy-prop@3.0.0: resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} engines: {node: '>=12'} @@ -3830,37 +3650,6 @@ packages: is-symbol: 1.0.4 dev: true - /esbuild@0.19.10: - resolution: {integrity: sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/aix-ppc64': 0.19.10 - '@esbuild/android-arm': 0.19.10 - '@esbuild/android-arm64': 0.19.10 - '@esbuild/android-x64': 0.19.10 - '@esbuild/darwin-arm64': 0.19.10 - '@esbuild/darwin-x64': 0.19.10 - '@esbuild/freebsd-arm64': 0.19.10 - '@esbuild/freebsd-x64': 0.19.10 - '@esbuild/linux-arm': 0.19.10 - '@esbuild/linux-arm64': 0.19.10 - '@esbuild/linux-ia32': 0.19.10 - '@esbuild/linux-loong64': 0.19.10 - '@esbuild/linux-mips64el': 0.19.10 - '@esbuild/linux-ppc64': 0.19.10 - '@esbuild/linux-riscv64': 0.19.10 - '@esbuild/linux-s390x': 0.19.10 - '@esbuild/linux-x64': 0.19.10 - '@esbuild/netbsd-x64': 0.19.10 - '@esbuild/openbsd-x64': 0.19.10 - '@esbuild/sunos-x64': 0.19.10 - '@esbuild/win32-arm64': 0.19.10 - '@esbuild/win32-ia32': 0.19.10 - '@esbuild/win32-x64': 0.19.10 - dev: true - /esbuild@0.19.12: resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} engines: {node: '>=12'} @@ -4287,6 +4076,21 @@ packages: strip-final-newline: 2.0.0 dev: true + /execa@7.2.0: + resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} + engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} + dependencies: + cross-spawn: 7.0.3 + get-stream: 6.0.1 + human-signals: 4.3.1 + is-stream: 3.0.0 + merge-stream: 2.0.0 + npm-run-path: 5.1.0 + onetime: 6.0.0 + signal-exit: 3.0.7 + strip-final-newline: 3.0.0 + dev: true + /execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} @@ -4363,17 +4167,6 @@ packages: resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} dev: true - /fast-glob@3.3.1: - resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} - engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - dev: true - /fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} @@ -4734,7 +4527,7 @@ packages: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.3.1 + fast-glob: 3.3.2 ignore: 5.3.0 merge2: 1.4.1 slash: 3.0.0 @@ -4940,6 +4733,11 @@ packages: engines: {node: '>=10.17.0'} dev: true + /human-signals@4.3.1: + resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} + engines: {node: '>=14.18.0'} + dev: true + /human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} @@ -5657,6 +5455,13 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + + /magic-string@0.30.8: + resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} @@ -5926,13 +5731,13 @@ packages: minimatch: 3.1.2 dev: true - /naive-ui@2.38.1(vue@3.4.20): + /naive-ui@2.38.1(vue@3.4.21): resolution: {integrity: sha512-AnU1FQ7K/CbhguAX++V4kCFjk7h7RvWt4nvZPRjORMpq+fUIlzD+EcQ5Cv1VqDloNF8+eMv4Akc2Ogacc9S+5A==} peerDependencies: vue: ^3.0.0 dependencies: '@css-render/plugin-bem': 0.15.12(css-render@0.15.12) - '@css-render/vue3-ssr': 0.15.12(vue@3.4.20) + '@css-render/vue3-ssr': 0.15.12(vue@3.4.21) '@types/katex': 0.16.7 '@types/lodash': 4.14.202 '@types/lodash-es': 4.17.11 @@ -5947,10 +5752,10 @@ packages: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.4.20) - vooks: 0.2.12(vue@3.4.20) - vue: 3.4.20(typescript@5.2.2) - vueuc: 0.4.58(vue@3.4.20) + vdirs: 0.1.8(vue@3.4.21) + vooks: 0.2.12(vue@3.4.21) + vue: 3.4.21(typescript@5.2.2) + vueuc: 0.4.58(vue@3.4.21) dev: false /nan@2.17.0: @@ -6179,12 +5984,13 @@ packages: is-wsl: 3.1.0 dev: true - /open@8.4.2: - resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} - engines: {node: '>=12'} + /open@9.1.0: + resolution: {integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==} + engines: {node: '>=14.16'} dependencies: - define-lazy-prop: 2.0.0 - is-docker: 2.2.1 + default-browser: 4.0.0 + define-lazy-prop: 3.0.0 + is-inside-container: 1.0.0 is-wsl: 2.2.0 dev: true @@ -6345,10 +6151,10 @@ packages: peerDependencies: pinia: ^2.0.0 dependencies: - pinia: 2.1.7(typescript@5.2.2)(vue@3.4.20) + pinia: 2.1.7(typescript@5.2.2)(vue@3.4.21) dev: false - /pinia@2.1.7(typescript@5.2.2)(vue@3.4.20): + /pinia@2.1.7(typescript@5.2.2)(vue@3.4.21): resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==} peerDependencies: '@vue/composition-api': ^1.4.0 @@ -6362,8 +6168,8 @@ packages: dependencies: '@vue/devtools-api': 6.5.1 typescript: 5.2.2 - vue: 3.4.20(typescript@5.2.2) - vue-demi: 0.14.6(vue@3.4.20) + vue: 3.4.21(typescript@5.2.2) + vue-demi: 0.14.6(vue@3.4.21) dev: false /pkg-types@1.0.3: @@ -6713,22 +6519,6 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-visualizer@5.12.0: - resolution: {integrity: sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==} - engines: {node: '>=14'} - hasBin: true - peerDependencies: - rollup: 2.x || 3.x || 4.x - peerDependenciesMeta: - rollup: - optional: true - dependencies: - open: 8.4.2 - picomatch: 2.3.1 - source-map: 0.7.4 - yargs: 17.7.2 - dev: true - /rollup@2.79.1: resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} engines: {node: '>=10.0.0'} @@ -6737,24 +6527,26 @@ packages: fsevents: 2.3.3 dev: true - /rollup@4.9.1: - resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} + /rollup@4.12.0: + resolution: {integrity: sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + dependencies: + '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.1 - '@rollup/rollup-android-arm64': 4.9.1 - '@rollup/rollup-darwin-arm64': 4.9.1 - '@rollup/rollup-darwin-x64': 4.9.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.1 - '@rollup/rollup-linux-arm64-gnu': 4.9.1 - '@rollup/rollup-linux-arm64-musl': 4.9.1 - '@rollup/rollup-linux-riscv64-gnu': 4.9.1 - '@rollup/rollup-linux-x64-gnu': 4.9.1 - '@rollup/rollup-linux-x64-musl': 4.9.1 - '@rollup/rollup-win32-arm64-msvc': 4.9.1 - '@rollup/rollup-win32-ia32-msvc': 4.9.1 - '@rollup/rollup-win32-x64-msvc': 4.9.1 + '@rollup/rollup-android-arm-eabi': 4.12.0 + '@rollup/rollup-android-arm64': 4.12.0 + '@rollup/rollup-darwin-arm64': 4.12.0 + '@rollup/rollup-darwin-x64': 4.12.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.12.0 + '@rollup/rollup-linux-arm64-gnu': 4.12.0 + '@rollup/rollup-linux-arm64-musl': 4.12.0 + '@rollup/rollup-linux-riscv64-gnu': 4.12.0 + '@rollup/rollup-linux-x64-gnu': 4.12.0 + '@rollup/rollup-linux-x64-musl': 4.12.0 + '@rollup/rollup-win32-arm64-msvc': 4.12.0 + '@rollup/rollup-win32-ia32-msvc': 4.12.0 + '@rollup/rollup-win32-x64-msvc': 4.12.0 fsevents: 2.3.3 dev: true @@ -6774,6 +6566,13 @@ packages: '@xn-sakina/rml-win32-x64-msvc': 2.3.0 dev: true + /run-applescript@5.0.0: + resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} + engines: {node: '>=12'} + dependencies: + execa: 5.1.1 + dev: true + /run-applescript@7.0.0: resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==} engines: {node: '>=18'} @@ -7339,6 +7138,11 @@ packages: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} dev: false + /titleize@3.0.0: + resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==} + engines: {node: '>=12'} + dev: true + /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -7614,7 +7418,7 @@ packages: engines: {node: '>= 0.8'} dev: true - /unplugin-auto-import@0.17.5(@vueuse/core@10.7.1): + /unplugin-auto-import@0.17.5(@vueuse/core@10.9.0): resolution: {integrity: sha512-fHNDkDSxv3PGagX1wmKBYBkgaM4AKAgZmdJw/bxjhNljx9KSXSgHpGfX0MwUrq9qw6q1bhHIZVWyOwoY2koo4w==} engines: {node: '>=14'} peerDependencies: @@ -7628,7 +7432,7 @@ packages: dependencies: '@antfu/utils': 0.7.7 '@rollup/pluginutils': 5.1.0 - '@vueuse/core': 10.7.1(vue@3.4.20) + '@vueuse/core': 10.9.0(vue@3.4.21) fast-glob: 3.3.2 local-pkg: 0.5.0 magic-string: 0.30.7 @@ -7639,7 +7443,7 @@ packages: - rollup dev: true - /unplugin-vue-components@0.26.0(vue@3.4.20): + /unplugin-vue-components@0.26.0(vue@3.4.21): resolution: {integrity: sha512-s7IdPDlnOvPamjunVxw8kNgKNK8A5KM1YpK5j/p97jEKTjlPNrA0nZBiSfAKKlK1gWZuyWXlKL5dk3EDw874LQ==} engines: {node: '>=14'} peerDependencies: @@ -7662,7 +7466,7 @@ packages: minimatch: 9.0.3 resolve: 1.22.8 unplugin: 1.7.1 - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) transitivePeerDependencies: - rollup - supports-color @@ -7685,6 +7489,11 @@ packages: isobject: 3.0.1 dev: true + /untildify@4.0.0: + resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} + engines: {node: '>=8'} + dev: true + /update-browserslist-db@1.0.11(browserslist@4.21.10): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true @@ -7748,15 +7557,25 @@ packages: engines: {node: '>= 0.8'} dev: true - /vdirs@0.1.8(vue@3.4.20): + /vdirs@0.1.8(vue@3.4.21): resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: vue: ^3.0.11 dependencies: evtd: 0.2.4 - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) dev: false + /vite-bundle-analyzer@0.8.1: + resolution: {integrity: sha512-UC++agsRR6Xg7svFt+fzBarYSIKyZZUr7WQx0e0HcPkebfKoWxu5TcT5zQ9V+35hCXB1cVo5sZm/gNyuvt6KWA==} + dependencies: + fast-glob: 3.3.2 + open: 9.1.0 + picocolors: 1.0.0 + sirv: 2.0.4 + source-map: 0.7.4 + dev: true + /vite-plugin-cdn2@0.15.4: resolution: {integrity: sha512-7eTUerun6Nyvx60dzPsEXWOwzAdDs7s81p/7YHBqYNL1wfG5r2KH0qqiw9/gaOJjnI34LvnaFncULgqpcV9thw==} dependencies: @@ -7771,7 +7590,7 @@ packages: - supports-color dev: true - /vite-plugin-compression@0.5.1(vite@5.1.4): + /vite-plugin-compression@0.5.1(vite@5.1.5): resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -7779,21 +7598,21 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-ejs@1.7.0(vite@5.1.4): + /vite-plugin-ejs@1.7.0(vite@5.1.5): resolution: {integrity: sha512-JNP3zQDC4mSbfoJ3G73s5mmZITD8NGjUmLkq4swxyahy/W0xuokK9U9IJGXw7KCggq6UucT6hJ0p+tQrNtqTZw==} peerDependencies: vite: '>=5.0.0' dependencies: ejs: 3.1.9 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) dev: true - /vite-plugin-eslint@1.8.1(eslint@8.56.0)(vite@5.1.4): + /vite-plugin-eslint@1.8.1(eslint@8.56.0)(vite@5.1.5): resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==} peerDependencies: eslint: '>=7' @@ -7803,10 +7622,10 @@ packages: '@types/eslint': 8.44.2 eslint: 8.56.0 rollup: 2.79.1 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) dev: true - /vite-plugin-imp@2.4.0(vite@5.1.4): + /vite-plugin-imp@2.4.0(vite@5.1.5): resolution: {integrity: sha512-L/6/nvOw+MyNh4UxAlCZHsmKd5MitmHamqqAWB15sbUgVIEz/OQ8jpKr6kkQU0eA/AIe8fkCVbQBlP81ajrqWg==} peerDependencies: vite: '>= 2.0.0-beta.5' @@ -7818,12 +7637,12 @@ packages: chalk: 4.1.2 param-case: 3.0.4 pascal-case: 3.1.2 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-inspect@0.8.3(vite@5.1.4): + /vite-plugin-inspect@0.8.3(vite@5.1.5): resolution: {integrity: sha512-SBVzOIdP/kwe6hjkt7LSW4D0+REqqe58AumcnCfRNw4Kt3mbS9pEBkch+nupu2PBxv2tQi69EQHQ1ZA1vgB/Og==} engines: {node: '>=14'} peerDependencies: @@ -7842,13 +7661,13 @@ packages: perfect-debounce: 1.0.0 picocolors: 1.0.0 sirv: 2.0.4 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) transitivePeerDependencies: - rollup - supports-color dev: true - /vite-plugin-mock-dev-server@1.4.7(vite@5.1.4): + /vite-plugin-mock-dev-server@1.4.7(vite@5.1.5): resolution: {integrity: sha512-vGNW423fkmMibf0BfYL89n2n4tNKDt51d6Ee14gC1LlLiJAp6jabJBPsjWgU+uMgtp68+1uBb5F1qTlqdAhnoQ==} engines: {node: ^16 || ^18 || >= 20} peerDependencies: @@ -7870,7 +7689,7 @@ packages: mime-types: 2.1.35 path-to-regexp: 6.2.1 picocolors: 1.0.0 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) ws: 8.16.0 transitivePeerDependencies: - bufferutil @@ -7879,7 +7698,7 @@ packages: - utf-8-validate dev: true - /vite-plugin-svg-icons@2.0.1(vite@5.1.4): + /vite-plugin-svg-icons@2.0.1(vite@5.1.5): resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -7892,7 +7711,7 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 5.1.4(@types/node@20.4.7)(sass@1.71.1) + vite: 5.1.5(@types/node@20.4.7)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true @@ -7904,8 +7723,8 @@ packages: svgo: 3.0.2 dev: true - /vite@5.1.4(@types/node@20.4.7)(sass@1.71.1): - resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} + /vite@5.1.5(@types/node@20.4.7)(sass@1.71.1): + resolution: {integrity: sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -7933,24 +7752,24 @@ packages: optional: true dependencies: '@types/node': 20.4.7 - esbuild: 0.19.10 + esbuild: 0.19.12 postcss: 8.4.35 - rollup: 4.9.1 + rollup: 4.12.0 sass: 1.71.1 optionalDependencies: fsevents: 2.3.3 dev: true - /vooks@0.2.12(vue@3.4.20): + /vooks@0.2.12(vue@3.4.21): resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==} peerDependencies: vue: ^3.0.0 dependencies: evtd: 0.2.4 - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) dev: false - /vue-demi@0.14.6(vue@3.4.20): + /vue-demi@0.14.6(vue@3.4.21): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -7962,7 +7781,22 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) + dev: false + + /vue-demi@0.14.7(vue@3.4.21): + resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + peerDependencies: + '@vue/composition-api': ^1.0.0-rc.1 + vue: ^3.0.0-0 || ^2.6.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + dependencies: + vue: 3.4.21(typescript@5.2.2) /vue-eslint-parser@9.3.1(eslint@8.56.0): resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==} @@ -8000,7 +7834,7 @@ packages: - supports-color dev: true - /vue-hooks-plus@1.8.8(vue@3.4.20): + /vue-hooks-plus@1.8.8(vue@3.4.21): resolution: {integrity: sha512-ts7dCSjTYIBHGzgXNheKmb9ky21rlYMCoie84AAKAnJn50fh7mFMTekEw41hfT9jACu3GKu0el+mG/+jQtbs7Q==} peerDependencies: vue: ^3.2.25 @@ -8012,9 +7846,9 @@ packages: qs: 6.11.2 query-string: 7.1.3 screenfull: 5.2.0 - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) - /vue-i18n@9.9.0(vue@3.4.20): + /vue-i18n@9.9.0(vue@3.4.21): resolution: {integrity: sha512-xQ5SxszUAqK5n84N+uUyHH/PiQl9xZ24FOxyAaNonmOQgXeN+rD9z/6DStOpOxNFQn4Cgcquot05gZc+CdOujA==} engines: {node: '>= 16'} peerDependencies: @@ -8023,15 +7857,15 @@ packages: '@intlify/core-base': 9.9.0 '@intlify/shared': 9.9.0 '@vue/devtools-api': 6.5.1 - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) - /vue-router@4.2.5(vue@3.4.20): + /vue-router@4.2.5(vue@3.4.21): resolution: {integrity: sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==} peerDependencies: vue: ^3.2.0 dependencies: '@vue/devtools-api': 6.5.1 - vue: 3.4.20(typescript@5.2.2) + vue: 3.4.21(typescript@5.2.2) dev: false /vue-template-compiler@2.7.15: @@ -8053,34 +7887,34 @@ packages: typescript: 5.2.2 dev: true - /vue@3.4.20(typescript@5.2.2): - resolution: {integrity: sha512-xF4zDKXp67NjgORFX/HOuaiaKYjgxkaToK0KWglFQEYlCw9AqgBlj1yu5xa6YaRek47w2IGiuvpvrGg/XuQFCw==} + /vue@3.4.21(typescript@5.2.2): + resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.20 - '@vue/compiler-sfc': 3.4.20 - '@vue/runtime-dom': 3.4.20 - '@vue/server-renderer': 3.4.20(vue@3.4.20) - '@vue/shared': 3.4.20 + '@vue/compiler-dom': 3.4.21 + '@vue/compiler-sfc': 3.4.21 + '@vue/runtime-dom': 3.4.21 + '@vue/server-renderer': 3.4.21(vue@3.4.21) + '@vue/shared': 3.4.21 typescript: 5.2.2 - /vueuc@0.4.58(vue@3.4.20): + /vueuc@0.4.58(vue@3.4.21): resolution: {integrity: sha512-Wnj/N8WbPRSxSt+9ji1jtDHPzda5h2OH/0sFBhvdxDRuyCZbjGg3/cKMaKqEoe+dErTexG2R+i6Q8S/Toq1MYg==} peerDependencies: vue: ^3.0.11 dependencies: - '@css-render/vue3-ssr': 0.15.12(vue@3.4.20) + '@css-render/vue3-ssr': 0.15.12(vue@3.4.21) '@juggle/resize-observer': 3.4.0 css-render: 0.15.12 evtd: 0.2.4 seemly: 0.3.8 - vdirs: 0.1.8(vue@3.4.20) - vooks: 0.2.12(vue@3.4.20) - vue: 3.4.20(typescript@5.2.2) + vdirs: 0.1.8(vue@3.4.21) + vooks: 0.2.12(vue@3.4.21) + vue: 3.4.21(typescript@5.2.2) dev: false /webidl-conversions@3.0.1: diff --git a/src/__ray-template/README.md b/src/__ray-template/README.md index 9f4c4c11..c5358e18 100644 --- a/src/__ray-template/README.md +++ b/src/__ray-template/README.md @@ -4,3 +4,11 @@ - validAppRootPath: 检查模板 `appRootPath` 是否配置正确 - validLocal: 检查模板 `localConfig` 是否配置正确 + +## 拓展 + +当你需要在做一些定制化操作的时候，可以尝试在这个包里做一些事情。 + +租后在 `main.ts` 中导入并且调用即可。 + +> 出于一些考虑，并没有做自动化导入调用，所以需要自己手动来。（好吧，其实就是我懒-，-） diff --git a/src/__ray-template/valid/validAppRootPath.ts b/src/__ray-template/valid/validAppRootPath.ts index 4596efa4..6aed8baf 100644 --- a/src/__ray-template/valid/validAppRootPath.ts +++ b/src/__ray-template/valid/validAppRootPath.ts @@ -11,6 +11,10 @@ import { useVueRouter } from '@/hooks' * 该方法会通过调用 getRoutes 方法获取所有路由，也就意味着检查的路由格式是铺开之后的格式。当你的路由是嵌套路由时，需要注意检查完整的路径。 */ export const validAppRootPath = async () => { + if (!__DEV__) { + return + } + const { getAppRootRoute } = useSettingGetters() const { router: { getRoutes }, diff --git a/src/__ray-template/valid/validLocal.ts b/src/__ray-template/valid/validLocal.ts index 7c3fab9a..13d699fc 100644 --- a/src/__ray-template/valid/validLocal.ts +++ b/src/__ray-template/valid/validLocal.ts @@ -92,6 +92,10 @@ const validDefaultDayjsLocal = () => { * 验证所有的 localConfig 相关的配置。 */ export const validLocal = async () => { + if (!__DEV__) { + return + } + validSystemDefaultLocal() validSystemFallbackLocale() validDayjsLocalMap() diff --git a/src/api/demo/test.ts b/src/api/demo/test.ts index 1b611ad0..d02130e4 100644 --- a/src/api/demo/test.ts +++ b/src/api/demo/test.ts @@ -48,7 +48,7 @@ export const getWeather = (city: string) => { }) } -export const getTypicode = () => { +export const getTypicCode = () => { return request({ url: 'https://jsonplaceholder.typicode.com/todos/1', method: 'get', diff --git a/src/app-components/provider/AppNaiveGlobalProvider/index.tsx b/src/app-components/provider/AppNaiveGlobalProvider/index.tsx index 06a80fc8..219a83a8 100644 --- a/src/app-components/provider/AppNaiveGlobalProvider/index.tsx +++ b/src/app-components/provider/AppNaiveGlobalProvider/index.tsx @@ -29,7 +29,7 @@ import { NModalProvider, } from 'naive-ui' -import { naiveLocales } from '@/locales/helper' +import { getNaiveLocales } from '@/locales/utils' import { useSettingGetters } from '@/store' export default defineComponent({ @@ -41,7 +41,7 @@ export default defineComponent({ const localePackage = computed(() => { const key = getLocaleLanguage.value - return naiveLocales(key) + return getNaiveLocales(key) }) /** diff --git a/src/app-components/provider/AppRequestCancelerProvider/index.tsx b/src/app-components/provider/AppRequestCancelerProvider/index.tsx index 7117e50f..ad8838f4 100644 --- a/src/app-components/provider/AppRequestCancelerProvider/index.tsx +++ b/src/app-components/provider/AppRequestCancelerProvider/index.tsx @@ -17,7 +17,7 @@ * beforeRouteUpdate -> cancelAllRequest -> routeUpdate */ -import { axiosCanceler } from '@/axios/helper/interceptor' +import { axiosCanceler } from '@/axios/utils/interceptor' const AppRequestCancelerProvider = defineComponent({ name: 'AppRequestCancelerProvider', diff --git a/src/axios/README.md b/src/axios/README.md index 9b5c590c..c7ee7fd1 100644 --- a/src/axios/README.md +++ b/src/axios/README.md @@ -5,7 +5,7 @@ ## 工具函数 -- BeforeFetchFunction +- FetchFunction - FetchErrorFunction > 两个工具函数方便类型推导。 @@ -28,13 +28,14 @@ import { appendRequestHeaders } from '@/axios/helper/axiosCopilot' import type { RequestInterceptorConfig, - BeforeFetchFunction, + FetchFunction, FetchErrorFunction, -} from '@/axios/type' +} from '@/axios/types' -const injectRequestHeaderOfEnv: BeforeFetchFunction< - RequestInterceptorConfig -> = (ins, mode) => { +const injectRequestHeaderOfEnv: FetchFunction = ( + ins, + mode, +) => { if (mode === 'development') { appendRequestHeaders(ins, [ { diff --git a/src/axios/index.ts b/src/axios/index.ts index 80ab8cbb..27d3d303 100644 --- a/src/axios/index.ts +++ b/src/axios/index.ts @@ -25,7 +25,7 @@ import useHookPlusRequest from 'vue-hooks-plus/es/useRequest' import request from '@/axios/instance' import type { UseRequestOptions } from 'vue-hooks-plus/es/useRequest/types' -import type { AppRawRequestConfig } from '@/axios/type' +import type { AppRawRequestConfig } from '@/axios/types' /** * @@ -48,11 +48,11 @@ function useRequest< HookPlusParams extends unknown[] = unknown[], HookPlusPlugin = unknown, >( - fetchOption: AppRawRequestConfig, + fetchOptions: AppRawRequestConfig, option?: UseRequestOptions, ) { const fc = () => { - const cb = request(fetchOption) + const cb = request(fetchOptions) return cb } diff --git a/src/axios/inject/request/index.ts b/src/axios/inject/request/index.ts index 150314e9..123ccdbb 100644 --- a/src/axios/inject/request/index.ts +++ b/src/axios/inject/request/index.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { useAxiosInterceptor } from '@/axios/helper/interceptor' +import { useAxiosInterceptor } from '@/axios/utils/interceptor' import implement from './provider' const { setImplement } = useAxiosInterceptor() diff --git a/src/axios/inject/request/provider.ts b/src/axios/inject/request/provider.ts index 1462795b..958d59e7 100644 --- a/src/axios/inject/request/provider.ts +++ b/src/axios/inject/request/provider.ts @@ -20,16 +20,16 @@ * 其中 injectRequestCanceler requestErrorCanceler 方法为 axios request interceptor 方法 */ -import { axiosCanceler } from '@/axios/helper/interceptor' -import { appendRequestHeaders } from '@/axios/helper/axiosCopilot' +import { axiosCanceler } from '@/axios/utils/interceptor' +import { appendRequestHeaders } from '@/axios/utils/axiosCopilot' import { APP_CATCH_KEY } from '@/app-config' import { getStorage } from '@/utils' import type { RequestInterceptorConfig, - BeforeFetchFunction, + FetchFunction, FetchErrorFunction, -} from '@/axios/type' +} from '@/axios/types' import type { Recordable } from '@/types' /** @@ -54,10 +54,7 @@ const requestHeaderToken = (ins: RequestInterceptorConfig, mode: string) => { } /** 注入请求头信息 */ -const injectRequestHeaders: BeforeFetchFunction = ( - ins, - mode, -) => { +const injectRequestHeaders: FetchFunction = (ins, mode) => { appendRequestHeaders(ins, [ requestHeaderToken(ins, mode), { @@ -72,12 +69,10 @@ const injectRequestHeaders: BeforeFetchFunction = ( * @param ins 当前请求实例 * @param mode 当前环境 * - * 移除请求拦截器与注入请求拦截器 + * @description + * 移除请求拦截器与注入请求拦截器。 */ -const injectRequestCanceler: BeforeFetchFunction = ( - ins, - mode, -) => { +const injectRequestCanceler: FetchFunction = (ins, mode) => { axiosCanceler.removePendingRequest(ins) // 检查是否存在重复请求, 若存在则取消已发的请求 axiosCanceler.addPendingRequest(ins) // 把当前的请求信息添加到 pendingRequest 表中 } @@ -87,10 +82,11 @@ const injectRequestCanceler: BeforeFetchFunction = ( * @param error 请求错误信息 * @param mode 当前环境 * - * 请求错误时候，移除请求拦截器 + * @description + * 请求错误时候，移除请求拦截器。 */ -const requestErrorCanceler: FetchErrorFunction = (error, mode) => { - axiosCanceler.removePendingRequest(error) +const requestErrorCanceler: FetchErrorFunction = (error, mode) => { + axiosCanceler.removePendingRequest(error) // 移除请求拦截器 } /** diff --git a/src/axios/inject/response/index.ts b/src/axios/inject/response/index.ts index ef268787..c06a1556 100644 --- a/src/axios/inject/response/index.ts +++ b/src/axios/inject/response/index.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { useAxiosInterceptor } from '@/axios/helper/interceptor' +import { useAxiosInterceptor } from '@/axios/utils/interceptor' import implement from './provider' const { setImplement } = useAxiosInterceptor() diff --git a/src/axios/inject/response/provider.ts b/src/axios/inject/response/provider.ts index 137fb587..9b4ba7a7 100644 --- a/src/axios/inject/response/provider.ts +++ b/src/axios/inject/response/provider.ts @@ -20,13 +20,13 @@ * 其中 injectResponseCanceler responseErrorCanceler 方法是注入的 axios response interceptor 方法 */ -import { axiosCanceler } from '@/axios/helper/interceptor' +import { axiosCanceler } from '@/axios/utils/interceptor' import type { ResponseInterceptorConfig, - BeforeFetchFunction, + FetchFunction, FetchErrorFunction, -} from '@/axios/type' +} from '@/axios/types' import type { Recordable } from '@/types' /** @@ -34,13 +34,11 @@ import type { Recordable } from '@/types' * @param ins 当前响应实例 * @param mode 当前环境 * - * 响应成功后注销请求取消器 + * @description + * 响应成功后注销请求取消器。 */ -const injectResponseCanceler: BeforeFetchFunction = ( - ins, - mode, -) => { - axiosCanceler.removePendingRequest(ins.config) +const injectResponseCanceler: FetchFunction = (ins, mode) => { + axiosCanceler.removePendingRequest(ins) } /** @@ -48,10 +46,11 @@ const injectResponseCanceler: BeforeFetchFunction = ( * @param error 错误信息 * @param mode 当前环境 * - * 注销失败请求取消器 + * @description + * 注销失败请求取消器。 */ -const responseErrorCanceler: FetchErrorFunction = (error, mode) => { - axiosCanceler.removePendingRequest(error.config) +const responseErrorCanceler: FetchErrorFunction = (error, mode) => { + axiosCanceler.removePendingRequest(error) } /** diff --git a/src/axios/instance.ts b/src/axios/instance.ts index 0f76e5bb..edcad528 100644 --- a/src/axios/instance.ts +++ b/src/axios/instance.ts @@ -18,7 +18,7 @@ import axios from 'axios' import { AXIOS_CONFIG } from '@/app-config' -import { useAxiosInterceptor } from '@/axios/helper/interceptor' +import { useAxiosInterceptor } from '@/axios/utils/interceptor' import { setupResponseInterceptor, setupResponseErrorInterceptor, @@ -28,7 +28,7 @@ import { setupRequestErrorInterceptor, } from '@/axios/inject/request' -import type { AxiosInstanceExpand } from './type' +import type { AxiosInstanceExpand } from './types' const server: AxiosInstanceExpand = axios.create(AXIOS_CONFIG) const { createAxiosInstance, beforeFetch, fetchError } = useAxiosInterceptor() diff --git a/src/axios/type.ts b/src/axios/types.ts similarity index 85% rename from src/axios/type.ts rename to src/axios/types.ts index ea5581ac..12c83961 100644 --- a/src/axios/type.ts +++ b/src/axios/types.ts @@ -6,6 +6,7 @@ import type { AxiosDefaults, Axios, AxiosResponse, + AxiosError, } from 'axios' import type { AnyFC } from '@/types' @@ -28,8 +29,13 @@ export interface CancelConfig { export interface AppRawRequestConfig extends AxiosRequestConfig { cancelConfig?: CancelConfig + __CANCELER_TAG_RAY_TEMPLATE__?: '__CANCELER_TAG_RAY_TEMPLATE__' } +export interface CancelerParams + extends AppRawRequestConfig, + AxiosError {} + export interface AxiosInstanceExpand extends Axios { (config: AppRawRequestConfig): Promise (url: string, config?: AppRawRequestConfig): Promise @@ -104,14 +110,15 @@ export interface ErrorImplementQueue { implementResponseInterceptorErrorArray: AnyFC[] } -export type BeforeFetchFunction< - T = RequestInterceptorConfig | ResponseInterceptorConfig, -> = (ins: K, mode: string) => void +export type FetchFunction = ( + ins: RequestInterceptorConfig & ResponseInterceptorConfig, + mode: string, +) => void export type FetchType = 'ok' | 'error' -export type FetchErrorFunction = ( - error: K, +export type FetchErrorFunction = ( + error: AxiosError, mode: string, ) => void @@ -120,7 +127,7 @@ export interface AxiosFetchInstance { responseInstance: ResponseInterceptorConfig | null } -export interface AxiosFetchError { +export interface AxiosFetchError { requestError: T | null responseError: T | null } diff --git a/src/axios/helper/RequestCanceler.ts b/src/axios/utils/RequestCanceler.ts similarity index 81% rename from src/axios/helper/RequestCanceler.ts rename to src/axios/utils/RequestCanceler.ts index 824e9bfa..22371a31 100644 --- a/src/axios/helper/RequestCanceler.ts +++ b/src/axios/utils/RequestCanceler.ts @@ -16,7 +16,7 @@ * 可以根据自己项目进行定制化配置 */ -import type { AppRawRequestConfig } from '@/axios/type' +import type { AppRawRequestConfig, CancelerParams } from '@/axios/types' export default class RequestCanceler { private pendingRequest: Map @@ -26,7 +26,7 @@ export default class RequestCanceler { } /** 是否需要加入取消请求表中 */ - private isAppending(config: AppRawRequestConfig) { + private isAppending(config: AppRawRequestConfig | CancelerParams) { return config.cancelConfig?.cancel ?? true } @@ -37,7 +37,7 @@ export default class RequestCanceler { * * @remark 将当前请求 config 生成 request key */ - private generateRequestKey(config: AppRawRequestConfig) { + private generateRequestKey(config: AppRawRequestConfig | CancelerParams) { const { method, url } = config return [ @@ -54,8 +54,10 @@ export default class RequestCanceler { * * @remark 给请求体添加 signal 属性, 用于取消请求 */ - addPendingRequest(config: AppRawRequestConfig) { + addPendingRequest(config: AppRawRequestConfig | CancelerParams) { if (this.isAppending(config)) { + config.__CANCELER_TAG_RAY_TEMPLATE__ = '__CANCELER_TAG_RAY_TEMPLATE__' + const requestKey = this.generateRequestKey(config) if (!this.pendingRequest.has(requestKey)) { @@ -77,7 +79,7 @@ export default class RequestCanceler { * * @remark 取消该请求, 并且清除 map 中对应 generateRequestKey value */ - removePendingRequest(config: AppRawRequestConfig) { + removePendingRequest(config: AppRawRequestConfig | CancelerParams) { const requestKey = this.generateRequestKey(config) if (this.pendingRequest.has(requestKey)) { diff --git a/src/axios/helper/axiosCopilot.ts b/src/axios/utils/axiosCopilot.ts similarity index 93% rename from src/axios/helper/axiosCopilot.ts rename to src/axios/utils/axiosCopilot.ts index 60150dc5..259e3798 100644 --- a/src/axios/helper/axiosCopilot.ts +++ b/src/axios/utils/axiosCopilot.ts @@ -12,7 +12,7 @@ /** axios 拦截器工具 */ import type { RawAxiosRequestHeaders, AxiosRequestConfig } from 'axios' -import type { RequestHeaderOptions } from '../type' +import type { RequestHeaderOptions } from '../types' /** * diff --git a/src/axios/helper/interceptor.ts b/src/axios/utils/interceptor.ts similarity index 91% rename from src/axios/helper/interceptor.ts rename to src/axios/utils/interceptor.ts index 9f0588b2..f8040f2c 100644 --- a/src/axios/helper/interceptor.ts +++ b/src/axios/utils/interceptor.ts @@ -20,7 +20,7 @@ * 所以在使用的时候, 需要按照约定格式进行参数传递 */ -import RequestCanceler from '@/axios/helper/RequestCanceler' +import RequestCanceler from '@/axios/utils/RequestCanceler' import { getAppEnvironment } from '@/utils' import type { @@ -31,8 +31,9 @@ import type { FetchType, AxiosFetchInstance, AxiosFetchError, -} from '@/axios/type' +} from '@/axios/types' import type { AnyFC } from '@/types' +import type { AxiosError } from 'axios' /** 当前请求的实例 */ const axiosFetchInstance: AxiosFetchInstance = { @@ -40,7 +41,7 @@ const axiosFetchInstance: AxiosFetchInstance = { responseInstance: null, } /** 请求失败返回值 */ -const axiosFetchError: AxiosFetchError = { +const axiosFetchError: AxiosFetchError> = { requestError: null, responseError: null, } @@ -94,7 +95,7 @@ export const useAxiosInterceptor = () => { /** 队列执行器 */ const implementer = (funcs: AnyFC[], ...args: any[]) => { if (Array.isArray(funcs)) { - funcs?.forEach((curr) => { + funcs.forEach((curr) => { if (typeof curr === 'function') { curr(...args) } @@ -123,7 +124,7 @@ export const useAxiosInterceptor = () => { /** 请求、响应错误时执行队列中所有方法 */ const fetchError = ( key: keyof AxiosFetchError, - error: unknown, + error: AxiosError, errorImplementKey: keyof ErrorImplementQueue, ) => { axiosFetchError[key] = error @@ -143,3 +144,5 @@ export const useAxiosInterceptor = () => { fetchError, } } + +export type UseAxiosInterceptor = ReturnType diff --git a/src/components/RChart/index.ts b/src/components/RChart/index.ts index 39355684..76e91d32 100644 --- a/src/components/RChart/index.ts +++ b/src/components/RChart/index.ts @@ -3,7 +3,7 @@ import chartProps from './src/props' import type { ExtractPublicPropTypes } from 'vue' -import type * as RChartType from './src/type' +import type * as RChartType from './src/types' export type ChartProps = ExtractPublicPropTypes export type { RChartType } diff --git a/src/components/RChart/src/index.tsx b/src/components/RChart/src/index.tsx index 4ed47e6d..94f7a1f4 100644 --- a/src/components/RChart/src/index.tsx +++ b/src/components/RChart/src/index.tsx @@ -26,7 +26,7 @@ import { NCard } from 'naive-ui' import props from './props' import { throttle } from 'lodash-es' import { completeSize, downloadBase64File, call, renderNode } from '@/utils' -import { setupChartTheme } from './helper' +import { setupChartTheme } from './utils' import { APP_THEME } from '@/app-config' import { useResizeObserver } from '@vueuse/core' import { RMoreDropdown } from '@/components' diff --git a/src/components/RChart/src/props.ts b/src/components/RChart/src/props.ts index 0fdc0de9..2a8a95dd 100644 --- a/src/components/RChart/src/props.ts +++ b/src/components/RChart/src/props.ts @@ -1,21 +1,19 @@ import type * as echarts from 'echarts/core' // `echarts` 核心模块 import type { PropType, VNode } from 'vue' import type { MaybeArray } from '@/types' +import type { ECharts, SetOptionOpts } from 'echarts/core' +import type { MaybeComputedElementRef, MaybeElement } from '@vueuse/core' import type { LoadingOptions, AutoResize, ChartTheme, -} from '@/components/RChart/src/type' -import type { ECharts, SetOptionOpts } from 'echarts/core' -import type { MaybeComputedElementRef, MaybeElement } from '@vueuse/core' -import type { EChartsExtensionInstallRegisters, RChartPresetType, RChartDownloadOptions, -} from './type' +} from './types' import type { CardProps, DropdownProps, DropdownOption } from 'naive-ui' -import { loadingOptions } from './helper' +import { loadingOptions } from './utils' const props = { bordered: { diff --git a/src/components/RChart/src/type.ts b/src/components/RChart/src/types.ts similarity index 100% rename from src/components/RChart/src/type.ts rename to src/components/RChart/src/types.ts diff --git a/src/components/RChart/src/helper.ts b/src/components/RChart/src/utils.ts similarity index 97% rename from src/components/RChart/src/helper.ts rename to src/components/RChart/src/utils.ts index 388b6def..d95ac4ea 100644 --- a/src/components/RChart/src/helper.ts +++ b/src/components/RChart/src/utils.ts @@ -13,7 +13,7 @@ import type { ChartThemeRawArray, ChartThemeRawModules, LoadingOptions, -} from '@/components/RChart/src/type' +} from '@/components/RChart/src/types' /** * diff --git a/src/components/RCollapseGrid/index.ts b/src/components/RCollapseGrid/index.ts index 13401c4a..27ea9bee 100644 --- a/src/components/RCollapseGrid/index.ts +++ b/src/components/RCollapseGrid/index.ts @@ -1,7 +1,7 @@ import RCollapseGrid from './src' import collapseGridProps from './src/props' -import type * as RCollapseGridType from './src/type' +import type * as RCollapseGridType from './src/types' import type { ExtractPublicPropTypes } from 'vue' export type CollapseGridProps = ExtractPublicPropTypes diff --git a/src/components/RCollapseGrid/src/props.ts b/src/components/RCollapseGrid/src/props.ts index aa3202ef..776d66c3 100644 --- a/src/components/RCollapseGrid/src/props.ts +++ b/src/components/RCollapseGrid/src/props.ts @@ -1,7 +1,7 @@ import { gridProps } from 'naive-ui' import type { PropType } from 'vue' -import type { CollapseToggleText } from './type' +import type { CollapseToggleText } from './types' import type { AnyFC, MaybeArray } from '@/types' const props = { diff --git a/src/components/RCollapseGrid/src/type.ts b/src/components/RCollapseGrid/src/types.ts similarity index 100% rename from src/components/RCollapseGrid/src/type.ts rename to src/components/RCollapseGrid/src/types.ts diff --git a/src/components/RIframe/index.ts b/src/components/RIframe/index.ts index e9c3a05f..cc5dc8b4 100644 --- a/src/components/RIframe/index.ts +++ b/src/components/RIframe/index.ts @@ -1,7 +1,7 @@ import RIframe from './src' import iframeProps from './src/props' -import type * as RIframeType from './src/type' +import type * as RIframeType from './src/types' import type { ExtractPublicPropTypes } from 'vue' export type IframeProps = ExtractPublicPropTypes diff --git a/src/components/RIframe/src/type.ts b/src/components/RIframe/src/types.ts similarity index 100% rename from src/components/RIframe/src/type.ts rename to src/components/RIframe/src/types.ts diff --git a/src/components/RQRCode/index.ts b/src/components/RQRCode/index.ts index 8d24f6ae..cf45bdca 100644 --- a/src/components/RQRCode/index.ts +++ b/src/components/RQRCode/index.ts @@ -1,7 +1,7 @@ import RQRCode from './src' import qrcodeProps from './src/props' -import type * as RQRCodeType from './src/type' +import type * as RQRCodeType from './src/types' import type { ExtractPublicPropTypes } from 'vue' export type QRCodeProps = ExtractPublicPropTypes diff --git a/src/components/RQRCode/src/index.tsx b/src/components/RQRCode/src/index.tsx index 2adfd018..e1a06ec1 100644 --- a/src/components/RQRCode/src/index.tsx +++ b/src/components/RQRCode/src/index.tsx @@ -22,7 +22,7 @@ import type { QRCodeRenderResponse, GIFBuffer, DownloadFilenameType, -} from './type' +} from './types' import type { WatchStopHandle } from 'vue' const readGIFAsArrayBuffer = (url: string): Promise => { diff --git a/src/components/RQRCode/src/props.ts b/src/components/RQRCode/src/props.ts index b07e3a21..06a285f8 100644 --- a/src/components/RQRCode/src/props.ts +++ b/src/components/RQRCode/src/props.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import type { QRCodeStatus, QRCodeLevel } from './type' +import type { QRCodeStatus, QRCodeLevel } from './types' import type { PropType, VNode } from 'vue' import type { MaybeArray } from '@/types' import type { Options } from 'awesome-qr' diff --git a/src/components/RQRCode/src/type.ts b/src/components/RQRCode/src/types.ts similarity index 100% rename from src/components/RQRCode/src/type.ts rename to src/components/RQRCode/src/types.ts diff --git a/src/components/RTable/index.ts b/src/components/RTable/index.ts index f2dc085a..bc875a17 100644 --- a/src/components/RTable/index.ts +++ b/src/components/RTable/index.ts @@ -1,7 +1,7 @@ import RTable from './src/Table' import tableProps from './src/props' -import type * as RTableType from './src/type' +import type * as RTableType from './src/types' import type { ExtractPublicPropTypes } from 'vue' export type TableProps = ExtractPublicPropTypes diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx index 258468e3..0244470b 100644 --- a/src/components/RTable/src/Table.tsx +++ b/src/components/RTable/src/Table.tsx @@ -24,7 +24,7 @@ import { config } from './shared' import type { DropdownOption, DataTableInst } from 'naive-ui' import type { ComponentSize } from '@/types' -import type { C as CType, PropsComponentPopselectKeys } from './type' +import type { C as CType, PropsComponentPopselectKeys } from './types' export default defineComponent({ name: 'RTable', diff --git a/src/components/RTable/src/components/C.tsx b/src/components/RTable/src/components/C.tsx index 27ea141c..8f680fe8 100644 --- a/src/components/RTable/src/components/C.tsx +++ b/src/components/RTable/src/components/C.tsx @@ -26,7 +26,7 @@ import props from '../props' import { call } from '@/utils' import type { TreeOption, TreeDropInfo } from 'naive-ui' -import type { C } from '../type' +import type { C } from '../types' import type { AnyFC } from '@/types' import type { MaybeArray } from '@/types' diff --git a/src/components/RTable/src/components/Fullscreen.tsx b/src/components/RTable/src/components/Fullscreen.tsx index 8ebefe23..a5bc313d 100644 --- a/src/components/RTable/src/components/Fullscreen.tsx +++ b/src/components/RTable/src/components/Fullscreen.tsx @@ -14,7 +14,7 @@ import { RIcon } from '@/components' import { config } from '../shared' import { useFullscreen } from 'vue-hooks-plus' -import type { TableProvider } from '../type' +import type { TableProvider } from '../types' export default defineComponent({ name: 'TableFullscreen', diff --git a/src/components/RTable/src/components/Print.tsx b/src/components/RTable/src/components/Print.tsx index b21a9487..b6c5e777 100644 --- a/src/components/RTable/src/components/Print.tsx +++ b/src/components/RTable/src/components/Print.tsx @@ -15,7 +15,7 @@ import { config } from '../shared' import props from '../props' import { printDom } from '@/utils/dom' -import type { TableProvider } from '../type' +import type { TableProvider } from '../types' export default defineComponent({ name: 'TablePrint', diff --git a/src/components/RTable/src/components/Props.tsx b/src/components/RTable/src/components/Props.tsx index 9ba0b698..0dbeba38 100644 --- a/src/components/RTable/src/components/Props.tsx +++ b/src/components/RTable/src/components/Props.tsx @@ -17,7 +17,7 @@ import { config } from '../shared' import props from '../props' import type { MaybeArray } from '@/types' -import type { PropsComponentPopselectKeys } from '../type' +import type { PropsComponentPopselectKeys } from '../types' export default defineComponent({ name: 'TablePropsSelect', diff --git a/src/components/RTable/src/props.ts b/src/components/RTable/src/props.ts index 1b3128ee..1914b95b 100644 --- a/src/components/RTable/src/props.ts +++ b/src/components/RTable/src/props.ts @@ -14,7 +14,7 @@ import { dataTableProps } from 'naive-ui' import type { PropType, VNode } from 'vue' import type { MaybeArray } from '@/types' import type { DropdownOption, DataTableColumn } from 'naive-ui' -import type { DownloadCsvTableOptions, PrintTableOptions } from './type' +import type { DownloadCsvTableOptions, PrintTableOptions } from './types' import type { Recordable } from '@/types' const props = { diff --git a/src/components/RTable/src/type.ts b/src/components/RTable/src/types.ts similarity index 100% rename from src/components/RTable/src/type.ts rename to src/components/RTable/src/types.ts diff --git a/src/components/RTransitionComponent/index.ts b/src/components/RTransitionComponent/index.ts index cbcdcffa..211ccb47 100644 --- a/src/components/RTransitionComponent/index.ts +++ b/src/components/RTransitionComponent/index.ts @@ -1,7 +1,7 @@ import RTransitionComponent from './src/index.vue' import transitionComponentProps from './src/props' -import type * as RTransitionComponentType from './src/type' +import type * as RTransitionComponentType from './src/types' import type { ExtractPublicPropTypes } from 'vue' export type TransitionComponentProps = ExtractPublicPropTypes< diff --git a/src/components/RTransitionComponent/src/index.vue b/src/components/RTransitionComponent/src/index.vue index 6fcb71ce..f8c887ad 100644 --- a/src/components/RTransitionComponent/src/index.vue +++ b/src/components/RTransitionComponent/src/index.vue @@ -27,7 +27,7 @@ import { useKeepAliveGetters } from '@/store' import { APP_KEEP_ALIVE } from '@/app-config' import props from './props' -import type { TransitionProps } from './type' +import type { TransitionProps } from './types' /** * @@ -42,3 +42,4 @@ withDefaults(defineProps(), props) const { getKeepAliveInclude } = useKeepAliveGetters() const { setupKeepAlive, maxKeepAliveLength, keepAliveExclude } = APP_KEEP_ALIVE +./types diff --git a/src/components/RTransitionComponent/src/props.ts b/src/components/RTransitionComponent/src/props.ts index c105258a..012a4ff1 100644 --- a/src/components/RTransitionComponent/src/props.ts +++ b/src/components/RTransitionComponent/src/props.ts @@ -1,4 +1,4 @@ -import type { TransitionProps } from './type' +import type { TransitionProps } from './types' const props: TransitionProps = { transitionPropName: 'fade', diff --git a/src/components/RTransitionComponent/src/type.ts b/src/components/RTransitionComponent/src/types.ts similarity index 100% rename from src/components/RTransitionComponent/src/type.ts rename to src/components/RTransitionComponent/src/types.ts diff --git a/src/components/index.ts b/src/components/index.ts index 1ae43e8e..b94376ad 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -10,9 +10,9 @@ export * from './RTable' export * from './RTransitionComponent' // 导出自定义组件类型 -export type * from './RChart/src/type' -export type * from './RCollapseGrid/src/type' -export type * from './RIframe/src/type' -export type * from './RQRCode/src/type' -export type * from './RTable/src/type' -export type * from './RTransitionComponent/src/type' +export type * from './RChart/src/types' +export type * from './RCollapseGrid/src/types' +export type * from './RIframe/src/types' +export type * from './RQRCode/src/types' +export type * from './RTable/src/types' +export type * from './RTransitionComponent/src/types' diff --git a/src/directives/index.ts b/src/directives/index.ts index 0d7580d4..ab5b59ea 100644 --- a/src/directives/index.ts +++ b/src/directives/index.ts @@ -9,11 +9,11 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { combineDirective } from './helper/combine' +import { combineDirective } from './utils/combine' import { forIn } from 'lodash-es' import type { App } from 'vue' -import type { DirectiveModules } from '@/directives/type' +import type { DirectiveModules } from '@/directives/types' /** * diff --git a/src/directives/modules/copy/index.ts b/src/directives/modules/copy/index.ts index 2c95b21f..16a065bd 100644 --- a/src/directives/modules/copy/index.ts +++ b/src/directives/modules/copy/index.ts @@ -12,12 +12,22 @@ /** * * directive name: copy + * + * 该指令用于处理复制，使用的时候必须传递正确的 value 值。 + * + * 指令基于 clipboard.js 实现。 + * + * 使用方式： + * @example + * */ import ClipboardJS from 'clipboard' -import type { CopyElement } from './type' -import type { CustomDirectiveFC } from '@/directives/type' +import type { CopyElement } from './types' +import type { CustomDirectiveFC } from '@/directives/types' const createClipboard = (el: CopyElement, value: string) => { const clipboard = new ClipboardJS(el, { diff --git a/src/directives/modules/copy/type.ts b/src/directives/modules/copy/types.ts similarity index 100% rename from src/directives/modules/copy/type.ts rename to src/directives/modules/copy/types.ts diff --git a/src/directives/modules/debounce/index.ts b/src/directives/modules/debounce/index.ts index 537dbf10..01347cd4 100644 --- a/src/directives/modules/debounce/index.ts +++ b/src/directives/modules/debounce/index.ts @@ -12,15 +12,28 @@ /** * * directive name: debounce + * + * 该指令用于处理防抖，使用的时候必须传递正确的 func 值。 + * + * 其中 trigger 和 wait 是可选的，trigger 默认为 click，wait 默认为 500。 + * + * 使用方式： + * @example + * + * */ import { debounce } from 'lodash-es' import { useEventListener } from '@vueuse/core' -import type { DebounceBindingOptions } from './type' +import type { DebounceBindingOptions } from './types' import type { AnyFC } from '@/types' import type { DebouncedFunc } from 'lodash-es' -import type { CustomDirectiveFC } from '@/directives/type' +import type { CustomDirectiveFC } from '@/directives/types' const debounceDirective: CustomDirectiveFC< HTMLElement, diff --git a/src/directives/modules/debounce/type.ts b/src/directives/modules/debounce/types.ts similarity index 100% rename from src/directives/modules/debounce/type.ts rename to src/directives/modules/debounce/types.ts diff --git a/src/directives/modules/disabled/index.ts b/src/directives/modules/disabled/index.ts index ed29de51..2805248b 100644 --- a/src/directives/modules/disabled/index.ts +++ b/src/directives/modules/disabled/index.ts @@ -12,11 +12,22 @@ /** * * directive name: disabled + * + * 该指令用于处理元素的禁用状态，使用的时候必须传递正确的 value 值。 + * + * 该方法依赖 ray-template__directive--disabled 样式类，需要在全局样式中定义， + * 并且该指令仅仅是做了 css 样式层面的禁用效果，如果有需要，还需要在业务逻辑中做相应的处理。 + * + * 使用方式： + * @example + * */ import { setClass, removeClass } from '@/utils' -import type { CustomDirectiveFC } from '@/directives/type' +import type { CustomDirectiveFC } from '@/directives/types' const updateElementDisabledType = (el: HTMLElement, value: boolean) => { if (el) { diff --git a/src/directives/modules/ellipsis/index.ts b/src/directives/modules/ellipsis/index.ts new file mode 100644 index 00000000..3c624f69 --- /dev/null +++ b/src/directives/modules/ellipsis/index.ts @@ -0,0 +1,80 @@ +/** + * + * directive name: ellipsis + * + * 该指令用于处理文本溢出省略，使用的时候必须传递正确的 width 值。 + * + * 其中 line 和 type 是可选的，line 默认为 1，type 默认为 block。 + * + * 使用方式： + * @example + * + * + */ + +import { setStyle, completeSize } from '@/utils' + +import type { CustomDirectiveFC } from '@/directives/types' +import type { EllipsisBindingValue } from './types' + +/** + * + * @param el 待绑定的元素 + * @param options 配置项 + * + * @description + * 绑定省略样式。 + * + * @example + * bindEllipsis(el, { line: 2, width: 200 }) + */ +const bindEllipsis = (el: HTMLElement, options: EllipsisBindingValue) => { + const { line = 1, type = 'block', width, popoverText } = options + + if (width === void 0 || width === null) { + console.error(`[v-ellipsis]: Expected width, but got ${width}!`) + + return + } + + if (popoverText) { + el.setAttribute('title', el.textContent || '') + } + + if (type === 'line') { + setStyle(el, { + display: '-webkit-box', + '-webkit-box-orient': 'vertical', + '-webkit-line-clamp': line, + overflow: 'hidden', + width: completeSize(width), + }) + } else { + setStyle(el, { + overflow: 'hidden', + textOverflow: 'ellipsis', + whiteSpace: 'nowrap', + width: completeSize(width), + }) + } +} + +const ellipsisDirective: CustomDirectiveFC< + HTMLElement, + EllipsisBindingValue +> = () => { + return { + mounted: (el, { value }) => { + bindEllipsis(el, value) + }, + updated: (el, { value }) => { + bindEllipsis(el, value) + }, + } +} + +export default ellipsisDirective diff --git a/src/directives/modules/ellipsis/types.ts b/src/directives/modules/ellipsis/types.ts new file mode 100644 index 00000000..479221cb --- /dev/null +++ b/src/directives/modules/ellipsis/types.ts @@ -0,0 +1,26 @@ +export interface EllipsisBindingValue { + /** + * @description + * 省略行数。 + */ + line: number + /** + * @description + * 省略方式。 + * + * line: 多行省略 + * block: 单行省略 + */ + type: 'line' | 'block' + /** + * @description + * 宽度。 + */ + width: string | number + /** + * + * @description + * 是否需要注入 title 属性。 + */ + popoverText?: boolean +} diff --git a/src/directives/modules/throttle/index.ts b/src/directives/modules/throttle/index.ts index d10599ca..39cd546b 100644 --- a/src/directives/modules/throttle/index.ts +++ b/src/directives/modules/throttle/index.ts @@ -12,15 +12,28 @@ /** * * directive name: throttle + * + * 该指令用于处理节流，使用的时候必须传递正确的 func 值。 + * + * 其中 trigger 和 wait 是可选的，trigger 默认为 click，wait 默认为 500。 + * + * 使用方式： + * @example + * + * */ import { throttle } from 'lodash-es' import { useEventListener } from '@vueuse/core' -import type { ThrottleBindingOptions } from './type' +import type { ThrottleBindingOptions } from './types' import type { AnyFC } from '@/types' import type { DebouncedFunc } from 'lodash-es' -import type { CustomDirectiveFC } from '@/directives/type' +import type { CustomDirectiveFC } from '@/directives/types' const throttleDirective: CustomDirectiveFC< HTMLElement, diff --git a/src/directives/modules/throttle/type.ts b/src/directives/modules/throttle/types.ts similarity index 100% rename from src/directives/modules/throttle/type.ts rename to src/directives/modules/throttle/types.ts diff --git a/src/directives/type.ts b/src/directives/types.ts similarity index 96% rename from src/directives/type.ts rename to src/directives/types.ts index acaa6d07..97115d88 100644 --- a/src/directives/type.ts +++ b/src/directives/types.ts @@ -1,8 +1,8 @@ import type { Directive } from 'vue' import type { App } from 'vue' -export type { DebounceBindingOptions } from './modules/debounce/type' -export type { ThrottleBindingOptions } from './modules/throttle/type' +export type { DebounceBindingOptions } from './modules/debounce/types' +export type { ThrottleBindingOptions } from './modules/throttle/types' export type CustomDirectiveFC = () => Directive diff --git a/src/directives/helper/combine.ts b/src/directives/utils/combine.ts similarity index 98% rename from src/directives/helper/combine.ts rename to src/directives/utils/combine.ts index 7b8160a5..07bb3fb2 100644 --- a/src/directives/helper/combine.ts +++ b/src/directives/utils/combine.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import type { DirectiveModules, CustomDirectiveFC } from '@/directives/type' +import type { DirectiveModules, CustomDirectiveFC } from '@/directives/types' export const combineDirective = < T extends Record, diff --git a/src/error/PageResult/index.tsx b/src/error/PageResult/index.tsx index fc328180..66b9df3f 100644 --- a/src/error/PageResult/index.tsx +++ b/src/error/PageResult/index.tsx @@ -21,7 +21,7 @@ import './index.scss' import { NResult, NButton } from 'naive-ui' -import { redirectRouterToDashboard } from '@/router/helper/routerCopilot' +import { redirectRouterToDashboard } from '@/router/utils/routerCopilot' import { resultProps } from 'naive-ui' const PageResult = defineComponent({ diff --git a/src/hooks/template/useBadge.ts b/src/hooks/template/useBadge.ts index a17aa7bf..d59f29dd 100644 --- a/src/hooks/template/useBadge.ts +++ b/src/hooks/template/useBadge.ts @@ -1,9 +1,9 @@ import { useMenuGetters, depthSearchAppMenu } from '@/store' import { isValueType } from '@/utils' -import { createMenuExtra } from '@/store/modules/menu/helper' +import { createMenuExtra } from '@/store/modules/menu/utils' import type { AppMenuOption } from '@/types' -import type { AppMenuExtraOptions } from '@/router/type' +import type { AppMenuExtraOptions } from '@/router/types' export type BadgeKey = string | AppMenuOption diff --git a/src/hooks/web/useDevice.ts b/src/hooks/web/useDevice.ts index 0406d732..69030dbb 100644 --- a/src/hooks/web/useDevice.ts +++ b/src/hooks/web/useDevice.ts @@ -23,6 +23,9 @@ export interface UseDeviceOptions extends UseWindowSizeOptions {} /** * + * @param options 配置项 + * + * @description * 检测当前尺寸是否为平板或者更小 * 默认主流平板尺寸为 768px * diff --git a/src/hooks/web/useDomToImage.ts b/src/hooks/web/useDomToImage.ts index 82585466..417160bf 100644 --- a/src/hooks/web/useDomToImage.ts +++ b/src/hooks/web/useDomToImage.ts @@ -19,7 +19,8 @@ export type ImageType = keyof typeof domToImageMethods export type DomToImageResult = string | Blob | Uint8ClampedArray | undefined -export interface UseDomToImageOptions extends ReDomToImageOptions { +export interface UseDomToImageOptions + extends ReDomToImageOptions { /** * * @@ -37,9 +38,7 @@ export interface UseDomToImageOptions extends ReDomToImageOptions { * * @default undefined */ - beforeCreate?: ( - element: T | null | undefined, - ) => void + beforeCreate?: (element: T | null | undefined) => void /** * * @param element current dom @@ -49,10 +48,7 @@ export interface UseDomToImageOptions extends ReDomToImageOptions { * * @default undefined */ - created?: ( - result: DomToImageResult, - element: T, - ) => void + created?: (result: DomToImageResult, element: T) => void /** * * @param error dom to image error diff --git a/src/hooks/web/useElementFullscreen.ts b/src/hooks/web/useElementFullscreen.ts index 395bade5..171d00da 100644 --- a/src/hooks/web/useElementFullscreen.ts +++ b/src/hooks/web/useElementFullscreen.ts @@ -13,6 +13,7 @@ import { unrefElement, effectDispose, isValueType } from '@/utils' import { useWindowSize } from '@vueuse/core' import type { BasicTarget } from '@/types' +import type { CSSProperties } from 'vue' export interface UseElementFullscreenOptions { /** @@ -92,7 +93,7 @@ export const useElementFullscreen = ( backgroundColor, zIndex, } = options ?? {} - const cacheStyle: Partial = {} // 缓存一些需要被覆盖的样式，例如: transition + const cacheStyle: Partial = {} // 缓存一些需要被覆盖的样式，例如: transition let isSetup = false const updateStyle = () => { diff --git a/src/hooks/web/useI18n.ts b/src/hooks/web/useI18n.ts index 1974a36b..0d3ed1d1 100644 --- a/src/hooks/web/useI18n.ts +++ b/src/hooks/web/useI18n.ts @@ -36,6 +36,9 @@ export const useI18n = (namespace?: string) => { * * 避免 HMR 时 i18n 未初始化导致报错。 * 但是在开发环境下，i18n 始终会被初始化，所以不会影响其正常使用。 + * + * 但是，其实这是一种很不友好的做好，并且在顶层做修改的时候，依旧可能会有 HMR 报错； + * 现在还未找到更好的解决方案，所以只能先这样。 */ if (!i18n) { return { diff --git a/src/hooks/web/usePrint.ts b/src/hooks/web/usePrint.ts index 84619257..09094f68 100644 --- a/src/hooks/web/usePrint.ts +++ b/src/hooks/web/usePrint.ts @@ -1,5 +1,5 @@ import print from 'print-js' -import { unrefElement } from '@/utils' +import { unrefElement, omit } from '@/utils' import type { BasicTarget } from '@/types' @@ -40,7 +40,7 @@ export const usePrint = (target: UsePrintTarget, options?: UsePrintOptions) => { const _target = unrefElement(target as BasicTarget) || target print({ - ...options, + ...omit(options, ['printable']), printable: _target, }) } diff --git a/src/hooks/web/useVueRouter.ts b/src/hooks/web/useVueRouter.ts index ff56ab64..2c16e461 100644 --- a/src/hooks/web/useVueRouter.ts +++ b/src/hooks/web/useVueRouter.ts @@ -11,28 +11,47 @@ import { router } from '@/router' +import type { Router } from 'vue-router' + /** * - * @returns vue router instance + * @description + * 获取 vue-router 实例，允许你在非 setup 环境中使用。 * - * @remark 使用 vue router instance, 可以在 setup 环境外使用 + * 可能考虑后期会加一些新的东西，所以与 vue-router useRouter 有点差异，需要解构使用 router， + * 但是，其余的所有使用方法都与 useRouter 一致。 * - * 使用该方法时候, 可能会出现热更新错误的问题... 所以遇到的时候不要紧张, 刷新一下就好 - * 如果确定使用环境就在 setup 中, 还是建议使用官方的 useRouter useRoute 方法, 避免热更新报错的问题 + * 如果需要使用类似于 useRoute 的方法，可以使用 useVueRouter().router.currentRoute 获取。 + * + * @example + * const { router } = useVueRouter() + * + * // 使用 router + * router.push('/path') + * router.replace('/path') + * + * // 使用类似于 useRoute 的方法 + * const { router: { currentRouter } } = useVueRouter() + * + * console.log(route.fullPath) */ export const useVueRouter = () => { - try { - if (router) { - return { - router, - } - } else { - throw new Error() + /** + * + * 该写法无实际意义，仅是为了避免 HMR 报错，导致开发流程中断。 + * 在实际业务中，router 始终是有值状态，所以不用担心。 + * + * 但是，其实这是一种很不友好的做好，并且在顶层做修改的时候，依旧可能会有 HMR 报错； + * 现在还未找到更好的解决方案，所以只能先这样。 + */ + if (!router) { + return { + router: {} as Router, } - } catch (e) { - throw new Error( - `[useVueRouter]: An error occurred during registration of vue-router. ${e}`, - ) + } + + return { + router, } } diff --git a/src/icons/enter.svg b/src/icons/enter.svg new file mode 100644 index 00000000..921ee629 --- /dev/null +++ b/src/icons/enter.svg @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/src/layout/components/MenuTag/index.tsx b/src/layout/components/MenuTag/index.tsx index 189cdab5..b5b719dd 100644 --- a/src/layout/components/MenuTag/index.tsx +++ b/src/layout/components/MenuTag/index.tsx @@ -80,7 +80,7 @@ export default defineComponent({ 'closeOther', 'closeCurrentPage', ] // 哪些下拉框允许禁用 - let currentContextmenuIndex = -1 // 当前右键标签页索引位置 + let currentContextmenuIndex = Infinity // 当前右键标签页索引位置 const iconConfig = { size: 16, } @@ -154,6 +154,7 @@ export default defineComponent({ }) const MENU_TAG_DATA = 'menu_tag_data' // 注入 tag 前缀 const globalMainLayoutLoad = getVariableToRefs('globalMainLayoutLoad') + const naiveScrollbarContainerClass = 'n-scrollbar-container' // naive scrollbar 容器 class /** * @@ -200,7 +201,7 @@ export default defineComponent({ scroll.childNodes, ) as HTMLElement[] const findElement = scrollContentElement.find((el) => { - const has = hasClass(el, 'n-scrollbar-container') + const has = hasClass(el, naiveScrollbarContainerClass) return has.value }) @@ -241,7 +242,11 @@ export default defineComponent({ const actionDropdownSelect = (key: string | number) => { actionState.actionDropdownShow = false - actionMap[key]?.() + const fn = actionMap[key as keyof typeof actionMap] + + if (fn) { + fn() + } } /** diff --git a/src/layout/components/SiderBar/components/GlobalSearch/index.scss b/src/layout/components/SiderBar/components/GlobalSearch/index.scss index ce4b358a..a5a6e1f3 100644 --- a/src/layout/components/SiderBar/components/GlobalSearch/index.scss +++ b/src/layout/components/SiderBar/components/GlobalSearch/index.scss @@ -52,13 +52,33 @@ $globalSearchWidth: 650px; transform: scale(0.75); font-weight: bolder; } - - & .global-search__card-content .content-item { - &.content-item--active, - &:hover { - background-color: var(--ray-theme-primary-fade-color); - } - } + } + } +} + +.n-flex.global-search__card-content { + & .content-item.content-item--active, + & .content-item:hover { + background-color: var(--ray-theme-primary-fade-color); + } + + & .content-item { + position: relative; + transition: var(--r-bezier); + + & .content-item-icon__enter { + position: absolute; + width: 18px; + height: 18px; + right: 16px; + opacity: 0; + } + } + + & .content-item.content-item--active, + & .content-item:hover { + & .content-item-icon__enter { + opacity: 1; } } } diff --git a/src/layout/components/SiderBar/components/GlobalSearch/index.tsx b/src/layout/components/SiderBar/components/GlobalSearch/index.tsx index b9dacd91..1f1c49a7 100644 --- a/src/layout/components/SiderBar/components/GlobalSearch/index.tsx +++ b/src/layout/components/SiderBar/components/GlobalSearch/index.tsx @@ -32,13 +32,13 @@ import { import { RIcon } from '@/components' import { queryElements, setClass, removeClass, pick } from '@/utils' -import { debounce } from 'lodash-es' +import { throttle } from 'lodash-es' import { useMenuActions } from '@/store' -import { validMenuItemShow } from '@/router/helper/routerCopilot' +import { validMenuItemShow } from '@/router/utils/routerCopilot' import { useDevice } from '@/hooks' import { useEventListener } from '@vueuse/core' -import type { AppRouteMeta } from '@/router/type' +import type { AppRouteMeta } from '@/router/types' import type { AppMenuOption } from '@/types' export default defineComponent({ @@ -288,6 +288,11 @@ export default defineComponent({ >
{RenderPreIcon(menuOption.meta)}
{menuOption.breadcrumbLabel}
+ ) @@ -312,7 +317,7 @@ export default defineComponent({ ...toRefs(state), modelShow, helperTipOptions, - fuzzySearchMenuOptions: debounce(fuzzySearchMenuOptions, 300), + fuzzySearchMenuOptions: throttle(fuzzySearchMenuOptions, 300), searchItemClick, RenderPreIcon, isTabletOrSmaller, @@ -322,7 +327,7 @@ export default defineComponent({ }, render() { const { isTabletOrSmaller, searchOptions, loading } = this - const { SearchItem, fuzzySearchMenuOptions, $t } = this + const { SearchItem, fuzzySearchMenuOptions } = this return isTabletOrSmaller ? (
@@ -368,7 +373,7 @@ export default defineComponent({ size={[0, 6]} class="global-search__card-content" > - {searchOptions.map((curr) => ( + {searchOptions.map((curr, idx) => ( ))} diff --git a/src/layout/layoutResize.ts b/src/layout/layoutResize.ts index 0b230205..ee23a5be 100644 --- a/src/layout/layoutResize.ts +++ b/src/layout/layoutResize.ts @@ -22,7 +22,11 @@ import type { Ref } from 'vue' * 不建议滥用该方法, 对页面渲染有一定的影响 */ export const layoutHeaderCssVars = ( - element: Ref[], + element: [ + Ref, + Ref, + Ref, + ], ) => { const siderBar = useElementBounding(element[0]) const menuTag = useElementBounding(element[1]) diff --git a/src/locales/helper.ts b/src/locales/helper.ts deleted file mode 100644 index 7502f0d9..00000000 --- a/src/locales/helper.ts +++ /dev/null @@ -1,133 +0,0 @@ -/** - * - * @author Ray - * - * @date 2023-05-19 - * - * @workspace ray-template - * - * @remark 今天也是元气满满撸代码的一天 - */ - -/** - * - * 国际化辅助方法: - * - combineI18nMessages: 合并对应文件下语言包 - * - getAppLocalMessages: 获取所有语言 - */ - -import { set } from 'lodash-es' -import { zhCN, dateZhCN } from 'naive-ui' // 导入 `naive ui` 中文包 -import { getStorage } from '@/utils' -import { APP_CATCH_KEY, SYSTEM_DEFAULT_LOCAL } from '@/app-config' - -import type { Recordable } from '@/types' -import type { - AppLocalesModules, - AppLocalesDropdownMixedOption, - AppCurrentAppMessages, - I18nModules, -} from '@/locales/type' - -/** - * - * @param langs 语言包 - * @param prefix 语言包前缀 - * - * @remark 合并处理语言包内容, prefix 必填 - */ -export const combineI18nMessages = (langs: I18nModules, prefix: string) => { - if (typeof prefix !== 'string' || !prefix.trim()) { - throw new TypeError('Expected prefix to be a non-empty string') - } - - const langsGather: Record = {} - - Object.keys(langs).forEach((key) => { - const langFileModule = langs[key].default - - let fileName = key.replace(`./${prefix}/`, '').replace(/^\.\//, '') - const lastIndex = fileName.lastIndexOf('.') - - fileName = fileName.substring(0, lastIndex) - - const keyList = fileName.split('/') - const moduleName = keyList.shift() - const objKey = keyList.join('.') - - if (moduleName) { - if (objKey) { - set(langsGather, moduleName, langsGather[moduleName] || {}) - set(langsGather[moduleName], objKey, langFileModule) - } else { - set(langsGather, moduleName, langFileModule || {}) - } - } - }) - - return langsGather -} - -/** 获取所有语言 */ -export const getAppLocalMessages = async ( - localOptions: AppLocalesDropdownMixedOption[], -) => { - const message = {} as AppCurrentAppMessages - - for (const curr of localOptions) { - const msg: AppLocalesModules = await import(`@/locales/lang/${curr.key}.ts`) - const key = curr.key - - if (key) { - message[key] = msg?.default?.message ?? {} - } - } - - return message -} - -/** - * - * @param key 切换对应语言 - * @returns 组件库对应语言包 - * - * @remark 受打包体积影响. 如果有新的语言添加, 则需要手动引入对应语言包(https://www.naiveui.com/zh-CN/dark/docs/i18n) - * @remark naive ui 默认为英文 - * - * 该方法的比对 key 必须与 LOCAL_OPTIONS 一一对应 - */ -export const naiveLocales = (key: string) => { - switch (key) { - case 'zh-CN': - return { - locale: zhCN, - dateLocal: dateZhCN, - } - - case 'en-US': - return { - locale: null, - dateLocal: null, - } - - default: - return { - locale: zhCN, - dateLocal: dateZhCN, - } - } -} - -/** - * - * @returns 获取当前环境默认语言 - * - * @remark 未避免出现加载语言错误问题, 故而在 `main.ts` 注册时, 应优先加载 `i18n` 避免出现该问题 - */ -export const getAppDefaultLanguage = () => { - const language = getStorage(APP_CATCH_KEY.localeLanguage, 'localStorage', { - defaultValue: SYSTEM_DEFAULT_LOCAL, - }) - - return language as keyof AppCurrentAppMessages -} diff --git a/src/locales/index.ts b/src/locales/index.ts index e40d569f..b820ca90 100644 --- a/src/locales/index.ts +++ b/src/locales/index.ts @@ -24,7 +24,7 @@ */ import { createI18n } from 'vue-i18n' -import { getAppDefaultLanguage, getAppLocalMessages } from '@/locales/helper' +import { getAppDefaultLanguage, getAppLocalMessages } from '@/locales/utils' import { SYSTEM_FALLBACK_LOCALE, LOCAL_OPTIONS } from '@/app-config' import type { App } from 'vue' diff --git a/src/locales/lang/en-US.ts b/src/locales/lang/en-US.ts index 01121baa..2b98a784 100644 --- a/src/locales/lang/en-US.ts +++ b/src/locales/lang/en-US.ts @@ -1,6 +1,6 @@ -import { combineI18nMessages } from '@/locales/helper' +import { combineI18nMessages } from '@/locales/utils' -import type { I18nModules } from '@/locales/type' +import type { I18nModules } from '@/locales/types' const modules: I18nModules = import.meta.glob('./en-US/**/*.json', { eager: true, diff --git a/src/locales/lang/zh-CN.ts b/src/locales/lang/zh-CN.ts index b1f4924b..0c0b0a43 100644 --- a/src/locales/lang/zh-CN.ts +++ b/src/locales/lang/zh-CN.ts @@ -1,6 +1,6 @@ -import { combineI18nMessages } from '@/locales/helper' +import { combineI18nMessages } from '@/locales/utils' -import type { I18nModules } from '@/locales/type' +import type { I18nModules } from '@/locales/types' const modules: I18nModules = import.meta.glob('./zh-CN/**/*.json', { eager: true, diff --git a/src/locales/type.ts b/src/locales/types.ts similarity index 100% rename from src/locales/type.ts rename to src/locales/types.ts diff --git a/src/locales/utils/combineI18nMessages.ts b/src/locales/utils/combineI18nMessages.ts new file mode 100644 index 00000000..cb2e8138 --- /dev/null +++ b/src/locales/utils/combineI18nMessages.ts @@ -0,0 +1,47 @@ +import { set } from 'lodash-es' + +import type { Recordable } from '@/types' +import type { I18nModules } from '@/locales/types' + +/** + * + * @param langs 语言包 + * @param prefix 语言包前缀 + * + * @description + * 合并处理 lang 下指定的语言包。 + * + * @example + * const messages = combineI18nMessages(modules, 'zh-CN') + */ +export const combineI18nMessages = (langs: I18nModules, prefix: string) => { + if (typeof prefix !== 'string' || !prefix.trim()) { + throw new TypeError('Expected prefix to be a non-empty string') + } + + const langsGather: Record = {} + + Object.keys(langs).forEach((key) => { + const langFileModule = langs[key].default + + let fileName = key.replace(`./${prefix}/`, '').replace(/^\.\//, '') + const lastIndex = fileName.lastIndexOf('.') + + fileName = fileName.substring(0, lastIndex) + + const keyList = fileName.split('/') + const moduleName = keyList.shift() + const objKey = keyList.join('.') + + if (moduleName) { + if (objKey) { + set(langsGather, moduleName, langsGather[moduleName] || {}) + set(langsGather[moduleName], objKey, langFileModule) + } else { + set(langsGather, moduleName, langFileModule || {}) + } + } + }) + + return langsGather +} diff --git a/src/locales/utils/getAppDefaultLanguage.ts b/src/locales/utils/getAppDefaultLanguage.ts new file mode 100644 index 00000000..172917b1 --- /dev/null +++ b/src/locales/utils/getAppDefaultLanguage.ts @@ -0,0 +1,20 @@ +import { getStorage } from '@/utils' +import { APP_CATCH_KEY, SYSTEM_DEFAULT_LOCAL } from '@/app-config' + +import type { AppCurrentAppMessages } from '@/locales/types' + +/** + * + * @description + * 获取当前应用的默认语言。 + * + * @example + * const language = getAppDefaultLanguage() // zh-CN | en-US | ... + */ +export const getAppDefaultLanguage = () => { + const language = getStorage(APP_CATCH_KEY.localeLanguage, 'localStorage', { + defaultValue: SYSTEM_DEFAULT_LOCAL, + }) + + return language as keyof AppCurrentAppMessages +} diff --git a/src/locales/utils/getAppLocalMessages.ts b/src/locales/utils/getAppLocalMessages.ts new file mode 100644 index 00000000..52fe705a --- /dev/null +++ b/src/locales/utils/getAppLocalMessages.ts @@ -0,0 +1,32 @@ +import type { + AppLocalesModules, + AppLocalesDropdownMixedOption, + AppCurrentAppMessages, +} from '@/locales/types' + +/** + * + * @param localOptions 语言包下拉配置项 + * + * @description + * 获取当前应用的所有语言包。 + * + * @example + * const messages = await getAppLocalMessages(localOptions) + */ +export const getAppLocalMessages = async ( + localOptions: AppLocalesDropdownMixedOption[], +) => { + const message = {} as AppCurrentAppMessages + + for (const curr of localOptions) { + const msg: AppLocalesModules = await import(`@/locales/lang/${curr.key}.ts`) + const key = curr.key + + if (key) { + message[key] = msg?.default?.message ?? {} + } + } + + return message +} diff --git a/src/locales/utils/getNaiveLocales.ts b/src/locales/utils/getNaiveLocales.ts new file mode 100644 index 00000000..3d342ac1 --- /dev/null +++ b/src/locales/utils/getNaiveLocales.ts @@ -0,0 +1,35 @@ +import { zhCN, dateZhCN } from 'naive-ui' // 导入 `naive ui` 中文包 + +/** + * + * @param key 切换对应语言 + * + * @description + * 通过 key 获取对应 naive ui 语言包。 + * + * key 必须与 LOCAL_OPTIONS key 一一对应。 + * + * @example + * const { locale, dateLocal } = naiveLocales('zh-CN') + */ +export const getNaiveLocales = (key: string) => { + switch (key) { + case 'zh-CN': + return { + locale: zhCN, + dateLocal: dateZhCN, + } + + case 'en-US': + return { + locale: null, + dateLocal: null, + } + + default: + return { + locale: zhCN, + dateLocal: dateZhCN, + } + } +} diff --git a/src/locales/utils/index.ts b/src/locales/utils/index.ts new file mode 100644 index 00000000..a0b2a15d --- /dev/null +++ b/src/locales/utils/index.ts @@ -0,0 +1,4 @@ +export * from './combineI18nMessages' +export * from './getAppLocalMessages' +export * from './getNaiveLocales' +export * from './getAppDefaultLanguage' diff --git a/src/main.ts b/src/main.ts index 92b01fe3..1ffa98cb 100644 --- a/src/main.ts +++ b/src/main.ts @@ -34,9 +34,9 @@ const setupRayTemplateCore = async () => { * 注册时应该注意每个插件的加载顺序。 */ const setupPlugins = async (inst: AppType) => { + setupStore(inst) await setupI18n(inst) - await setupStore(inst) - await setupRouter(inst) + setupRouter(inst) setupDayjs() setupDirectives(inst) } diff --git a/src/router/README.md b/src/router/README.md index b977bc9f..f54896f0 100644 --- a/src/router/README.md +++ b/src/router/README.md @@ -8,7 +8,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const demo: AppRouteRecordRaw = { /** 路由路径，如果为根菜单且无有菜单的时候可以配置为空字符串 */ diff --git a/src/router/appRouteModules.ts b/src/router/appRouteModules.ts index e5bf1991..28eb3578 100644 --- a/src/router/appRouteModules.ts +++ b/src/router/appRouteModules.ts @@ -20,9 +20,9 @@ * 如果不设置 order 属性, 则会默认排在前面 */ -import { combineRawRouteModules } from '@/router/helper/setupHelper' -import { orderRoutes } from '@/router/helper/setupHelper' -import { expandRoutes } from '@/router/helper/expandRoutes' +import { combineRawRouteModules } from '@/router/utils/setupHelper' +import { orderRoutes } from '@/router/utils/setupHelper' +import { expandRoutes } from '@/router/utils/expandRoutes' /** 获取所有被合并与排序的路由 */ export const getAppRawRoutes = () => orderRoutes(combineRawRouteModules()) diff --git a/src/router/index.ts b/src/router/index.ts index b31d85e3..64e42641 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,35 +1,31 @@ import { createRouter, createWebHashHistory } from 'vue-router' -import { scrollViewToTop } from '@/router/helper/setupHelper' -import { vueRouterRegister } from '@/router/helper/routerCopilot' +import { scrollViewToTop } from '@/router/utils/setupHelper' +import { vueRouterRegister } from '@/router/utils/routerCopilot' import { useVueRouter } from '@/hooks' import constantRoutes from './routes' import type { App } from 'vue' -import type { RouteRecordRaw, Router } from 'vue-router' +import type { RouteRecordRaw } from 'vue-router' -export let router: Router +export const router = createRouter({ + history: createWebHashHistory(), + routes: constantRoutes as unknown as RouteRecordRaw[], + scrollBehavior: (to) => { + scrollViewToTop(to) + }, +}) /** * - * 创建 vue router 实例 - * 注册 scrollBehavior 方法 + * @param app vue instance + * + * @description + * 该方法用于注册 vue-router，并且初始化一些配置方法。 */ -const createVueRouter = async () => { - return createRouter({ - history: createWebHashHistory(), - routes: (await constantRoutes()) as unknown as RouteRecordRaw[], - scrollBehavior: (to) => { - scrollViewToTop(to) - }, - }) -} - -// setup router -export const setupRouter = async (app: App) => { - router = await createVueRouter() - +export const setupRouter = (app: App) => { app.use(router) + // 等待 router 挂载后，初始化 useRouter 方法 useVueRouter() vueRouterRegister(router) diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts index 6d181990..a6ef32ce 100644 --- a/src/router/modules/dashboard.ts +++ b/src/router/modules/dashboard.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const dashboard: AppRouteRecordRaw = { path: '/dashboard', diff --git a/src/router/modules/demo/axios.ts b/src/router/modules/demo/axios.ts index 0d00721a..ecd6e447 100644 --- a/src/router/modules/demo/axios.ts +++ b/src/router/modules/demo/axios.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const axios: AppRouteRecordRaw = { path: '/axios', diff --git a/src/router/modules/demo/cache-demo.ts b/src/router/modules/demo/cache-demo.ts index 8429fcfc..e666ad49 100644 --- a/src/router/modules/demo/cache-demo.ts +++ b/src/router/modules/demo/cache-demo.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const cacheDemo: AppRouteRecordRaw = { path: '/cache-demo', diff --git a/src/router/modules/demo/context-menu.ts b/src/router/modules/demo/context-menu.ts index 1a19a4a2..d2818434 100644 --- a/src/router/modules/demo/context-menu.ts +++ b/src/router/modules/demo/context-menu.ts @@ -1,6 +1,6 @@ import { t } from '@/hooks' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const contextMenu: AppRouteRecordRaw = { path: '/context-menu', diff --git a/src/router/modules/demo/directive.ts b/src/router/modules/demo/directive.ts index e9022cbb..4d8a3469 100644 --- a/src/router/modules/demo/directive.ts +++ b/src/router/modules/demo/directive.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const directive: AppRouteRecordRaw = { path: '/directive', @@ -11,6 +11,9 @@ const directive: AppRouteRecordRaw = { i18nKey: t('menu.Directive'), icon: 'other', order: 2, + extra: { + label: 'ellipsis', + }, }, } diff --git a/src/router/modules/demo/doc.ts b/src/router/modules/demo/doc.ts index e4f14ac9..0fb29f5b 100644 --- a/src/router/modules/demo/doc.ts +++ b/src/router/modules/demo/doc.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const doc: AppRouteRecordRaw = { path: '/doc', diff --git a/src/router/modules/demo/echart.ts b/src/router/modules/demo/echart.ts index 6b53c078..0e683867 100644 --- a/src/router/modules/demo/echart.ts +++ b/src/router/modules/demo/echart.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const echart: AppRouteRecordRaw = { path: '/echart', diff --git a/src/router/modules/demo/iframe.ts b/src/router/modules/demo/iframe.ts index 1a469d21..77d86b79 100644 --- a/src/router/modules/demo/iframe.ts +++ b/src/router/modules/demo/iframe.ts @@ -1,6 +1,6 @@ import { t } from '@/hooks' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const iframe: AppRouteRecordRaw = { path: '/iframe', diff --git a/src/router/modules/demo/mock.ts b/src/router/modules/demo/mock.ts index 79d7117f..d4bb862e 100644 --- a/src/router/modules/demo/mock.ts +++ b/src/router/modules/demo/mock.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const mockDemo: AppRouteRecordRaw = { path: '/mock-demo', diff --git a/src/router/modules/demo/modal.ts b/src/router/modules/demo/modal.ts index 3f90fc2e..60b1ea43 100644 --- a/src/router/modules/demo/modal.ts +++ b/src/router/modules/demo/modal.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const mockDemo: AppRouteRecordRaw = { path: '/modal-demo', diff --git a/src/router/modules/demo/multi-menu.ts b/src/router/modules/demo/multi-menu.ts index 90a39cab..56ea2606 100644 --- a/src/router/modules/demo/multi-menu.ts +++ b/src/router/modules/demo/multi-menu.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const multiMenu: AppRouteRecordRaw = { path: '/multi', diff --git a/src/router/modules/demo/precision.ts b/src/router/modules/demo/precision.ts index 425d86f7..f2a7fe48 100644 --- a/src/router/modules/demo/precision.ts +++ b/src/router/modules/demo/precision.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const precision: AppRouteRecordRaw = { path: '/precision', diff --git a/src/router/modules/demo/qrcode.ts b/src/router/modules/demo/qrcode.ts index 41bb24af..76803679 100644 --- a/src/router/modules/demo/qrcode.ts +++ b/src/router/modules/demo/qrcode.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const qrcode: AppRouteRecordRaw = { path: '/qrcode', diff --git a/src/router/modules/demo/rely.ts b/src/router/modules/demo/rely.ts index cc1d6b47..82efa345 100644 --- a/src/router/modules/demo/rely.ts +++ b/src/router/modules/demo/rely.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const rely: AppRouteRecordRaw = { path: '/rely', diff --git a/src/router/modules/demo/router-demo.ts b/src/router/modules/demo/router-demo.ts index 9193cdc7..0dd58475 100644 --- a/src/router/modules/demo/router-demo.ts +++ b/src/router/modules/demo/router-demo.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const routerDemo: AppRouteRecordRaw = { path: '/router-demo', diff --git a/src/router/modules/demo/scroll-reveal.ts b/src/router/modules/demo/scroll-reveal.ts index 2388d345..0b551561 100644 --- a/src/router/modules/demo/scroll-reveal.ts +++ b/src/router/modules/demo/scroll-reveal.ts @@ -7,7 +7,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const scrollReveal: AppRouteRecordRaw = { path: '/scroll-reveal', diff --git a/src/router/modules/demo/svg-icons.ts b/src/router/modules/demo/svg-icons.ts index b5088772..8225ff14 100644 --- a/src/router/modules/demo/svg-icons.ts +++ b/src/router/modules/demo/svg-icons.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const previewSVGIcons: AppRouteRecordRaw = { path: '/svg-icons', diff --git a/src/router/modules/demo/table.ts b/src/router/modules/demo/table.ts index 95d2c90e..fdbfb4b6 100644 --- a/src/router/modules/demo/table.ts +++ b/src/router/modules/demo/table.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const table: AppRouteRecordRaw = { path: '/table', diff --git a/src/router/modules/demo/template-hooks.ts b/src/router/modules/demo/template-hooks.ts index 7f1e2f4b..41710e44 100644 --- a/src/router/modules/demo/template-hooks.ts +++ b/src/router/modules/demo/template-hooks.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const axios: AppRouteRecordRaw = { path: '/template-hooks', diff --git a/src/router/modules/error404.ts b/src/router/modules/error404.ts index a21eebb3..aac266e8 100644 --- a/src/router/modules/error404.ts +++ b/src/router/modules/error404.ts @@ -1,7 +1,7 @@ import { t } from '@/hooks' import { LAYOUT } from '@/router/constant' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' const error404: AppRouteRecordRaw = { path: '/:catchAll(.*)', diff --git a/src/router/routes.ts b/src/router/routes.ts index 8c8fd4fd..78d71827 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,31 +1,25 @@ import Layout from '@/layout' import { appExpandRoutes } from './appRouteModules' -import { useAppRoot } from '@/hooks' -export default async () => { - const { getRootPath } = useAppRoot() - - return [ - /** - * - * 首页（一般为 Login 页面） - * 整个模板默认导航地址 - */ - { - path: '/', - name: 'RLogin', - component: () => import('@/views/login'), - }, - /** - * - * App Layout 核心页面（一般为登陆后展示的页面） - */ - { - path: '/', - name: 'RLayout', - redirect: getRootPath.value, - component: Layout, - children: appExpandRoutes(), - }, - ] -} +export default [ + /** + * + * 首页（一般为 Login 页面） + * 整个模板默认导航地址 + */ + { + path: '/', + name: 'RLogin', + component: () => import('@/views/login'), + }, + /** + * + * App Layout 核心页面（一般为登陆后展示的页面） + */ + { + path: '/', + name: 'RLayout', + component: Layout, + children: appExpandRoutes(), + }, +] diff --git a/src/router/type.ts b/src/router/types.ts similarity index 100% rename from src/router/type.ts rename to src/router/types.ts diff --git a/src/router/helper/expandRoutes.ts b/src/router/utils/expandRoutes.ts similarity index 95% rename from src/router/helper/expandRoutes.ts rename to src/router/utils/expandRoutes.ts index c26af79d..0ed6a9c0 100644 --- a/src/router/helper/expandRoutes.ts +++ b/src/router/utils/expandRoutes.ts @@ -19,7 +19,7 @@ import { cloneDeep } from 'lodash-es' -import type { AppRouteRecordRaw } from '@/router/type' +import type { AppRouteRecordRaw } from '@/router/types' // 是否为根路由 const isRootPath = (path: string) => path[0] === '/' diff --git a/src/router/helper/permission.ts b/src/router/utils/permission.ts similarity index 92% rename from src/router/helper/permission.ts rename to src/router/utils/permission.ts index 988e4a3b..d33d57f1 100644 --- a/src/router/helper/permission.ts +++ b/src/router/utils/permission.ts @@ -21,13 +21,13 @@ */ import { WHITE_ROUTES, APP_CATCH_KEY } from '@/app-config' -import { redirectRouterToDashboard } from '@/router/helper/routerCopilot' -import { validRole } from '@/router/helper/routerCopilot' +import { redirectRouterToDashboard } from '@/router/utils/routerCopilot' +import { validRole } from '@/router/utils/routerCopilot' import { isValueType, getStorage } from '@/utils' import { useAppRoot } from '@/hooks' import type { Router, RouteLocationNormalized } from 'vue-router' -import type { AppRouteMeta } from '@/router/type' +import type { AppRouteMeta } from '@/router/types' /** 路由守卫 */ export const permissionRouter = (router: Router) => { diff --git a/src/router/helper/routerCopilot.ts b/src/router/utils/routerCopilot.ts similarity index 98% rename from src/router/helper/routerCopilot.ts rename to src/router/utils/routerCopilot.ts index 1e61e92f..41fbfd34 100644 --- a/src/router/helper/routerCopilot.ts +++ b/src/router/utils/routerCopilot.ts @@ -16,7 +16,7 @@ import { getAppEnvironment, setStorage } from '@/utils' import { useSigningGetters } from '@/store' import type { Router } from 'vue-router' -import type { AppRouteMeta } from '@/router/type' +import type { AppRouteMeta } from '@/router/types' import type { AppMenuOption } from '@/types' /** diff --git a/src/router/helper/setupHelper.ts b/src/router/utils/setupHelper.ts similarity index 99% rename from src/router/helper/setupHelper.ts rename to src/router/utils/setupHelper.ts index 0d5f233d..ad20a5b5 100644 --- a/src/router/helper/setupHelper.ts +++ b/src/router/utils/setupHelper.ts @@ -21,7 +21,7 @@ import { LAYOUT_CONTENT_REF } from '@/app-config' import type { RouteLocationNormalized } from 'vue-router' -import type { AppRouteRecordRaw, RouteModules } from '@/router/type' +import type { AppRouteRecordRaw, RouteModules } from '@/router/types' /** * diff --git a/src/store/index.ts b/src/store/index.ts index dc5a560a..33e19b22 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -40,7 +40,7 @@ export * from './hooks/useKeepAliveStore' * 设置并且注册 pinia * pinia 天生支持在非 setup 环境中使用，只要在调用时已经注册 */ -export const setupStore = async (app: App) => { +export const setupStore = (app: App) => { const store = createPinia() app.use(store) diff --git a/src/store/modules/menu/index.ts b/src/store/modules/menu/index.ts index c0866d50..6d344ea9 100644 --- a/src/store/modules/menu/index.ts +++ b/src/store/modules/menu/index.ts @@ -26,14 +26,14 @@ import { NEllipsis } from 'naive-ui' import { setStorage, pick, equalRouterPath } from '@/utils' -import { validRole, validMenuItemShow } from '@/router/helper/routerCopilot' +import { validRole, validMenuItemShow } from '@/router/utils/routerCopilot' import { parseAndFindMatchingNodes, updateDocumentTitle, createMenuIcon, getCatchMenuKey, createMenuExtra, -} from './helper' +} from './utils' import { useI18n } from '@/hooks' import { getAppRawRoutes } from '@/router/appRouteModules' import { useKeepAliveActions } from '@/store' diff --git a/src/store/modules/menu/helper.ts b/src/store/modules/menu/utils.ts similarity index 100% rename from src/store/modules/menu/helper.ts rename to src/store/modules/menu/utils.ts diff --git a/src/store/modules/setting/index.ts b/src/store/modules/setting/index.ts index 8814d701..d350b851 100644 --- a/src/store/modules/setting/index.ts +++ b/src/store/modules/setting/index.ts @@ -1,4 +1,4 @@ -import { getAppDefaultLanguage } from '@/locales/helper' +import { getAppDefaultLanguage } from '@/locales/utils' import { colorToRgba, setStorage } from '@/utils' import { useI18n, useDayjs } from '@/hooks' import { watchOnce } from '@vueuse/core' diff --git a/src/types/app.d.ts b/src/types/app.d.ts index c1f5d456..f680bda4 100644 --- a/src/types/app.d.ts +++ b/src/types/app.d.ts @@ -2,7 +2,7 @@ import 'vue-router' -import type { AppRouteMeta } from '@/router/type' +import type { AppRouteMeta } from '@/router/types' declare module 'vue-router' { interface RouteMeta extends AppRouteMeta {} diff --git a/src/types/modules/app.ts b/src/types/modules/app.ts index 34665b61..05b3ee3b 100644 --- a/src/types/modules/app.ts +++ b/src/types/modules/app.ts @@ -1,5 +1,5 @@ import type { VNode } from 'vue' -import type { AppRouteRecordRaw, AppRouteMeta } from '@/router/type' +import type { AppRouteRecordRaw, AppRouteMeta } from '@/router/types' export type Key = string | number diff --git a/src/types/modules/utils.ts b/src/types/modules/utils.ts index 22b78948..3ab0b032 100644 --- a/src/types/modules/utils.ts +++ b/src/types/modules/utils.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import type CryptoJS from 'crypto-js' +import type { CSSProperties } from 'vue' export type StorageLike = 'sessionStorage' | 'localStorage' @@ -92,7 +93,7 @@ export type CipherParams = CryptoJS.lib.CipherParams export type AnyFC

= (...args: P[]) => R export type PartialCSSStyleDeclaration = Partial< - Record + Record > export type ElementSelector = string | `attr:${string}` diff --git a/src/utils/app/index.ts b/src/utils/app/index.ts index d7f56b94..115b82c4 100644 --- a/src/utils/app/index.ts +++ b/src/utils/app/index.ts @@ -1 +1 @@ -export * from './prefix-cache-key' +export * from './prefixCacheKey' diff --git a/src/utils/app/prefix-cache-key.ts b/src/utils/app/prefix-cache-key.ts deleted file mode 100644 index f29f2a4e..00000000 --- a/src/utils/app/prefix-cache-key.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { APP_CATCH_KEY_PREFIX } from '@/app-config' - -/** - * - * @param key pinia 缓存 key - * - * @returns 返回拼接后的缓存 key - * - * @description - * 为缓存 key 添加前缀，以便于区分不同的缓存，避免缓存 key 冲突。 - * - * @example - * // 假设 APP_CATCH_KEY_PREFIX = 'ray-template:' - * - * prefixCacheKey('signing') // 返回 'ray-template:signing' - */ -export const prefixCacheKey = (key: string) => { - if (['', false, null, void 0].includes(key)) { - return key - } - - return `${APP_CATCH_KEY_PREFIX}${key}` -} diff --git a/src/utils/app/prefixCacheKey.ts b/src/utils/app/prefixCacheKey.ts new file mode 100644 index 00000000..ddda8791 --- /dev/null +++ b/src/utils/app/prefixCacheKey.ts @@ -0,0 +1,38 @@ +import { APP_CATCH_KEY_PREFIX } from '@/app-config' + +export interface PrefixCacheKeyOptions { + customPrefix?: string +} + +/** + * + * @param key pinia 缓存 key + * + * @returns 返回拼接后的缓存 key + * + * @description + * 为缓存 key 添加前缀，以便于区分不同的缓存，避免缓存 key 冲突。 + * + * 默认使用 APP_CATCH_KEY_PREFIX 作为前缀。 + * + * 当你需要自定义前缀时，可以传入 customPrefix，当 customPrefix 存在时，会使用 customPrefix 作为前缀。 + * + * @example + * // 假设 APP_CATCH_KEY_PREFIX = 'ray-template:' + * prefixCacheKey('signing') // 返回 'ray-template:signing' + * + * // customPrefix 自定义前缀 + * prefixCacheKey('signing', { customPrefix: 'ray' }) // 返回 'ray:signing' + */ +export const prefixCacheKey = ( + key: string, + options?: PrefixCacheKeyOptions, +) => { + const { customPrefix } = options ?? {} + + if (customPrefix) { + return `${customPrefix}${key}` + } + + return `${APP_CATCH_KEY_PREFIX}${key}` +} diff --git a/src/utils/dom.ts b/src/utils/dom.ts index 9bf3a763..6b99aed6 100644 --- a/src/utils/dom.ts +++ b/src/utils/dom.ts @@ -49,28 +49,30 @@ export const printDom = ( ) => { const { domToImageOptions, printOptions } = options ?? {} - const { create } = useDomToImage( - target, - domToImageOptions as UseDomToImageOptions, - ) - - window?.$loadingBar.start() - - create('jpeg') - ?.then((res) => { - const { print } = usePrint(res, { - type: 'image', - base64: true, - targetStyles: ['*'], - ...omit(printOptions as UsePrintOptions, ['type', 'base64']), - }) - - print() - }) - .catch(() => { - window?.$loadingBar.error() - }) - .finally(() => { + const { create } = useDomToImage(target, { + ...domToImageOptions, + beforeCreate: (element) => { + domToImageOptions?.beforeCreate?.(element) + window?.$loadingBar.start() + }, + created(result, element) { + domToImageOptions?.created?.(result, element) window?.$loadingBar.finish() + }, + createdError(error) { + domToImageOptions?.createdError?.(error) + window?.$loadingBar.error() + }, + }) + + create('jpeg')?.then((res) => { + const { print } = usePrint(res, { + type: 'image', + base64: true, + targetStyles: ['*'], + ...omit(printOptions as UsePrintOptions, ['type', 'base64']), }) + + print() + }) } diff --git a/src/utils/element.ts b/src/utils/element.ts index 8a09e584..57b83595 100644 --- a/src/utils/element.ts +++ b/src/utils/element.ts @@ -6,6 +6,7 @@ import type { QueryElementsOptions, ElementSelector, } from '@/types' +import type { CSSProperties } from 'vue' /** * @@ -195,9 +196,9 @@ export const autoPrefixStyle = (style: string) => { * setStyle(styles) * ``` */ -export const setStyle = ( +export const setStyle =