diff --git a/.eslintrc.cjs b/.eslintrc.cjs index eb64f47a..7ebd71f4 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -209,5 +209,78 @@ module.exports = { message: 'Using deprecated API is not allowed.', }, ], + 'padding-line-between-statements': [ + 'error', + { + blankLine: 'always', + prev: '*', + next: 'return', + }, + { + blankLine: 'always', + prev: '*', + next: 'function', + }, + { + blankLine: 'always', + prev: ['const', 'let', 'var'], + next: '*', + }, + { + blankLine: 'any', + prev: ['const', 'let', 'var'], + next: ['const', 'let', 'var'], + }, + { + blankLine: 'always', + prev: 'directive', + next: '*', + }, + { + blankLine: 'any', + prev: 'directive', + next: 'directive', + }, + { + blankLine: 'always', + prev: ['case', 'default'], + next: '*', + }, + { + blankLine: 'always', + prev: ['break'], + next: '*', + }, + { + blankLine: 'always', + prev: ['import'], + next: '*', + }, + { + blankLine: 'any', + prev: 'import', + next: 'import', + }, + { + blankLine: 'always', + prev: '*', + next: 'export', + }, + { + blankLine: 'any', + prev: 'export', + next: 'export', + }, + { + blankLine: 'always', + prev: ['function'], + next: '*', + }, + { + blankLine: 'always', + prev: ['class'], + next: '*', + }, + ], }, } diff --git a/.nvmrc b/.nvmrc index 68c98aa7..3f330989 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.18.2 \ No newline at end of file +v20.12.0 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ecdecd2..3f0fb241 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,65 @@ # CHANGE LOG +## 4.8.2 + +破坏性更新！请仔细阅读更新日志！ + +更新默认 `node` 版本为 `v20.12.0`。 + +并且对于历史一些模块的分包进行了优化，现在更加语意化与清晰。 + +重构 `axios` 拦截器，使用插件式设计思想，更加强大的拓展性、可维护性！ + +## Feats + +- 更新默认 `node` 版本为 `v20.12.0` +- `RBarcode` 相关 + - 新增 `onSuccess`, `onError`, `onFinally` 三个渲染回调 + - 新增 `watchText` 配置项，当 `text` 内容变化后，主动更新条形码，默认不启用 +- 更新 `vue-tsc` 版本至 `2.0.11` +- `hooks` 包 + - `template` 包 + - 新增 `useContentScroll` 方法，用于滚动 `LayoutContent` 内容区域 + - 新增 `useSiderScroll` 方法，用于滚动 `LayoutSider` 侧边栏区域，也就是菜单区域 + - `web` 包 + - `usePagination` 类型修复，所有 `get` 方法都会准确的返回对应的类型 +- `SiderBarLogo` 组件 + - 支持未配置 `icon` 时，允许截取 `title` 第一个字符作为占位 +- `router` 包 + - `router types` 包，补充类型，获得更好的类型提示与配置提示 + - `combine-raw-route-modules` 方法现在会检查路由配置的 `name`, `path` 属性是否出现重复，如果重复，会直接抛出异常中断流程 + - 移除 `name` 配置项作为必选项 + - 标记 `components` 配置项为 `deprecated` 描述项 + - 增强 `AppRouteRecordRaw` 类型，现在当你显式配置了 `meta.keepAlive` 为 `true` 的时候，会提示你 `name` 必填 +- `app-config` 包 + - 提供 `MessageProver` 配置 + - 限制最大消息数量为 5 条 + - 默认不启用手动关闭消息功能 +- `RTable` 新增 `cardProps` 配置项，配置外层容器。 +- 更新 `vue` 版本至 `3.4.25` +- 更新 `vite` 版本至 `5.2.10` +- 更新 `vite-bundle-analyzer` 版本至 `0.9.4`，新增汇总模式 +- 移除 `naive-ui` 自动导入 `hooks` +- `Search` 组件 + - 优化分包逻辑 + - 现在允许在搜索菜单初始位置进行上下键切换 + - 优化搜索菜单样式 +- 新增 `positionSelectedMenuItem` 方法，用于定位选中菜单项 +- `hooks` 包 + - `template` + - 新增 `useContentScroll` 方法，用于滚动 `LayoutContent` 内容区域 + - 新增 `useSiderScroll` 方法，用于滚动 `LayoutSider` 侧边栏区域，也就是菜单区域 +- 重写 `AppAvatar` 组件 +- `axios` 包 + - `inject` 包重命名为 `axios-interceptor`，并且拆分分包逻辑，现在以插件形式管理拦截器逻辑与注入逻辑 +- 新增 `padding-line-between-statements` 规范，强制语句之间的空行 + +## Fixes + +- 修复 `SIDE_BAR_LOGO` 未配置 `icon` 时，侧边栏不显示的问题 +- 修复 `RTable` 在配置 `style.height` 时，样式会错乱的问题 +- 修复 `MenuTag` 在初始化位置时不能准确滚动到当前标签页的问题 + ## 4.8.1 ## Feats diff --git a/README.md b/README.md index 00cbd490..51ba9e4e 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ A `completely free`, `efficient`, `feature complete` and based on vite5. x & ts( - `Multi-terminal adaptation:` support pc, phone, pad - `Documentation:` complete documentation - `Mock data:` built-in Mock data solution -- `Axios request:` secondary encapsulation of axios library, support: cancel, jitter, automatic repeat cancellation and other functions +- `Axios request:` the plug-in design is used to encapsulate the axios library interceptor twice, which makes the interceptor more flexible - `SVG:` built-in svg icon solution - `Hooks:` based on the template characteristics of the encapsulated hooks to make it easier to use some functions of the template - `TypeScript:` provide a complete type @@ -57,12 +57,10 @@ A `completely free`, `efficient`, `feature complete` and based on vite5. x & ts( ## 👀 Preview - [Preview](https://xiaodaigua-ray.github.io/ray-template/#/) -- [Preview(Acceleration address)](https://ray-template.yunkuangao.com/#/) ## 📌 Documentation - [Documentation](https://xiaodaigua-ray.github.io/ray-template-doc/) -- [Documentation(Acceleration address)](https://ray-template.yunkuangao.com/ray-template-doc/) ## 🔋 Change Log @@ -90,9 +88,6 @@ A `completely free`, `efficient`, `feature complete` and based on vite5. x & ts( ```sh # github git clone https://github.com/XiaoDaiGua-Ray/ray-template.git - -# If your download speed is very slow, you can switch to the proxy address below -git clone https://mirror.ghproxy.com/https://github.com/XiaoDaiGua-Ray/ray-template.git ``` ### Pull dependencies diff --git a/README.zh-CN.md b/README.zh-CN.md index b63f7ac9..871dda5b 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -48,7 +48,7 @@ - `多端适配：`支持 pc, phone, pad - `文档：`完善的文档 - `Mock 数据：`内置 Mock 数据方案 -- `Axios 请求：`二次封装 axios 库，支持：取消、防抖、自动重复取消等功能 +- `Axios 请求：`采用插件式设计二次封装 axios 库拦截器，让拦截器更加灵活 - `SVG：`内置 svg icon 解决方案 - `Hooks：`基于模板特性封装的 hooks 让你更加方便的使用模板一些功能 - `TypeScript：`提供完整的类型 @@ -57,12 +57,10 @@ ## 👀 预览地址 - [点击预览](https://xiaodaigua-ray.github.io/ray-template/#/) -- [点击预览(加速地址)](https://ray-template.yunkuangao.com/#/) ## 📌 文档地址 - [文档](https://xiaodaigua-ray.github.io/ray-template-doc/) -- [文档(加速地址)](https://ray-template.yunkuangao.com/ray-template-doc/) ## 🔋 更新日志 @@ -90,9 +88,6 @@ ```sh # github git clone https://github.com/XiaoDaiGua-Ray/ray-template.git - -# 如果你的下载速度很慢，可以切换到下面的代理地址 -git clone https://mirror.ghproxy.com/https://github.com/XiaoDaiGua-Ray/ray-template.git ``` ### 拉取依赖 diff --git a/__test__/hooks/usePagination.spec.ts b/__test__/hooks/usePagination.spec.ts index 27bf1614..d6cce96f 100644 --- a/__test__/hooks/usePagination.spec.ts +++ b/__test__/hooks/usePagination.spec.ts @@ -63,12 +63,4 @@ describe('usePagination', () => { expect(count).toBe(2) }) - - it('should get callback', () => { - count = 0 - - getCallback() - - expect(count).toBe(1) - }) }) diff --git a/package.json b/package.json index 965e32ec..455b0936 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ray-template", "private": false, - "version": "4.8.1", + "version": "4.8.2", "type": "module", "engines": { "node": "^18.0.0 || >=20.0.0", @@ -49,9 +49,9 @@ "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.0", "print-js": "^1.6.0", - "vue": "^3.4.21", + "vue": "^3.4.25", "vue-demi": "0.14.6", - "vue-hooks-plus": "1.8.8", + "vue-hooks-plus": "1.9.0", "vue-i18n": "^9.9.0", "vue-router": "^4.3.0" }, @@ -80,7 +80,7 @@ "eslint-config-standard-with-typescript": "^43.0.0", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-vue": "^9.18.1", + "eslint-plugin-vue": "^9.25.0", "happy-dom": "14.3.1", "husky": "8.0.3", "lint-staged": "^15.1.0", @@ -92,8 +92,8 @@ "typescript": "^5.2.2", "unplugin-auto-import": "^0.17.5", "unplugin-vue-components": "^0.26.0", - "vite": "^5.2.8", - "vite-bundle-analyzer": "0.8.1", + "vite": "^5.2.10", + "vite-bundle-analyzer": "0.9.4", "vite-plugin-cdn2": "1.1.0", "vite-plugin-compression": "^0.5.1", "vite-plugin-ejs": "^1.7.0", @@ -104,8 +104,8 @@ "vite-plugin-svg-icons": "^2.0.1", "vite-svg-loader": "^4.0.0", "vite-tsconfig-paths": "4.3.2", - "vitest": "1.4.0", - "vue-tsc": "^1.8.27" + "vitest": "1.5.2", + "vue-tsc": "^2.0.11" }, "description": "", "main": "index.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a4d1d340..63d1f6a8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: dependencies: '@vueuse/core': specifier: ^10.9.0 - version: 10.9.0(vue@3.4.21) + version: 10.9.0(vue@3.4.25) 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.21) + version: 2.38.1(vue@3.4.25) pinia: specifier: ^2.1.7 - version: 2.1.7(typescript@5.2.2)(vue@3.4.21) + version: 2.1.7(typescript@5.2.2)(vue@3.4.25) pinia-plugin-persistedstate: specifier: ^3.2.0 version: 3.2.1(pinia@2.1.7) @@ -54,20 +54,20 @@ dependencies: specifier: ^1.6.0 version: 1.6.0 vue: - specifier: ^3.4.21 - version: 3.4.21(typescript@5.2.2) + specifier: ^3.4.25 + version: 3.4.25(typescript@5.2.2) vue-demi: specifier: 0.14.6 - version: 0.14.6(vue@3.4.21) + version: 0.14.6(vue@3.4.25) vue-hooks-plus: - specifier: 1.8.8 - version: 1.8.8(vue@3.4.21) + specifier: 1.9.0 + version: 1.9.0(vue@3.4.25) vue-i18n: specifier: ^9.9.0 - version: 9.9.0(vue@3.4.21) + version: 9.9.0(vue@3.4.25) vue-router: specifier: ^4.3.0 - version: 4.3.0(vue@3.4.21) + version: 4.3.0(vue@3.4.25) devDependencies: '@commitlint/cli': @@ -105,22 +105,22 @@ devDependencies: version: 6.21.0(eslint@8.57.0)(typescript@5.2.2) '@vitejs/plugin-vue': specifier: ^5.0.4 - version: 5.0.4(vite@5.2.8)(vue@3.4.21) + version: 5.0.4(vite@5.2.10)(vue@3.4.25) '@vitejs/plugin-vue-jsx': specifier: ^3.1.0 - version: 3.1.0(vite@5.2.8)(vue@3.4.21) + version: 3.1.0(vite@5.2.10)(vue@3.4.25) '@vitest/ui': specifier: 1.4.0 - version: 1.4.0(vitest@1.4.0) + version: 1.4.0(vitest@1.5.2) '@vue/eslint-config-prettier': specifier: ^9.0.0 version: 9.0.0(eslint@8.57.0)(prettier@3.2.5) '@vue/eslint-config-typescript': specifier: ^12.0.0 - version: 12.0.0(eslint-plugin-vue@9.19.2)(eslint@8.57.0)(typescript@5.2.2) + version: 12.0.0(eslint-plugin-vue@9.25.0)(eslint@8.57.0)(typescript@5.2.2) '@vue/test-utils': specifier: 2.4.3 - version: 2.4.3(vue@3.4.21) + version: 2.4.3(vue@3.4.25) autoprefixer: specifier: ^10.4.15 version: 10.4.16(postcss@8.4.38) @@ -143,8 +143,8 @@ devDependencies: specifier: ^6.1.1 version: 6.1.1(eslint@8.57.0) eslint-plugin-vue: - specifier: ^9.18.1 - version: 9.19.2(eslint@8.57.0) + specifier: ^9.25.0 + version: 9.25.0(eslint@8.57.0) happy-dom: specifier: 14.3.1 version: 14.3.1 @@ -177,49 +177,49 @@ devDependencies: version: 0.17.5(@vueuse/core@10.9.0) unplugin-vue-components: specifier: ^0.26.0 - version: 0.26.0(vue@3.4.21) + version: 0.26.0(vue@3.4.25) vite: - specifier: ^5.2.8 - version: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + specifier: ^5.2.10 + version: 5.2.10(@types/node@20.5.1)(sass@1.71.1) vite-bundle-analyzer: - specifier: 0.8.1 - version: 0.8.1 + specifier: 0.9.4 + version: 0.9.4 vite-plugin-cdn2: specifier: 1.1.0 version: 1.1.0 vite-plugin-compression: specifier: ^0.5.1 - version: 0.5.1(vite@5.2.8) + version: 0.5.1(vite@5.2.10) vite-plugin-ejs: specifier: ^1.7.0 - version: 1.7.0(vite@5.2.8) + version: 1.7.0(vite@5.2.10) vite-plugin-eslint: specifier: 1.8.1 - version: 1.8.1(eslint@8.57.0)(vite@5.2.8) + version: 1.8.1(eslint@8.57.0)(vite@5.2.10) vite-plugin-imp: specifier: ^2.4.0 - version: 2.4.0(vite@5.2.8) + version: 2.4.0(vite@5.2.10) vite-plugin-inspect: specifier: ^0.8.3 - version: 0.8.3(vite@5.2.8) + version: 0.8.3(vite@5.2.10) vite-plugin-mock-dev-server: specifier: 1.4.7 - version: 1.4.7(vite@5.2.8) + version: 1.4.7(vite@5.2.10) vite-plugin-svg-icons: specifier: ^2.0.1 - version: 2.0.1(vite@5.2.8) + version: 2.0.1(vite@5.2.10) vite-svg-loader: specifier: ^4.0.0 version: 4.0.0 vite-tsconfig-paths: specifier: 4.3.2 - version: 4.3.2(typescript@5.2.2)(vite@5.2.8) + version: 4.3.2(typescript@5.2.2)(vite@5.2.10) vitest: - specifier: 1.4.0 - version: 1.4.0(@types/node@20.5.1)(@vitest/ui@1.4.0)(happy-dom@14.3.1)(sass@1.71.1) + specifier: 1.5.2 + version: 1.5.2(@types/node@20.5.1)(@vitest/ui@1.4.0)(happy-dom@14.3.1)(sass@1.71.1) vue-tsc: - specifier: ^1.8.27 - version: 1.8.27(typescript@5.2.2) + specifier: ^2.0.11 + version: 2.0.11(typescript@5.2.2) packages: @@ -462,6 +462,14 @@ packages: hasBin: true dependencies: '@babel/types': 7.24.0 + dev: true + + /@babel/parser@7.24.4: + resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.24.0 /@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.1): resolution: {integrity: sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==} @@ -721,12 +729,12 @@ packages: css-render: 0.15.12 dev: false - /@css-render/vue3-ssr@0.15.12(vue@3.4.21): + /@css-render/vue3-ssr@0.15.12(vue@3.4.25): resolution: {integrity: sha512-AQLGhhaE0F+rwybRCkKUdzBdTEM/5PZBYy+fSYe1T9z9+yxMuV/k7ZRqa4M69X+EI1W8pa4kc9Iq2VjQkZx4rg==} peerDependencies: vue: ^3.0.11 dependencies: - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) dev: false /@emotion/hash@0.8.0: @@ -1233,7 +1241,7 @@ packages: magic-string: 0.30.8 mlly: 1.6.1 source-map-js: 1.2.0 - vue-i18n: 9.9.0(vue@3.4.21) + vue-i18n: 9.9.0(vue@3.4.25) yaml-eslint-parser: 1.2.2 dev: true @@ -1282,7 +1290,7 @@ packages: picocolors: 1.0.0 source-map-js: 1.2.0 unplugin: 1.10.0 - vue-i18n: 9.9.0(vue@3.4.21) + vue-i18n: 9.9.0(vue@3.4.25) transitivePeerDependencies: - rollup - supports-color @@ -1434,104 +1442,128 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/rollup-android-arm-eabi@4.13.0: - resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} + /@rollup/rollup-android-arm-eabi@4.14.3: + resolution: {integrity: sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==} cpu: [arm] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-android-arm64@4.13.0: - resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} + /@rollup/rollup-android-arm64@4.14.3: + resolution: {integrity: sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-arm64@4.13.0: - resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} + /@rollup/rollup-darwin-arm64@4.14.3: + resolution: {integrity: sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-x64@4.13.0: - resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} + /@rollup/rollup-darwin-x64@4.14.3: + resolution: {integrity: sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.13.0: - resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} + /@rollup/rollup-linux-arm-gnueabihf@4.14.3: + resolution: {integrity: sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.13.0: - resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} + /@rollup/rollup-linux-arm-musleabihf@4.14.3: + resolution: {integrity: sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.14.3: + resolution: {integrity: sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.13.0: - resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} + /@rollup/rollup-linux-arm64-musl@4.14.3: + resolution: {integrity: sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.13.0: - resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} + /@rollup/rollup-linux-powerpc64le-gnu@4.14.3: + resolution: {integrity: sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-riscv64-gnu@4.14.3: + resolution: {integrity: sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==} cpu: [riscv64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.13.0: - resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} + /@rollup/rollup-linux-s390x-gnu@4.14.3: + resolution: {integrity: sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.14.3: + resolution: {integrity: sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.13.0: - resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} + /@rollup/rollup-linux-x64-musl@4.14.3: + resolution: {integrity: sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.13.0: - resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} + /@rollup/rollup-win32-arm64-msvc@4.14.3: + resolution: {integrity: sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.13.0: - resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} + /@rollup/rollup-win32-ia32-msvc@4.14.3: + resolution: {integrity: sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.13.0: - resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} + /@rollup/rollup-win32-x64-msvc@4.14.3: + resolution: {integrity: sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==} cpu: [x64] os: [win32] requiresBuild: true @@ -1791,7 +1823,7 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@vitejs/plugin-vue-jsx@3.1.0(vite@5.2.8)(vue@3.4.21): + /@vitejs/plugin-vue-jsx@3.1.0(vite@5.2.10)(vue@3.4.25): resolution: {integrity: sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -1801,54 +1833,54 @@ packages: '@babel/core': 7.24.1 '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.24.1) '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.24.1) - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) - vue: 3.4.21(typescript@5.2.2) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) + vue: 3.4.25(typescript@5.2.2) transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue@5.0.4(vite@5.2.8)(vue@3.4.21): + /@vitejs/plugin-vue@5.0.4(vite@5.2.10)(vue@3.4.25): 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.2.8(@types/node@20.5.1)(sass@1.71.1) - vue: 3.4.21(typescript@5.2.2) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) + vue: 3.4.25(typescript@5.2.2) dev: true - /@vitest/expect@1.4.0: - resolution: {integrity: sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==} + /@vitest/expect@1.5.2: + resolution: {integrity: sha512-rf7MTD1WCoDlN3FfYJ9Llfp0PbdtOMZ3FIF0AVkDnKbp3oiMW1c8AmvRZBcqbAhDUAvF52e9zx4WQM1r3oraVA==} dependencies: - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 + '@vitest/spy': 1.5.2 + '@vitest/utils': 1.5.2 chai: 4.4.1 dev: true - /@vitest/runner@1.4.0: - resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==} + /@vitest/runner@1.5.2: + resolution: {integrity: sha512-7IJ7sJhMZrqx7HIEpv3WrMYcq8ZNz9L6alo81Y6f8hV5mIE6yVZsFoivLZmr0D777klm1ReqonE9LyChdcmw6g==} dependencies: - '@vitest/utils': 1.4.0 + '@vitest/utils': 1.5.2 p-limit: 5.0.0 pathe: 1.1.2 dev: true - /@vitest/snapshot@1.4.0: - resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==} + /@vitest/snapshot@1.5.2: + resolution: {integrity: sha512-CTEp/lTYos8fuCc9+Z55Ga5NVPKUgExritjF5VY7heRFUfheoAqBneUlvXSUJHUZPjnPmyZA96yLRJDP1QATFQ==} dependencies: - magic-string: 0.30.8 + magic-string: 0.30.10 pathe: 1.1.2 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.4.0: - resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==} + /@vitest/spy@1.5.2: + resolution: {integrity: sha512-xCcPvI8JpCtgikT9nLpHPL1/81AYqZy1GCy4+MCHBE7xi8jgsYkULpW5hrx5PGLgOQjUpb6fd15lqcriJ40tfQ==} dependencies: tinyspy: 2.2.1 dev: true - /@vitest/ui@1.4.0(vitest@1.4.0): + /@vitest/ui@1.4.0(vitest@1.5.2): resolution: {integrity: sha512-XC6CMhN1gzYcGbpn6/Oanj4Au2EXwQEX6vpcOeLlZv8dy7g11Ukx8zwtYQbwxs9duK2s9j2o5rbQiCP5DPAcmw==} peerDependencies: vitest: 1.4.0 @@ -1860,7 +1892,7 @@ packages: pathe: 1.1.2 picocolors: 1.0.0 sirv: 2.0.4 - vitest: 1.4.0(@types/node@20.5.1)(@vitest/ui@1.4.0)(happy-dom@14.3.1)(sass@1.71.1) + vitest: 1.5.2(@types/node@20.5.1)(@vitest/ui@1.4.0)(happy-dom@14.3.1)(sass@1.71.1) dev: true /@vitest/utils@1.4.0: @@ -1872,22 +1904,31 @@ packages: pretty-format: 29.7.0 dev: true - /@volar/language-core@1.11.1: - resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==} + /@vitest/utils@1.5.2: + resolution: {integrity: sha512-sWOmyofuXLJ85VvXNsroZur7mOJGiQeM0JN3/0D1uU8U9bGFM69X1iqHaRXl6R8BwaLY6yPCogP257zxTzkUdA==} dependencies: - '@volar/source-map': 1.11.1 + diff-sequences: 29.6.3 + estree-walker: 3.0.3 + loupe: 2.3.7 + pretty-format: 29.7.0 dev: true - /@volar/source-map@1.11.1: - resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==} + /@volar/language-core@2.2.0-alpha.9: + resolution: {integrity: sha512-9wgiVFa0crrG/C34VG43cG/ZWwXy2yOwYH0aTd3cvUT8RkEArXU7juNQkGAGIAqd2zepSDW+ooMMRDX4iKUudA==} dependencies: - muggle-string: 0.3.1 + '@volar/source-map': 2.2.0-alpha.9 dev: true - /@volar/typescript@1.11.1: - resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==} + /@volar/source-map@2.2.0-alpha.9: + resolution: {integrity: sha512-tYhpKfGVNzGZnMIYHNs2IlJsDf2e6/gUAVwF9bDkOtyaNsEYUMQGf6nAKRNDBbi0eMVajQJQJ3ZzinIeWPxtZw==} dependencies: - '@volar/language-core': 1.11.1 + muggle-string: 0.4.1 + dev: true + + /@volar/typescript@2.2.0-alpha.9: + resolution: {integrity: sha512-IApDOj4Bqkqg7xlX//rCKlVC8rw7YKX04h9E4iZCGyxzsj1JgOzfUKk/c/tUEux4Sgzoilnk+0CPqLs55sJmOA==} + dependencies: + '@volar/language-core': 2.2.0-alpha.9 path-browserify: 1.0.1 dev: true @@ -1928,8 +1969,8 @@ packages: '@babel/core': 7.24.1 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.24.0 - '@babel/parser': 7.24.1 - '@vue/compiler-sfc': 3.4.21 + '@babel/parser': 7.24.4 + '@vue/compiler-sfc': 3.4.25 dev: true /@vue/compiler-core@3.4.21: @@ -1940,12 +1981,29 @@ packages: entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.2.0 + dev: true + + /@vue/compiler-core@3.4.25: + resolution: {integrity: sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==} + dependencies: + '@babel/parser': 7.24.4 + '@vue/shared': 3.4.25 + entities: 4.5.0 + estree-walker: 2.0.2 + source-map-js: 1.2.0 /@vue/compiler-dom@3.4.21: resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==} dependencies: '@vue/compiler-core': 3.4.21 '@vue/shared': 3.4.21 + dev: true + + /@vue/compiler-dom@3.4.25: + resolution: {integrity: sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==} + dependencies: + '@vue/compiler-core': 3.4.25 + '@vue/shared': 3.4.25 /@vue/compiler-sfc@3.4.21: resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} @@ -1959,12 +2017,33 @@ packages: magic-string: 0.30.8 postcss: 8.4.38 source-map-js: 1.2.0 + dev: true + + /@vue/compiler-sfc@3.4.25: + resolution: {integrity: sha512-m7rryuqzIoQpOBZ18wKyq05IwL6qEpZxFZfRxlNYuIPDqywrXQxgUwLXIvoU72gs6cRdY6wHD0WVZIFE4OEaAQ==} + dependencies: + '@babel/parser': 7.24.4 + '@vue/compiler-core': 3.4.25 + '@vue/compiler-dom': 3.4.25 + '@vue/compiler-ssr': 3.4.25 + '@vue/shared': 3.4.25 + estree-walker: 2.0.2 + magic-string: 0.30.10 + postcss: 8.4.38 + source-map-js: 1.2.0 /@vue/compiler-ssr@3.4.21: resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==} dependencies: '@vue/compiler-dom': 3.4.21 '@vue/shared': 3.4.21 + dev: true + + /@vue/compiler-ssr@3.4.25: + resolution: {integrity: sha512-H2ohvM/Pf6LelGxDBnfbbXFPyM4NE3hrw0e/EpwuSiYu8c819wx+SVGdJ65p/sFrYDd6OnSDxN1MB2mN07hRSQ==} + dependencies: + '@vue/compiler-dom': 3.4.25 + '@vue/shared': 3.4.25 /@vue/devtools-api@6.6.1: resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==} @@ -1983,7 +2062,7 @@ packages: - '@types/eslint' dev: true - /@vue/eslint-config-typescript@12.0.0(eslint-plugin-vue@9.19.2)(eslint@8.57.0)(typescript@5.2.2): + /@vue/eslint-config-typescript@12.0.0(eslint-plugin-vue@9.25.0)(eslint@8.57.0)(typescript@5.2.2): resolution: {integrity: sha512-StxLFet2Qe97T8+7L8pGlhYBBr8Eg05LPuTDVopQV6il+SK6qqom59BA/rcFipUef2jD8P2X44Vd8tMFytfvlg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: @@ -1997,64 +2076,66 @@ packages: '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.2.2) '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.2.2) eslint: 8.57.0 - eslint-plugin-vue: 9.19.2(eslint@8.57.0) + eslint-plugin-vue: 9.25.0(eslint@8.57.0) typescript: 5.2.2 vue-eslint-parser: 9.3.2(eslint@8.57.0) transitivePeerDependencies: - supports-color dev: true - /@vue/language-core@1.8.27(typescript@5.2.2): - resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==} + /@vue/language-core@2.0.11(typescript@5.2.2): + resolution: {integrity: sha512-5ivg8Vem/yckzXI3L3n0mdKBPRcHSlsGt6/dpbEx42PcH3MIHAjSAJBYvENXeWJxv2ClQc8BS2mH1Ho2U7jZig==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@volar/language-core': 1.11.1 - '@volar/source-map': 1.11.1 - '@vue/compiler-dom': 3.4.21 - '@vue/shared': 3.4.21 + '@volar/language-core': 2.2.0-alpha.9 + '@vue/compiler-dom': 3.4.25 + '@vue/shared': 3.4.25 computeds: 0.0.1 - minimatch: 9.0.3 - muggle-string: 0.3.1 + minimatch: 9.0.4 path-browserify: 1.0.1 typescript: 5.2.2 vue-template-compiler: 2.7.16 dev: true - /@vue/reactivity@3.4.21: - resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==} + /@vue/reactivity@3.4.25: + resolution: {integrity: sha512-mKbEtKr1iTxZkAG3vm3BtKHAOhuI4zzsVcN0epDldU/THsrvfXRKzq+lZnjczZGnTdh3ojd86/WrP+u9M51pWQ==} dependencies: - '@vue/shared': 3.4.21 + '@vue/shared': 3.4.25 - /@vue/runtime-core@3.4.21: - resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==} + /@vue/runtime-core@3.4.25: + resolution: {integrity: sha512-3qhsTqbEh8BMH3pXf009epCI5E7bKu28fJLi9O6W+ZGt/6xgSfMuGPqa5HRbUxLoehTNp5uWvzCr60KuiRIL0Q==} dependencies: - '@vue/reactivity': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/reactivity': 3.4.25 + '@vue/shared': 3.4.25 - /@vue/runtime-dom@3.4.21: - resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==} + /@vue/runtime-dom@3.4.25: + resolution: {integrity: sha512-ode0sj77kuwXwSc+2Yhk8JMHZh1sZp9F/51wdBiz3KGaWltbKtdihlJFhQG4H6AY+A06zzeMLkq6qu8uDSsaoA==} dependencies: - '@vue/runtime-core': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/runtime-core': 3.4.25 + '@vue/shared': 3.4.25 csstype: 3.1.3 - /@vue/server-renderer@3.4.21(vue@3.4.21): - resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==} + /@vue/server-renderer@3.4.25(vue@3.4.25): + resolution: {integrity: sha512-8VTwq0Zcu3K4dWV0jOwIVINESE/gha3ifYCOKEhxOj6MEl5K5y8J8clQncTcDhKF+9U765nRw4UdUEXvrGhyVQ==} peerDependencies: - vue: 3.4.21 + vue: 3.4.25 dependencies: - '@vue/compiler-ssr': 3.4.21 - '@vue/shared': 3.4.21 - vue: 3.4.21(typescript@5.2.2) + '@vue/compiler-ssr': 3.4.25 + '@vue/shared': 3.4.25 + vue: 3.4.25(typescript@5.2.2) /@vue/shared@3.4.21: resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} + dev: true - /@vue/test-utils@2.4.3(vue@3.4.21): + /@vue/shared@3.4.25: + resolution: {integrity: sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==} + + /@vue/test-utils@2.4.3(vue@3.4.25): resolution: {integrity: sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==} peerDependencies: '@vue/server-renderer': ^3.0.1 @@ -2064,17 +2145,17 @@ packages: optional: true dependencies: js-beautify: 1.14.11 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) vue-component-type-helpers: 1.8.26 dev: true - /@vueuse/core@10.9.0(vue@3.4.21): + /@vueuse/core@10.9.0(vue@3.4.25): resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==} dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.9.0 - '@vueuse/shared': 10.9.0(vue@3.4.21) - vue-demi: 0.14.7(vue@3.4.21) + '@vueuse/shared': 10.9.0(vue@3.4.25) + vue-demi: 0.14.7(vue@3.4.25) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -2082,10 +2163,10 @@ packages: /@vueuse/metadata@10.9.0: resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==} - /@vueuse/shared@10.9.0(vue@3.4.21): + /@vueuse/shared@10.9.0(vue@3.4.25): resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.7(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.25) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -2360,7 +2441,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-object-atoms: 1.0.0 get-intrinsic: 1.2.4 is-string: 1.0.7 @@ -2382,7 +2463,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-errors: 1.3.0 es-object-atoms: 1.0.0 es-shim-unscopables: 1.0.2 @@ -2394,7 +2475,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-shim-unscopables: 1.0.2 dev: true @@ -2404,7 +2485,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-shim-unscopables: 1.0.2 dev: true @@ -2415,7 +2496,7 @@ packages: array-buffer-byte-length: 1.0.1 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-errors: 1.3.0 get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 @@ -2527,11 +2608,6 @@ 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 @@ -2549,13 +2625,6 @@ 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: @@ -2616,19 +2685,12 @@ packages: engines: {node: '>=6'} dev: true - /builtins@5.0.1: - resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} + /builtins@5.1.0: + resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==} dependencies: semver: 7.6.0 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'} @@ -3267,29 +3329,11 @@ 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'} @@ -3612,8 +3656,8 @@ packages: resolution: {integrity: sha512-g/9rfnvnagiNf+DRMHEVGuGuIBlCIMDFoTA616HaP2l9PlCjGjVhD98PNbVSJvmK4TttqT5mV5tInMhoFgi+aA==} dev: true - /es-abstract@1.23.2: - resolution: {integrity: sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==} + /es-abstract@1.23.3: + resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 @@ -3799,13 +3843,14 @@ packages: source-map: 0.6.1 dev: true - /eslint-compat-utils@0.1.2(eslint@8.57.0): - resolution: {integrity: sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==} + /eslint-compat-utils@0.5.0(eslint@8.57.0): + resolution: {integrity: sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==} engines: {node: '>=12'} peerDependencies: eslint: '>=6.0.0' dependencies: eslint: 8.57.0 + semver: 7.6.0 dev: true /eslint-config-prettier@9.1.0(eslint@8.57.0): @@ -3893,8 +3938,8 @@ packages: - supports-color dev: true - /eslint-plugin-es-x@7.5.0(eslint@8.57.0): - resolution: {integrity: sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==} + /eslint-plugin-es-x@7.6.0(eslint@8.57.0): + resolution: {integrity: sha512-I0AmeNgevgaTR7y2lrVCJmGYF0rjoznpDvqV/kIkZSZbZ8Rw3eu4cGlvBBULScfkSOCzqKbff5LR4CNrV7mZHA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: eslint: '>=8' @@ -3902,7 +3947,7 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@eslint-community/regexpp': 4.10.0 eslint: 8.57.0 - eslint-compat-utils: 0.1.2(eslint@8.57.0) + eslint-compat-utils: 0.5.0(eslint@8.57.0) dev: true /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.57.0): @@ -3947,10 +3992,10 @@ packages: eslint: '>=7.0.0' dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - builtins: 5.0.1 + builtins: 5.1.0 eslint: 8.57.0 - eslint-plugin-es-x: 7.5.0(eslint@8.57.0) - get-tsconfig: 4.7.2 + eslint-plugin-es-x: 7.6.0(eslint@8.57.0) + get-tsconfig: 4.7.3 globals: 13.24.0 ignore: 5.3.1 is-builtin-module: 3.2.1 @@ -3990,19 +4035,20 @@ packages: eslint: 8.57.0 dev: true - /eslint-plugin-vue@9.19.2(eslint@8.57.0): - resolution: {integrity: sha512-CPDqTOG2K4Ni2o4J5wixkLVNwgctKXFu6oBpVJlpNq7f38lh9I80pRTouZSJ2MAebPJlINU/KTFSXyQfBUlymA==} + /eslint-plugin-vue@9.25.0(eslint@8.57.0): + resolution: {integrity: sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: - eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 + eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) eslint: 8.57.0 + globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 - postcss-selector-parser: 6.0.15 + postcss-selector-parser: 6.0.16 semver: 7.6.0 - vue-eslint-parser: 9.3.2(eslint@8.57.0) + vue-eslint-parser: 9.4.2(eslint@8.57.0) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -4144,21 +4190,6 @@ 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.3.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'} @@ -4441,7 +4472,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 functions-have-names: 1.2.3 dev: true @@ -4512,8 +4543,8 @@ packages: get-intrinsic: 1.2.4 dev: true - /get-tsconfig@4.7.2: - resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} + /get-tsconfig@4.7.3: + resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} dependencies: resolve-pkg-maps: 1.0.0 dev: true @@ -4833,11 +4864,6 @@ 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'} @@ -5025,12 +5051,6 @@ packages: is-data-descriptor: 1.0.1 dev: true - /is-docker@2.2.1: - resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} - engines: {node: '>=8'} - hasBin: true - dev: true - /is-docker@3.0.0: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -5195,13 +5215,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /is-wsl@2.2.0: - resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} - engines: {node: '>=8'} - dependencies: - is-docker: 2.2.1 - dev: true - /is-wsl@3.1.0: resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} engines: {node: '>=16'} @@ -5281,8 +5294,8 @@ packages: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true - /js-tokens@8.0.3: - resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==} + /js-tokens@9.0.0: + resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} dev: true /js-yaml@3.14.1: @@ -5578,11 +5591,17 @@ packages: dependencies: yallist: 4.0.0 + /magic-string@0.30.10: + resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + /magic-string@0.30.8: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + dev: true /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} @@ -5759,6 +5778,13 @@ packages: brace-expansion: 2.0.1 dev: true + /minimatch@9.0.4: + resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -5847,8 +5873,8 @@ packages: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} dev: true - /muggle-string@0.3.1: - resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==} + /muggle-string@0.4.1: + resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} dev: true /multimatch@5.0.0: @@ -5862,13 +5888,13 @@ packages: minimatch: 3.1.2 dev: true - /naive-ui@2.38.1(vue@3.4.21): + /naive-ui@2.38.1(vue@3.4.25): 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.21) + '@css-render/vue3-ssr': 0.15.12(vue@3.4.25) '@types/katex': 0.16.7 '@types/lodash': 4.17.0 '@types/lodash-es': 4.17.12 @@ -5883,10 +5909,10 @@ packages: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - 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) + vdirs: 0.1.8(vue@3.4.25) + vooks: 0.2.12(vue@3.4.25) + vue: 3.4.25(typescript@5.2.2) + vueuc: 0.4.58(vue@3.4.25) dev: false /nan@2.19.0: @@ -6062,7 +6088,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-object-atoms: 1.0.0 dev: true @@ -6072,7 +6098,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 dev: true /object.pick@1.3.0: @@ -6120,16 +6146,6 @@ packages: is-wsl: 3.1.0 dev: true - /open@9.1.0: - resolution: {integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==} - engines: {node: '>=14.16'} - dependencies: - default-browser: 4.0.0 - define-lazy-prop: 3.0.0 - is-inside-container: 1.0.0 - is-wsl: 2.2.0 - dev: true - /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} @@ -6302,10 +6318,10 @@ packages: peerDependencies: pinia: ^2.0.0 dependencies: - pinia: 2.1.7(typescript@5.2.2)(vue@3.4.21) + pinia: 2.1.7(typescript@5.2.2)(vue@3.4.25) dev: false - /pinia@2.1.7(typescript@5.2.2)(vue@3.4.21): + /pinia@2.1.7(typescript@5.2.2)(vue@3.4.25): resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==} peerDependencies: '@vue/composition-api': ^1.4.0 @@ -6319,8 +6335,8 @@ packages: dependencies: '@vue/devtools-api': 6.6.1 typescript: 5.2.2 - vue: 3.4.21(typescript@5.2.2) - vue-demi: 0.14.6(vue@3.4.21) + vue: 3.4.25(typescript@5.2.2) + vue-demi: 0.14.6(vue@3.4.25) dev: false /pkg-types@1.0.3: @@ -6361,8 +6377,8 @@ packages: object-assign: 4.1.1 dev: true - /postcss-selector-parser@6.0.15: - resolution: {integrity: sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==} + /postcss-selector-parser@6.0.16: + resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==} engines: {node: '>=4'} dependencies: cssesc: 3.0.0 @@ -6475,6 +6491,14 @@ packages: engines: {node: '>=0.6'} dependencies: side-channel: 1.0.6 + dev: true + + /qs@6.12.1: + resolution: {integrity: sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==} + engines: {node: '>=0.6'} + dependencies: + side-channel: 1.0.6 + dev: false /query-string@4.3.4: resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==} @@ -6684,26 +6708,29 @@ packages: fsevents: 2.3.3 dev: true - /rollup@4.13.0: - resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} + /rollup@4.14.3: + resolution: {integrity: sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.13.0 - '@rollup/rollup-android-arm64': 4.13.0 - '@rollup/rollup-darwin-arm64': 4.13.0 - '@rollup/rollup-darwin-x64': 4.13.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 - '@rollup/rollup-linux-arm64-gnu': 4.13.0 - '@rollup/rollup-linux-arm64-musl': 4.13.0 - '@rollup/rollup-linux-riscv64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-musl': 4.13.0 - '@rollup/rollup-win32-arm64-msvc': 4.13.0 - '@rollup/rollup-win32-ia32-msvc': 4.13.0 - '@rollup/rollup-win32-x64-msvc': 4.13.0 + '@rollup/rollup-android-arm-eabi': 4.14.3 + '@rollup/rollup-android-arm64': 4.14.3 + '@rollup/rollup-darwin-arm64': 4.14.3 + '@rollup/rollup-darwin-x64': 4.14.3 + '@rollup/rollup-linux-arm-gnueabihf': 4.14.3 + '@rollup/rollup-linux-arm-musleabihf': 4.14.3 + '@rollup/rollup-linux-arm64-gnu': 4.14.3 + '@rollup/rollup-linux-arm64-musl': 4.14.3 + '@rollup/rollup-linux-powerpc64le-gnu': 4.14.3 + '@rollup/rollup-linux-riscv64-gnu': 4.14.3 + '@rollup/rollup-linux-s390x-gnu': 4.14.3 + '@rollup/rollup-linux-x64-gnu': 4.14.3 + '@rollup/rollup-linux-x64-musl': 4.14.3 + '@rollup/rollup-win32-arm64-msvc': 4.14.3 + '@rollup/rollup-win32-ia32-msvc': 4.14.3 + '@rollup/rollup-win32-x64-msvc': 4.14.3 fsevents: 2.3.3 dev: true @@ -6723,13 +6750,6 @@ 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'} @@ -7126,7 +7146,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-object-atoms: 1.0.0 dev: true @@ -7205,10 +7225,10 @@ packages: acorn: 8.11.3 dev: true - /strip-literal@2.0.0: - resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==} + /strip-literal@2.1.0: + resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} dependencies: - js-tokens: 8.0.3 + js-tokens: 9.0.0 dev: true /supports-color@2.0.0: @@ -7306,8 +7326,8 @@ packages: stable: 0.1.8 dev: true - /svgo@3.1.0: - resolution: {integrity: sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA==} + /svgo@3.2.0: + resolution: {integrity: sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -7368,12 +7388,12 @@ packages: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} dev: false - /tinybench@2.6.0: - resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} + /tinybench@2.8.0: + resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} dev: true - /tinypool@0.8.2: - resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==} + /tinypool@0.8.4: + resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} engines: {node: '>=14.0.0'} dev: true @@ -7382,11 +7402,6 @@ packages: engines: {node: '>=14.0.0'} dev: true - /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'} @@ -7696,7 +7711,7 @@ packages: dependencies: '@antfu/utils': 0.7.7 '@rollup/pluginutils': 5.1.0 - '@vueuse/core': 10.9.0(vue@3.4.21) + '@vueuse/core': 10.9.0(vue@3.4.25) fast-glob: 3.3.2 local-pkg: 0.5.0 magic-string: 0.30.8 @@ -7707,7 +7722,7 @@ packages: - rollup dev: true - /unplugin-vue-components@0.26.0(vue@3.4.21): + /unplugin-vue-components@0.26.0(vue@3.4.25): resolution: {integrity: sha512-s7IdPDlnOvPamjunVxw8kNgKNK8A5KM1YpK5j/p97jEKTjlPNrA0nZBiSfAKKlK1gWZuyWXlKL5dk3EDw874LQ==} engines: {node: '>=14'} peerDependencies: @@ -7730,7 +7745,7 @@ packages: minimatch: 9.0.3 resolve: 1.22.8 unplugin: 1.10.0 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) transitivePeerDependencies: - rollup - supports-color @@ -7754,11 +7769,6 @@ 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.13(browserslist@4.23.0): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true @@ -7811,27 +7821,24 @@ packages: engines: {node: '>= 0.8'} dev: true - /vdirs@0.1.8(vue@3.4.21): + /vdirs@0.1.8(vue@3.4.25): resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: vue: ^3.0.11 dependencies: evtd: 0.2.4 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) dev: false - /vite-bundle-analyzer@0.8.1: - resolution: {integrity: sha512-UC++agsRR6Xg7svFt+fzBarYSIKyZZUr7WQx0e0HcPkebfKoWxu5TcT5zQ9V+35hCXB1cVo5sZm/gNyuvt6KWA==} + /vite-bundle-analyzer@0.9.4: + resolution: {integrity: sha512-a/w4ShKQEbTe7wllLXI+3D8ELgRv7iHDuWEPaXokA+FhWBXJCdtOZYIvLzvnn8vxHf+7pm1c23AeGyW/0Ge0Yw==} 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-node@1.4.0(@types/node@20.5.1)(sass@1.71.1): - resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} + /vite-node@1.5.2(@types/node@20.5.1)(sass@1.71.1): + resolution: {integrity: sha512-Y8p91kz9zU+bWtF7HGt6DVw2JbhyuB2RlZix3FPYAYmUyZ3n7iTp8eSyLyY6sxtPegvxQtmlTMhfPhUfCUF93A==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -7839,7 +7846,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - '@types/node' - less @@ -7865,7 +7872,7 @@ packages: - supports-color dev: true - /vite-plugin-compression@0.5.1(vite@5.2.8): + /vite-plugin-compression@0.5.1(vite@5.2.10): resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -7873,21 +7880,21 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-ejs@1.7.0(vite@5.2.8): + /vite-plugin-ejs@1.7.0(vite@5.2.10): resolution: {integrity: sha512-JNP3zQDC4mSbfoJ3G73s5mmZITD8NGjUmLkq4swxyahy/W0xuokK9U9IJGXw7KCggq6UucT6hJ0p+tQrNtqTZw==} peerDependencies: vite: '>=5.0.0' dependencies: ejs: 3.1.9 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) dev: true - /vite-plugin-eslint@1.8.1(eslint@8.57.0)(vite@5.2.8): + /vite-plugin-eslint@1.8.1(eslint@8.57.0)(vite@5.2.10): resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==} peerDependencies: eslint: '>=7' @@ -7897,10 +7904,10 @@ packages: '@types/eslint': 8.56.6 eslint: 8.57.0 rollup: 2.79.1 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) dev: true - /vite-plugin-imp@2.4.0(vite@5.2.8): + /vite-plugin-imp@2.4.0(vite@5.2.10): resolution: {integrity: sha512-L/6/nvOw+MyNh4UxAlCZHsmKd5MitmHamqqAWB15sbUgVIEz/OQ8jpKr6kkQU0eA/AIe8fkCVbQBlP81ajrqWg==} peerDependencies: vite: '>= 2.0.0-beta.5' @@ -7912,12 +7919,12 @@ packages: chalk: 4.1.2 param-case: 3.0.4 pascal-case: 3.1.2 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-inspect@0.8.3(vite@5.2.8): + /vite-plugin-inspect@0.8.3(vite@5.2.10): resolution: {integrity: sha512-SBVzOIdP/kwe6hjkt7LSW4D0+REqqe58AumcnCfRNw4Kt3mbS9pEBkch+nupu2PBxv2tQi69EQHQ1ZA1vgB/Og==} engines: {node: '>=14'} peerDependencies: @@ -7936,13 +7943,13 @@ packages: perfect-debounce: 1.0.0 picocolors: 1.0.0 sirv: 2.0.4 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - rollup - supports-color dev: true - /vite-plugin-mock-dev-server@1.4.7(vite@5.2.8): + /vite-plugin-mock-dev-server@1.4.7(vite@5.2.10): resolution: {integrity: sha512-vGNW423fkmMibf0BfYL89n2n4tNKDt51d6Ee14gC1LlLiJAp6jabJBPsjWgU+uMgtp68+1uBb5F1qTlqdAhnoQ==} engines: {node: ^16 || ^18 || >= 20} peerDependencies: @@ -7964,7 +7971,7 @@ packages: mime-types: 2.1.35 path-to-regexp: 6.2.1 picocolors: 1.0.0 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) ws: 8.16.0 transitivePeerDependencies: - bufferutil @@ -7973,7 +7980,7 @@ packages: - utf-8-validate dev: true - /vite-plugin-svg-icons@2.0.1(vite@5.2.8): + /vite-plugin-svg-icons@2.0.1(vite@5.2.10): resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -7986,7 +7993,7 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true @@ -7995,10 +8002,10 @@ packages: resolution: {integrity: sha512-0MMf1yzzSYlV4MGePsLVAOqXsbF5IVxbn4EEzqRnWxTQl8BJg/cfwIzfQNmNQxZp5XXwd4kyRKF1LytuHZTnqA==} dependencies: '@vue/compiler-sfc': 3.4.21 - svgo: 3.1.0 + svgo: 3.2.0 dev: true - /vite-tsconfig-paths@4.3.2(typescript@5.2.2)(vite@5.2.8): + /vite-tsconfig-paths@4.3.2(typescript@5.2.2)(vite@5.2.10): resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==} peerDependencies: vite: '*' @@ -8009,14 +8016,14 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.2.2) - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color - typescript dev: true - /vite@5.2.8(@types/node@20.5.1)(sass@1.71.1): - resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==} + /vite@5.2.10(@types/node@20.5.1)(sass@1.71.1): + resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -8046,21 +8053,21 @@ packages: '@types/node': 20.5.1 esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.13.0 + rollup: 4.14.3 sass: 1.71.1 optionalDependencies: fsevents: 2.3.3 dev: true - /vitest@1.4.0(@types/node@20.5.1)(@vitest/ui@1.4.0)(happy-dom@14.3.1)(sass@1.71.1): - resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} + /vitest@1.5.2(@types/node@20.5.1)(@vitest/ui@1.4.0)(happy-dom@14.3.1)(sass@1.71.1): + resolution: {integrity: sha512-l9gwIkq16ug3xY7BxHwcBQovLZG75zZL0PlsiYQbf76Rz6QGs54416UWMtC0jXeihvHvcHrf2ROEjkQRVpoZYw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.4.0 - '@vitest/ui': 1.4.0 + '@vitest/browser': 1.5.2 + '@vitest/ui': 1.5.2 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -8078,27 +8085,27 @@ packages: optional: true dependencies: '@types/node': 20.5.1 - '@vitest/expect': 1.4.0 - '@vitest/runner': 1.4.0 - '@vitest/snapshot': 1.4.0 - '@vitest/spy': 1.4.0 - '@vitest/ui': 1.4.0(vitest@1.4.0) - '@vitest/utils': 1.4.0 + '@vitest/expect': 1.5.2 + '@vitest/runner': 1.5.2 + '@vitest/snapshot': 1.5.2 + '@vitest/spy': 1.5.2 + '@vitest/ui': 1.4.0(vitest@1.5.2) + '@vitest/utils': 1.5.2 acorn-walk: 8.3.2 chai: 4.4.1 debug: 4.3.4 execa: 8.0.1 happy-dom: 14.3.1 local-pkg: 0.5.0 - magic-string: 0.30.8 + magic-string: 0.30.10 pathe: 1.1.2 picocolors: 1.0.0 std-env: 3.7.0 - strip-literal: 2.0.0 - tinybench: 2.6.0 - tinypool: 0.8.2 - vite: 5.2.8(@types/node@20.5.1)(sass@1.71.1) - vite-node: 1.4.0(@types/node@20.5.1)(sass@1.71.1) + strip-literal: 2.1.0 + tinybench: 2.8.0 + tinypool: 0.8.4 + vite: 5.2.10(@types/node@20.5.1)(sass@1.71.1) + vite-node: 1.5.2(@types/node@20.5.1)(sass@1.71.1) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -8110,20 +8117,20 @@ packages: - terser dev: true - /vooks@0.2.12(vue@3.4.21): + /vooks@0.2.12(vue@3.4.25): resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==} peerDependencies: vue: ^3.0.0 dependencies: evtd: 0.2.4 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) dev: false /vue-component-type-helpers@1.8.26: resolution: {integrity: sha512-CIwb7s8cqUuPpHDk+0DY8EJ/x8tzdzqw8ycX8hhw1GnbngTgSsIceHAqrrLjmv8zXi+j5XaiqYRQMw8sKyyjkw==} dev: true - /vue-demi@0.14.6(vue@3.4.21): + /vue-demi@0.14.6(vue@3.4.25): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -8135,10 +8142,10 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) dev: false - /vue-demi@0.14.7(vue@3.4.21): + /vue-demi@0.14.7(vue@3.4.25): resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} engines: {node: '>=12'} hasBin: true @@ -8150,7 +8157,7 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) /vue-eslint-parser@9.3.2(eslint@8.57.0): resolution: {integrity: sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==} @@ -8170,8 +8177,26 @@ packages: - supports-color dev: true - /vue-hooks-plus@1.8.8(vue@3.4.21): - resolution: {integrity: sha512-ts7dCSjTYIBHGzgXNheKmb9ky21rlYMCoie84AAKAnJn50fh7mFMTekEw41hfT9jACu3GKu0el+mG/+jQtbs7Q==} + /vue-eslint-parser@9.4.2(eslint@8.57.0): + resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==} + engines: {node: ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + dependencies: + debug: 4.3.4 + eslint: 8.57.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 + lodash: 4.17.21 + semver: 7.6.0 + transitivePeerDependencies: + - supports-color + dev: true + + /vue-hooks-plus@1.9.0(vue@3.4.25): + resolution: {integrity: sha512-LN2EClFHPPtNBlLMg1dlvywFiqex7eGrv/8xQC+EQJj1evL2hOZ1MO6CGccRucw4zkkD23y6RdIH0Ub839RYUQ==} peerDependencies: vue: ^3.2.25 dependencies: @@ -8179,13 +8204,13 @@ packages: '@vue/devtools-api': 6.6.1 js-cookie: 3.0.5 lodash: 4.17.21 - qs: 6.12.0 + qs: 6.12.1 query-string: 7.1.3 screenfull: 5.2.0 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) dev: false - /vue-i18n@9.9.0(vue@3.4.21): + /vue-i18n@9.9.0(vue@3.4.25): resolution: {integrity: sha512-xQ5SxszUAqK5n84N+uUyHH/PiQl9xZ24FOxyAaNonmOQgXeN+rD9z/6DStOpOxNFQn4Cgcquot05gZc+CdOujA==} engines: {node: '>= 16'} peerDependencies: @@ -8194,15 +8219,15 @@ packages: '@intlify/core-base': 9.9.0 '@intlify/shared': 9.9.0 '@vue/devtools-api': 6.6.1 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) - /vue-router@4.3.0(vue@3.4.21): + /vue-router@4.3.0(vue@3.4.25): resolution: {integrity: sha512-dqUcs8tUeG+ssgWhcPbjHvazML16Oga5w34uCUmsk7i0BcnskoLGwjpa15fqMr2Fa5JgVBrdL2MEgqz6XZ/6IQ==} peerDependencies: vue: ^3.2.0 dependencies: '@vue/devtools-api': 6.6.1 - vue: 3.4.21(typescript@5.2.2) + vue: 3.4.25(typescript@5.2.2) dev: false /vue-template-compiler@2.7.16: @@ -8212,46 +8237,46 @@ packages: he: 1.2.0 dev: true - /vue-tsc@1.8.27(typescript@5.2.2): - resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==} + /vue-tsc@2.0.11(typescript@5.2.2): + resolution: {integrity: sha512-dl5MEU4VGZdQFGBnKfPpAfV3SQmBDWs9o4YhUPvDmwk+zmb/RprzFJK2sagR6EWazogZhXENvykd3wBXWS9kng==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@volar/typescript': 1.11.1 - '@vue/language-core': 1.8.27(typescript@5.2.2) + '@volar/typescript': 2.2.0-alpha.9 + '@vue/language-core': 2.0.11(typescript@5.2.2) semver: 7.6.0 typescript: 5.2.2 dev: true - /vue@3.4.21(typescript@5.2.2): - resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} + /vue@3.4.25(typescript@5.2.2): + resolution: {integrity: sha512-HWyDqoBHMgav/OKiYA2ZQg+kjfMgLt/T0vg4cbIF7JbXAjDexRf5JRg+PWAfrAkSmTd2I8aPSXtooBFWHB98cg==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.21 - '@vue/compiler-sfc': 3.4.21 - '@vue/runtime-dom': 3.4.21 - '@vue/server-renderer': 3.4.21(vue@3.4.21) - '@vue/shared': 3.4.21 + '@vue/compiler-dom': 3.4.25 + '@vue/compiler-sfc': 3.4.25 + '@vue/runtime-dom': 3.4.25 + '@vue/server-renderer': 3.4.25(vue@3.4.25) + '@vue/shared': 3.4.25 typescript: 5.2.2 - /vueuc@0.4.58(vue@3.4.21): + /vueuc@0.4.58(vue@3.4.25): 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.21) + '@css-render/vue3-ssr': 0.15.12(vue@3.4.25) '@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.21) - vooks: 0.2.12(vue@3.4.21) - vue: 3.4.21(typescript@5.2.2) + vdirs: 0.1.8(vue@3.4.25) + vooks: 0.2.12(vue@3.4.25) + vue: 3.4.25(typescript@5.2.2) dev: false /webidl-conversions@3.0.1: diff --git a/src/app-components/app/AppAvatar/index.tsx b/src/app-components/app/AppAvatar/index.tsx index 419a0e34..246e58b6 100644 --- a/src/app-components/app/AppAvatar/index.tsx +++ b/src/app-components/app/AppAvatar/index.tsx @@ -19,27 +19,26 @@ import './index.scss' -import { NAvatar, NFlex } from 'naive-ui' +import { NAvatar, NButton, NFlex } from 'naive-ui' -import { avatarProps, flexProps } from 'naive-ui' +import { avatarProps } from 'naive-ui' import { APP_CATCH_KEY } from '@/app-config' import { getStorage } from '@/utils' import type { PropType } from 'vue' -import type { AvatarProps, SpaceProps } from 'naive-ui' +import type { AvatarProps, FlexProps } from 'naive-ui' import type { SigningCallback } from '@/store/modules/signing/types' const AppAvatar = defineComponent({ name: 'AppAvatar', props: { ...avatarProps, - ...flexProps, cursor: { type: String, default: 'auto', }, spaceSize: { - type: [String, Number] as PropType, + type: [String, Number, Array] as PropType, default: 'medium', }, avatarSize: { @@ -49,39 +48,27 @@ const AppAvatar = defineComponent({ }, setup(props) { const signing = getStorage(APP_CATCH_KEY.signing) - const cssVars = computed(() => { - const vars = { - '--app-avatar-cursor': props.cursor, - } - - return vars - }) return { signing, - cssVars, } }, render() { - const { signing, cssVars, spaceSize, avatarSize, $props } = this + const { signing, avatarSize, spaceSize, $props } = this return ( - - -
{signing?.name}
- + + + + {signing?.name} + + ) }, }) diff --git a/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx b/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx index d3c1bfdf..ba3933eb 100644 --- a/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx +++ b/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx @@ -12,7 +12,6 @@ /** 锁屏界面 */ import { NInput, NForm, NFormItem, NButton } from 'naive-ui' -import AppAvatar from '@/app-components/app/AppAvatar' import useAppLockScreen from '@/app-components/app/AppLockScreen/appLockVar' import { rules, useCondition } from '@/app-components/app/AppLockScreen/shared' @@ -61,7 +60,6 @@ const LockScreen = defineComponent({ render() { return (
-
- +
diff --git a/src/app-components/provider/AppNaiveGlobalProvider/index.tsx b/src/app-components/provider/AppNaiveGlobalProvider/index.tsx index 219a83a8..f0b042fa 100644 --- a/src/app-components/provider/AppNaiveGlobalProvider/index.tsx +++ b/src/app-components/provider/AppNaiveGlobalProvider/index.tsx @@ -31,6 +31,7 @@ import { import { getNaiveLocales } from '@/locales/utils' import { useSettingGetters } from '@/store' +import { MESSAGE_PROVIDER } from '@/app-config' export default defineComponent({ name: 'GlobalProvider', @@ -92,7 +93,7 @@ export default defineComponent({ dateLocale={localePackage.dateLocal} > - + diff --git a/src/app-config/app-config.ts b/src/app-config/app-config.ts index 90a96808..7ee24cf5 100644 --- a/src/app-config/app-config.ts +++ b/src/app-config/app-config.ts @@ -13,6 +13,20 @@ import type { LayoutSideBarLogo, PreloadingConfig } from '@/types' import type { AppMenuConfig, AppKeepAlive } from '@/types' +import type { MessageProviderProps } from 'naive-ui' + +/** + * + * @description + * 配置 MessageProver 组件。 + * 该配置项会影响到全局 Message 组件的默认配置。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/message#MessageProvider-Props + */ +export const MESSAGE_PROVIDER: MessageProviderProps = { + max: 5, + closable: false, +} /** * @@ -57,12 +71,12 @@ export const PRE_LOADING_CONFIG: PreloadingConfig = { /** * - * icon: LOGO 图标, 依赖 `RIcon` 实现(如果为空则不会渲染图标) + * icon: LOGO 图标， 依赖 `RIcon` 实现(如果为空则不会渲染图标)；4.8.2 版本后支持 VNode * title: LOGO 标题 - * url: 点击跳转地址, 如果不配置该属性, 则不会触发跳转 - * jumpType: 跳转类型(station: 项目内跳转, outsideStation: 新页面打开) + * url: 点击跳转地址， 如果不配置该属性， 则不会触发跳转 + * jumpType: 跳转类型(station: 项目内跳转， outsideStation: 新页面打开) * - * 如果不设置该属性或者为空, 则不会渲染 LOGO + * 如果不设置该属性或者为空， 则不会渲染 LOGO */ export const SIDE_BAR_LOGO: LayoutSideBarLogo | undefined = { icon: 'ray', diff --git a/src/app-config/router-config.ts b/src/app-config/router-config.ts index cb7c933b..c8e07d12 100644 --- a/src/app-config/router-config.ts +++ b/src/app-config/router-config.ts @@ -12,9 +12,11 @@ /** vue-router 相关配置入口 */ import type { LayoutInst } from 'naive-ui' +import type { Ref } from 'vue' /** * + * @description * 内容区域 ref 注册 * 可以控制内容区域当前滚动位置 * 如果你需要在切换路由时候配置自定义滚动到某个视图区域时, 可以使用该属性提供的方法(scrollTo) @@ -22,13 +24,27 @@ import type { LayoutInst } from 'naive-ui' * 请注意 * 如果你动态的添加了某个属性后, 希望控制滚动条滚动到某个区域时, 应该注意 dom 挂载后再执行该方法 * @example - * ```ts * nextTick().then(() => { * LAYOUT_CONTENT_REF.value?.scrollTo() * }) - * ``` */ -export const LAYOUT_CONTENT_REF = ref(null) +export const LAYOUT_CONTENT_REF: Readonly> = + ref(null) + +/** + * + * @description + * 侧边滚动栏滚动 ref 注册。 + * 可以控制侧边滚动栏滚动位置。 + * + * 请注意使用时机。建议使用 nextTick() 等待 dom 挂载后再执行该方法。 + * @example + * nextTick().then(() => { + * LAYOUT_SIDER_REF.value?.scrollTo({ top: 0 }) + * }) + */ +export const LAYOUT_SIDER_REF: Readonly> = + ref(null) export const SETUP_ROUTER_ACTION = { /** 是否启用路由切换时顶部加载条 */ @@ -39,6 +55,7 @@ export const SETUP_ROUTER_ACTION = { /** * + * @description * 路由白名单(不进行权限校验路由) * * 路由表单白名单 @@ -50,6 +67,7 @@ export const WHITE_ROUTES: string[] = ['RLogin', 'ErrorPage', 'RayTemplateDoc'] /** * + * @description * 超级管理员 * 配置默认超级管理员, 默认拥有全部最高权限 */ diff --git a/src/axios/inject/request/index.ts b/src/axios/axios-interceptor/request/index.ts similarity index 100% rename from src/axios/inject/request/index.ts rename to src/axios/axios-interceptor/request/index.ts diff --git a/src/axios/axios-interceptor/request/plugins/cancel.ts b/src/axios/axios-interceptor/request/plugins/cancel.ts new file mode 100644 index 00000000..5de03287 --- /dev/null +++ b/src/axios/axios-interceptor/request/plugins/cancel.ts @@ -0,0 +1,30 @@ +import { axiosCanceler } from '@/axios/utils/interceptor' + +import type { FetchFunction, FetchErrorFunction } from '@/axios/types' + +/** + * + * @param ins 当前请求实例 + * @param mode 当前环境 + * + * @description + * 移除请求拦截器与注入请求拦截器。 + */ +const injectRequestCanceler: FetchFunction = (ins, mode) => { + axiosCanceler.removePendingRequest(ins) // 检查是否存在重复请求, 若存在则取消已发的请求 + axiosCanceler.addPendingRequest(ins) // 把当前的请求信息添加到 pendingRequest 表中 +} + +/** + * + * @param error 请求错误信息 + * @param mode 当前环境 + * + * @description + * 请求错误时候，移除请求拦截器。 + */ +const requestErrorCanceler: FetchErrorFunction = (error, mode) => { + axiosCanceler.removePendingRequest(error) // 移除请求拦截器 +} + +export { injectRequestCanceler, requestErrorCanceler } diff --git a/src/axios/axios-interceptor/request/plugins/request-headers.ts b/src/axios/axios-interceptor/request/plugins/request-headers.ts new file mode 100644 index 00000000..ad9bf35e --- /dev/null +++ b/src/axios/axios-interceptor/request/plugins/request-headers.ts @@ -0,0 +1,39 @@ +import { appendRequestHeaders } from '@/axios/utils/append-request-headers' +import { APP_CATCH_KEY } from '@/app-config' +import { getStorage } from '@/utils' + +import type { RequestInterceptorConfig, FetchFunction } from '@/axios/types' + +/** + * + * 这里只是示例如何获取到系统缓存的 token 并且返回请求头 token 的 key 和 value + * 尽可能的拆分每个拦截器的功能函数 + * 这是这个包存在的意义 + * + * 当然你也可以根据 request instance 来特殊处理, 这里暂时不做演示 + */ +const requestHeaderToken = (ins: RequestInterceptorConfig, mode: string) => { + const token = getStorage(APP_CATCH_KEY.token) + + if (ins.url) { + // TODO: 根据 url 不同是否设置 token + } + + return { + key: 'X-TOKEN', + value: token, + } +} + +/** 注入请求头信息 */ +const injectRequestHeaders: FetchFunction = (ins, mode) => { + appendRequestHeaders(ins, [ + requestHeaderToken(ins, mode), + { + key: 'Demo-Header-Key', + value: 'Demo Header Value', + }, + ]) +} + +export { injectRequestHeaders } diff --git a/src/axios/axios-interceptor/request/provider.ts b/src/axios/axios-interceptor/request/provider.ts new file mode 100644 index 00000000..2eaebcd5 --- /dev/null +++ b/src/axios/axios-interceptor/request/provider.ts @@ -0,0 +1,39 @@ +/** + * + * @author Ray + * + * @date 2023-06-06 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +/** + * + * 请求拦截器入口 + * 被注册方法执行时其实例能够保证获取到, 所以不需要做额外空判断 + * 在内部执行方法中, 已经做了边界处理 + * + * 提供两个工具方法, 方便类型推导 + * + * 其中 injectRequestCanceler requestErrorCanceler 方法为 axios request interceptor 方法 + */ + +import { injectRequestCanceler, requestErrorCanceler } from './plugins/cancel' +import { injectRequestHeaders } from './plugins/request-headers' + +/** + * + * 注册请求拦截器 + * 请注意执行顺序 + */ +export default { + // 请求正常 + implementRequestInterceptorArray: [ + injectRequestHeaders, + injectRequestCanceler, + ], + // 请求错误 + implementRequestInterceptorErrorArray: [requestErrorCanceler], +} diff --git a/src/axios/inject/response/index.ts b/src/axios/axios-interceptor/response/index.ts similarity index 100% rename from src/axios/inject/response/index.ts rename to src/axios/axios-interceptor/response/index.ts diff --git a/src/axios/axios-interceptor/response/plugins/cancel.ts b/src/axios/axios-interceptor/response/plugins/cancel.ts new file mode 100644 index 00000000..5a0d1bab --- /dev/null +++ b/src/axios/axios-interceptor/response/plugins/cancel.ts @@ -0,0 +1,29 @@ +import { axiosCanceler } from '@/axios/utils/interceptor' + +import type { FetchFunction, FetchErrorFunction } from '@/axios/types' + +/** + * + * @param ins 当前响应实例 + * @param mode 当前环境 + * + * @description + * 响应成功后注销请求取消器。 + */ +const injectResponseCanceler: FetchFunction = (ins, mode) => { + axiosCanceler.removePendingRequest(ins) +} + +/** + * + * @param error 错误信息 + * @param mode 当前环境 + * + * @description + * 注销失败请求取消器。 + */ +const responseErrorCanceler: FetchErrorFunction = (error, mode) => { + axiosCanceler.removePendingRequest(error) +} + +export { injectResponseCanceler, responseErrorCanceler } diff --git a/src/axios/inject/response/provider.ts b/src/axios/axios-interceptor/response/provider.ts similarity index 52% rename from src/axios/inject/response/provider.ts rename to src/axios/axios-interceptor/response/provider.ts index 9b4ba7a7..031d2eb9 100644 --- a/src/axios/inject/response/provider.ts +++ b/src/axios/axios-interceptor/response/provider.ts @@ -20,38 +20,7 @@ * 其中 injectResponseCanceler responseErrorCanceler 方法是注入的 axios response interceptor 方法 */ -import { axiosCanceler } from '@/axios/utils/interceptor' - -import type { - ResponseInterceptorConfig, - FetchFunction, - FetchErrorFunction, -} from '@/axios/types' -import type { Recordable } from '@/types' - -/** - * - * @param ins 当前响应实例 - * @param mode 当前环境 - * - * @description - * 响应成功后注销请求取消器。 - */ -const injectResponseCanceler: FetchFunction = (ins, mode) => { - axiosCanceler.removePendingRequest(ins) -} - -/** - * - * @param error 错误信息 - * @param mode 当前环境 - * - * @description - * 注销失败请求取消器。 - */ -const responseErrorCanceler: FetchErrorFunction = (error, mode) => { - axiosCanceler.removePendingRequest(error) -} +import { injectResponseCanceler, responseErrorCanceler } from './plugins/cancel' /** * diff --git a/src/axios/inject/request/provider.ts b/src/axios/inject/request/provider.ts deleted file mode 100644 index aee6e3d0..00000000 --- a/src/axios/inject/request/provider.ts +++ /dev/null @@ -1,105 +0,0 @@ -/** - * - * @author Ray - * - * @date 2023-06-06 - * - * @workspace ray-template - * - * @remark 今天也是元气满满撸代码的一天 - */ - -/** - * - * 请求拦截器入口 - * 被注册方法执行时其实例能够保证获取到, 所以不需要做额外空判断 - * 在内部执行方法中, 已经做了边界处理 - * - * 提供两个工具方法, 方便类型推导 - * - * 其中 injectRequestCanceler requestErrorCanceler 方法为 axios request interceptor 方法 - */ - -import { axiosCanceler } from '@/axios/utils/interceptor' -import { appendRequestHeaders } from '@/axios/utils/axios-copilot' -import { APP_CATCH_KEY } from '@/app-config' -import { getStorage } from '@/utils' - -import type { - RequestInterceptorConfig, - FetchFunction, - FetchErrorFunction, -} from '@/axios/types' -import type { Recordable } from '@/types' - -/** - * - * 这里只是示例如何获取到系统缓存的 token 并且返回请求头 token 的 key 和 value - * 尽可能的拆分每个拦截器的功能函数 - * 这是这个包存在的意义 - * - * 当然你也可以根据 request instance 来特殊处理, 这里暂时不做演示 - */ -const requestHeaderToken = (ins: RequestInterceptorConfig, mode: string) => { - const token = getStorage(APP_CATCH_KEY.token) - - if (ins.url) { - // TODO: 根据 url 不同是否设置 token - } - - return { - key: 'X-TOKEN', - value: token, - } -} - -/** 注入请求头信息 */ -const injectRequestHeaders: FetchFunction = (ins, mode) => { - appendRequestHeaders(ins, [ - requestHeaderToken(ins, mode), - { - key: 'Demo-Header-Key', - value: 'Demo Header Value', - }, - ]) -} - -/** - * - * @param ins 当前请求实例 - * @param mode 当前环境 - * - * @description - * 移除请求拦截器与注入请求拦截器。 - */ -const injectRequestCanceler: FetchFunction = (ins, mode) => { - axiosCanceler.removePendingRequest(ins) // 检查是否存在重复请求, 若存在则取消已发的请求 - axiosCanceler.addPendingRequest(ins) // 把当前的请求信息添加到 pendingRequest 表中 -} - -/** - * - * @param error 请求错误信息 - * @param mode 当前环境 - * - * @description - * 请求错误时候，移除请求拦截器。 - */ -const requestErrorCanceler: FetchErrorFunction = (error, mode) => { - axiosCanceler.removePendingRequest(error) // 移除请求拦截器 -} - -/** - * - * 注册请求拦截器 - * 请注意执行顺序 - */ -export default { - // 请求正常 - implementRequestInterceptorArray: [ - injectRequestHeaders, - injectRequestCanceler, - ], - // 请求错误 - implementRequestInterceptorErrorArray: [requestErrorCanceler], -} diff --git a/src/axios/instance.ts b/src/axios/instance.ts index edcad528..4025967c 100644 --- a/src/axios/instance.ts +++ b/src/axios/instance.ts @@ -22,11 +22,11 @@ import { useAxiosInterceptor } from '@/axios/utils/interceptor' import { setupResponseInterceptor, setupResponseErrorInterceptor, -} from '@/axios/inject/response' +} from '@/axios/axios-interceptor/response' import { setupRequestInterceptor, setupRequestErrorInterceptor, -} from '@/axios/inject/request' +} from '@/axios/axios-interceptor/request' import type { AxiosInstanceExpand } from './types' diff --git a/src/axios/types.ts b/src/axios/types.ts index 12c83961..6b534089 100644 --- a/src/axios/types.ts +++ b/src/axios/types.ts @@ -24,11 +24,26 @@ export interface RequestHeaderOptions { } export interface CancelConfig { + /** + * + * @description + * 是否需要取消该请求。 + */ cancel?: boolean } export interface AppRawRequestConfig extends AxiosRequestConfig { + /** + * + * @description + * 取消请求配置。 + */ cancelConfig?: CancelConfig + /** + * + * @description + * 标记该请求的配置项是否被标记了取消。 + */ __CANCELER_TAG_RAY_TEMPLATE__?: '__CANCELER_TAG_RAY_TEMPLATE__' } diff --git a/src/axios/utils/RequestCanceler.ts b/src/axios/utils/RequestCanceler.ts index 22371a31..b50c7d0b 100644 --- a/src/axios/utils/RequestCanceler.ts +++ b/src/axios/utils/RequestCanceler.ts @@ -18,6 +18,17 @@ import type { AppRawRequestConfig, CancelerParams } from '@/axios/types' +/** + * + * @class RequestCanceler + * + * @description + * 用于取消重复请求，会在请求前添加 signal 属性，用于取消请求。 + * 通过 generateRequestKey 方法生成请求 key，用于标识请求。 + * + * 如果需要取消请求，则需要在请求前添加 cancelConfig.cancel 为 true； + * 并且会在请求前添加 __CANCELER_TAG_RAY_TEMPLATE__ 属性，用于标识是否需要取消。 + */ export default class RequestCanceler { private pendingRequest: Map @@ -25,7 +36,19 @@ export default class RequestCanceler { this.pendingRequest = new Map() } - /** 是否需要加入取消请求表中 */ + /** + * + * @param config 请求体 config + * + * @description + * 判断是否需要添加 signal 属性。 + * + * 如果 cancelConfig 为 false，则不添加 signal 属性； + * 如果 cancelConfig 为 true，则添加 signal 属性。 + * + * @example + * const bool = isAppending(config) // true or false + */ private isAppending(config: AppRawRequestConfig | CancelerParams) { return config.cancelConfig?.cancel ?? true } @@ -33,9 +56,12 @@ export default class RequestCanceler { /** * * @param config 请求体 config - * @returns 返回当前请求拼接 key * - * @remark 将当前请求 config 生成 request key + * @description + * 根据当前请求生成 key。 + * + * @example + * const key = generateRequestKey(config) // string */ private generateRequestKey(config: AppRawRequestConfig | CancelerParams) { const { method, url } = config @@ -52,7 +78,15 @@ export default class RequestCanceler { * * @param config axios request config * - * @remark 给请求体添加 signal 属性, 用于取消请求 + * @description + * 添加请求到 pendingRequest map 中，用于取消请求。 + * 并且如果已经存在该请求，则会取消上次请求，并且重新挂载 signal。 + * + * 如果不需要该请求被挂载，则需要在请求前添加 cancelConfig.cancel 为 false。 + * 如果该请求需要被取消，则会添加 __CANCELER_TAG_RAY_TEMPLATE__ 属性，标记是否需要取消。 + * + * @example + * addPendingRequest(config) */ addPendingRequest(config: AppRawRequestConfig | CancelerParams) { if (this.isAppending(config)) { @@ -77,7 +111,11 @@ export default class RequestCanceler { * * @param config axios request config * - * @remark 取消该请求, 并且清除 map 中对应 generateRequestKey value + * @description + * 移除 pendingRequest map 中的请求，如果存在的话。 + * + * @example + * removePendingRequest(config) */ removePendingRequest(config: AppRawRequestConfig | CancelerParams) { const requestKey = this.generateRequestKey(config) @@ -88,7 +126,17 @@ export default class RequestCanceler { } } - /** 取消所有请求 */ + /** + * + * @description + * 移除所有 pendingRequest map 中的请求。 + * + * 值得注意的是，该方法会一次性移除所有的请求，所以需要注意是否有需要在后台挂载的请求； + * 如果有需要在后台挂载的请求，则需要在请求前添加 cancelConfig.cancel 为 false。 + * + * @example + * cancelAllRequest() + */ cancelAllRequest() { this.pendingRequest.forEach((curr) => { curr.abort() diff --git a/src/axios/utils/append-request-headers.ts b/src/axios/utils/append-request-headers.ts new file mode 100644 index 00000000..17dbb348 --- /dev/null +++ b/src/axios/utils/append-request-headers.ts @@ -0,0 +1,31 @@ +import type { RawAxiosRequestHeaders, AxiosRequestConfig } from 'axios' +import type { RequestHeaderOptions } from '../types' + +/** + * + * @param instance axios instance + * @param options axios headers options + * + * @description + * 自定义配置 axios 请求头。 + * + * @example + * appendRequestHeaders(inst, [ + * { + * key: 'Demo-Header-Key', + * value: 'Demo Header Value', + * } + * ]) + */ +export const appendRequestHeaders = ( + instance: AxiosRequestConfig, + options: RequestHeaderOptions[], +) => { + if (instance) { + const requestHeaders = instance.headers as RawAxiosRequestHeaders + + options.forEach((curr) => { + requestHeaders[curr.key] = curr.value + }) + } +} diff --git a/src/axios/utils/interceptor.ts b/src/axios/utils/interceptor.ts index f8040f2c..8b0d254d 100644 --- a/src/axios/utils/interceptor.ts +++ b/src/axios/utils/interceptor.ts @@ -54,6 +54,7 @@ const errorImplement: ErrorImplementQueue = { implementRequestInterceptorErrorArray: [], implementResponseInterceptorErrorArray: [], } + /** 取消器实例 */ export const axiosCanceler = new RequestCanceler() diff --git a/src/components/RBarcode/src/Barcode.tsx b/src/components/RBarcode/src/Barcode.tsx index 287f38e7..39b139bd 100644 --- a/src/components/RBarcode/src/Barcode.tsx +++ b/src/components/RBarcode/src/Barcode.tsx @@ -15,7 +15,9 @@ import { NSpin } from 'naive-ui' import barcode from 'jsbarcode' import props from './props' -import { completeSize } from '@/utils' +import { completeSize, call } from '@/utils' + +import type { WatchStopHandle } from 'vue' export default defineComponent({ name: 'RBarcode', @@ -30,20 +32,54 @@ export default defineComponent({ return cssVar }) + let watchStop: WatchStopHandle const barcodeRender = () => { - const { format, text = '', options } = props + try { + const { format, text, options, onSuccess } = props - const assignOptions = Object.assign({}, options, { - format, - }) + const assignOptions = Object.assign({}, options, { + format, + }) - barcode(barcodeRef.value, text, assignOptions) + barcode( + barcodeRef.value, + text !== void 0 && text !== null ? text.toString() : '', + assignOptions, + ) + + if (onSuccess) { + call(onSuccess, text, format, options) + } + } catch (e) { + const { onError } = props + + if (onError) { + call(onError, e as Error) + } + } finally { + const { onFinally } = props + + if (onFinally) { + call(onFinally) + } + } } + watchEffect(() => { + if (props.watchText) { + watchStop = watch(() => props.text, barcodeRender) + } else { + watchStop?.() + } + }) + onMounted(() => { barcodeRender() }) + onBeforeUnmount(() => { + watchStop?.() + }) return { barcodeRef, diff --git a/src/components/RBarcode/src/props.ts b/src/components/RBarcode/src/props.ts index 15c479c0..f54b7496 100644 --- a/src/components/RBarcode/src/props.ts +++ b/src/components/RBarcode/src/props.ts @@ -1,5 +1,6 @@ import type { RBarcodeRender, RBarcodeOptions, RBarcodeFormat } from './types' import type { PropType } from 'vue' +import type { MaybeArray } from '@/types' const props = { /** @@ -82,6 +83,57 @@ const props = { type: String as PropType, default: () => 'CODE128', }, + /** + * + * @description + * 是否监听 text 变化，当 text 变化时，会重新生成条形码。 + * + * 但是，在条形码的使用场景中，text 变化的频率应该是比较低的，所以默认不开启。如果有需要，可以手动开启。 + * + * @default false + */ + watchText: { + type: Boolean, + default: false, + }, + /** + * + * @description + * 条形码渲染成功时的回调函数。 + * + * @default undefined + */ + onSuccess: { + type: [Function, Array] as PropType< + MaybeArray< + ( + currentText: string | undefined, + format: RBarcodeFormat, + option: RBarcodeOptions, + ) => void + > + >, + }, + /** + * + * @description + * 条形码渲染失败时的回调函数。 + * + * @default undefined + */ + onError: { + type: [Function, Array] as PropType void>>, + }, + /** + * + * @description + * 条形码渲染结束后的回调函数，无论成功或失败都会触发。 + * + * @default undefined + */ + onFinally: { + type: [Function, Array] as PropType void>>, + }, } as const export default props diff --git a/src/components/RChart/src/index.tsx b/src/components/RChart/src/index.tsx index b866e472..96b6716d 100644 --- a/src/components/RChart/src/index.tsx +++ b/src/components/RChart/src/index.tsx @@ -437,6 +437,7 @@ export default defineComponent({ props.setChartOptions, defaultChartOptions, ) + // 如果 options 发生变动更新 echarts echartInst?.setOption(options, setOpt) }, diff --git a/src/components/RChart/src/props.ts b/src/components/RChart/src/props.ts index 9e57445e..1a5fa87b 100644 --- a/src/components/RChart/src/props.ts +++ b/src/components/RChart/src/props.ts @@ -161,7 +161,7 @@ const props = { * @default 100% */ width: { - type: String, + type: [String, Number] as PropType, default: '100%', }, /** @@ -174,7 +174,7 @@ const props = { * @default 100% */ height: { - type: String, + type: [String, Number] as PropType, default: '100%', }, /** diff --git a/src/components/RForm/src/hooks/useForm.ts b/src/components/RForm/src/hooks/useForm.ts index 808d1942..6dda2959 100644 --- a/src/components/RForm/src/hooks/useForm.ts +++ b/src/components/RForm/src/hooks/useForm.ts @@ -6,6 +6,7 @@ import type { ShouldRuleBeApplied, RFormRules, } from '../types' +import type { Recordable } from '@/types' /** * @@ -35,7 +36,7 @@ import type { * }, * }) */ -const useForm = , R extends RFormRules>( +const useForm = ( model?: T, rules?: R, ) => { diff --git a/src/components/RQRCode/src/index.tsx b/src/components/RQRCode/src/index.tsx index 0b498dfd..e70897ff 100644 --- a/src/components/RQRCode/src/index.tsx +++ b/src/components/RQRCode/src/index.tsx @@ -53,7 +53,7 @@ const readGIFAsArrayBuffer = (url: string): Promise => { } export default defineComponent({ - name: 'RayQRcode', + name: 'RQrcode', props, setup(props, ctx) { const { expose } = ctx diff --git a/src/components/RSegment/src/Segment.tsx b/src/components/RSegment/src/Segment.tsx index 9b277b5f..51d6dc0c 100644 --- a/src/components/RSegment/src/Segment.tsx +++ b/src/components/RSegment/src/Segment.tsx @@ -75,6 +75,7 @@ export default defineComponent({ segmentWidthVar = '100%' break + case 'fitContent': segmentWidthVar = 'fit-content' diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx index ac97d068..a7dd0d5e 100644 --- a/src/components/RTable/src/Table.tsx +++ b/src/components/RTable/src/Table.tsx @@ -28,6 +28,7 @@ import type { C as CType, PropsComponentPopselectKeys } from './types' export default defineComponent({ name: 'RTable', + inheritAttrs: false, props, setup(props, ctx) { const { expose, emit } = ctx @@ -241,15 +242,18 @@ export default defineComponent({ $slots, propsPopselectValue, } = this + const { class: className } = $attrs const { tool, combineRowProps, contextMenuSelect } = this return ( {{ default: () => ( diff --git a/src/components/RTable/src/props.ts b/src/components/RTable/src/props.ts index 76e00958..0f0321e6 100644 --- a/src/components/RTable/src/props.ts +++ b/src/components/RTable/src/props.ts @@ -18,11 +18,21 @@ import type { DownloadCsvTableOptions, PrintTableOptions, RTableInst, + RTableCardProps, } from './types' import type { Recordable } from '@/types' const props = { ...dataTableProps, + /** + * + * @description + * 配置表格外层容器 props，也就是 NCard 的配置项。 + */ + cardProps: { + type: Object as PropType, + default: () => ({}), + }, /** * * @description diff --git a/src/components/RTable/src/types.ts b/src/components/RTable/src/types.ts index 01e840fb..cb94ed3c 100644 --- a/src/components/RTable/src/types.ts +++ b/src/components/RTable/src/types.ts @@ -6,11 +6,16 @@ import type { DataTableInst, DataTableColumn, DataTableBaseColumn, + CardProps, } from 'naive-ui' -import type { VNode } from 'vue' +import type { VNode, CSSProperties } from 'vue' import type { Recordable } from '@/types' import type { PrintDomOptions } from '@/utils/dom' +export interface RTableCardProps extends CardProps { + style?: CSSProperties +} + export type TableActionIcon = string | (() => VNode) export type DropdownMixedOption = diff --git a/src/hooks/template/index.ts b/src/hooks/template/index.ts index e282e74a..2427f599 100644 --- a/src/hooks/template/index.ts +++ b/src/hooks/template/index.ts @@ -6,3 +6,5 @@ export * from './useSiderBar' export * from './useAppNavigation' export * from './useAppRoot' export * from './useBadge' +export * from './useSiderScroll' +export * from './useContentScroll' diff --git a/src/hooks/template/useContentScroll.ts b/src/hooks/template/useContentScroll.ts new file mode 100644 index 00000000..b3775a2f --- /dev/null +++ b/src/hooks/template/useContentScroll.ts @@ -0,0 +1,28 @@ +import { LAYOUT_CONTENT_REF } from '@/app-config' + +/** + * + * @description + * 滚动侧边栏、内容区域。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/layout#scroll-to.vue + * + * @example + * const contentScrollTo = useContentScroll() + * + * contentScrollTo({ top: 0, left: 0, behavior: 'smooth' }) // 滚动内容区域 + * contentScrollTo(10, 10) // x, y 方向滚动到 10 位置 + */ +export const useContentScroll = () => { + const contentInst = LAYOUT_CONTENT_REF.value + + const { scrollTo: contentScrollTo } = contentInst || {} + + if (!contentScrollTo) { + throw new Error( + `[useContentScroll]: LAYOUT_CONTENT_REF is not ready yet. please wait component mounted!`, + ) + } + + return contentScrollTo +} diff --git a/src/hooks/template/useSiderScroll.ts b/src/hooks/template/useSiderScroll.ts new file mode 100644 index 00000000..a0f2a4fe --- /dev/null +++ b/src/hooks/template/useSiderScroll.ts @@ -0,0 +1,27 @@ +import { LAYOUT_SIDER_REF } from '@/app-config' + +/** + * + * @description + * 滚动侧边栏。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/layout#scroll-to.vue + * + * @example + * const siderScrollTo = useSiderScroll() + * + * siderScrollTo({ top: 0, behavior: 'smooth' }) // y 方向侧边栏滚动 + * siderScrollTo(0, 0) // x, y 方向滚动到 0 位置 + */ +export const useSiderScroll = () => { + const siderInst = LAYOUT_SIDER_REF.value + const { scrollTo: siderScrollTo } = siderInst || {} + + if (!siderScrollTo) { + throw new Error( + `[useSiderScroll]: LAYOUT_SIDER_REF is not ready yet. please wait component mounted!`, + ) + } + + return siderScrollTo +} diff --git a/src/hooks/web/usePagination.ts b/src/hooks/web/usePagination.ts index 761cf215..28607908 100644 --- a/src/hooks/web/usePagination.ts +++ b/src/hooks/web/usePagination.ts @@ -1,4 +1,5 @@ import { omit } from 'lodash-es' +import { effectDispose } from '@/utils' import type { AnyFC } from '@/types' import type { PaginationProps } from 'naive-ui' @@ -32,16 +33,10 @@ const defaultOptions: UsePaginationOptions = { * 便捷分页 hook。 */ export const usePagination = ( - callback: T, + callback?: T, options?: UsePaginationOptions, ) => { - if (typeof callback !== 'function') { - throw new Error( - '[usePagination]: callback expected a function, but got ' + - typeof callback, - ) - } - + const callbackRef = ref(callback) const omitOptions = omit(options, [ 'on-update:page', 'on-update:page-size', @@ -54,13 +49,13 @@ export const usePagination = ( onUpdatePage: (page: number) => { paginationRef.value.page = page - callback() + callbackRef.value?.() }, onUpdatePageSize: (pageSize: number) => { paginationRef.value.pageSize = pageSize paginationRef.value.page = 1 - callback() + callbackRef.value?.() }, } const paginationRef = ref( @@ -77,7 +72,7 @@ export const usePagination = ( * @description * 获取总条数。 */ - const getItemCount = () => paginationRef.value.itemCount + const getItemCount = () => paginationRef.value.itemCount as number /** * @@ -95,7 +90,7 @@ export const usePagination = ( * @description * 获取当前页页码。 */ - const getPage = () => paginationRef.value.page + const getPage = () => paginationRef.value.page as number /** * @@ -115,7 +110,7 @@ export const usePagination = ( * @description * 获取每页条数。 */ - const getPageSize = () => paginationRef.value.pageSize + const getPageSize = () => paginationRef.value.pageSize as number /** * @@ -144,6 +139,25 @@ export const usePagination = ( */ const getCallback = callback + /** + * + * @param callback 页码、页条数更新时的回调函数 + * + * @description + * 手动设置回调函数。 + * + * @example + * setCallback(() => {}) + */ + const setCallback = (callback: T) => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + callbackRef.value = callback as any + } + + effectDispose(() => { + callbackRef.value = void 0 + }) + return [ paginationRef as Ref, { @@ -157,6 +171,7 @@ export const usePagination = ( setPageSize, getPagination, getCallback, + setCallback, }, ] as const } diff --git a/src/layout/components/Menu/components/SiderBarLogo/index.tsx b/src/layout/components/Menu/components/SiderBarLogo/index.tsx index 48d541a4..76b3461f 100644 --- a/src/layout/components/Menu/components/SiderBarLogo/index.tsx +++ b/src/layout/components/Menu/components/SiderBarLogo/index.tsx @@ -11,9 +11,18 @@ import './index.scss' -import { NEllipsis, NPopover } from 'naive-ui' +import { NEllipsis, NTooltip } from 'naive-ui' import { RIcon } from '@/components' +import { isValueType } from '@/utils' + +/** + * + * @description + * 侧边栏菜单 Logo 元素 ref。 + */ +export const SIDER_BAR_LOGO = ref() + export default defineComponent({ name: 'SiderBarLogo', props: { @@ -36,7 +45,7 @@ export default defineComponent({ * - station: 模板内跳转 * - outsideStation: 新开页面跳转 */ - const handleSideBarLogoClick = () => { + const sideBarLogoClick = () => { if (sideBarLogo && sideBarLogo.url) { sideBarLogo.jumpType === 'station' ? router.push(sideBarLogo.url) @@ -44,44 +53,72 @@ export default defineComponent({ } } - const TemplateLogo = ({ cursor }: { cursor: string }) => ( - - ) + const TemplateLogo = ({ cursor }: { cursor: string }) => { + if (typeof sideBarLogo.icon === 'string') { + return ( + + ) + } + + if (isValueType(sideBarLogo.icon, 'Object')) { + return + } + } return { sideBarLogo, - handleSideBarLogoClick, + sideBarLogoClick, TemplateLogo, } }, render() { - return this.sideBarLogo?.icon && this.sideBarLogo?.title ? ( + const { sideBarLogo, collapsed, TemplateLogo, sideBarLogoClick } = this + + return sideBarLogo?.title ? (
- {this.sideBarLogo?.icon ? ( - this.collapsed ? ( - + {sideBarLogo?.icon ? ( + collapsed ? ( + {{ - trigger: () => , - default: () => this.sideBarLogo?.title, + trigger: () => + TemplateLogo({ + cursor: 'pointer', + }), + default: () => sideBarLogo.title, }} - + ) : ( - + TemplateLogo({ + cursor: 'pointer', + }) ) + ) : collapsed ? ( + + {{ + trigger: () => ( +

+ {sideBarLogo.title[0] || null} +

+ ), + default: () => sideBarLogo.title, + }} + ) : null}

- {this.sideBarLogo?.title} + {sideBarLogo.title}

) : null diff --git a/src/layout/components/Menu/index.tsx b/src/layout/components/Menu/index.tsx index cf0fc89a..84308965 100644 --- a/src/layout/components/Menu/index.tsx +++ b/src/layout/components/Menu/index.tsx @@ -14,7 +14,7 @@ import './index.scss' import { NMenu, NLayoutSider, NDrawer } from 'naive-ui' import SiderBarLogo from './components/SiderBarLogo' -import { APP_MENU_CONFIG } from '@/app-config' +import { APP_MENU_CONFIG, LAYOUT_SIDER_REF } from '@/app-config' import { useDevice } from '@/hooks' import { getVariableToRefs, setVariable } from '@/global-variable' import { useMenuGetters, useMenuActions } from '@/store' @@ -33,7 +33,16 @@ export default defineComponent({ const modelMenuKey = computed({ get: () => { + // eslint-disable-next-line vue/no-async-in-computed-properties nextTick().then(() => { + /** + * + * @description + * 禁用该 eslint 规则，因为在 computed 中使用了异步操作。 + * 该规则只是为了避免异步的 computed get 获取值出现问题； + * 但是，在这里获取值的操作是同步行为，只是为了在获取值以后将对应菜单项展开； + * 所以，这里不会出现异步获取值的问题，所以可以禁用该规则。 + */ showMenuOption() }) @@ -55,14 +64,15 @@ export default defineComponent({ /** * - * 手动展开当前激活菜单项 + * @description + * 手动展开当前激活菜单项。 */ const showMenuOption = () => { - const key = modelMenuKey.value as string + const key = modelMenuKey.value - nextTick().then(() => { - menuRef.value?.showOption?.(key) - }) + if (key !== void 0 && key !== null) { + nextTick(() => menuRef.value?.showOption?.(key)) + } } const BasicMenu = () => ( @@ -73,6 +83,7 @@ export default defineComponent({ collapsedWidth={APP_MENU_CONFIG.menuCollapsedWidth} onUpdateCollapsed={collapsedMenu.bind(this)} nativeScrollbar={false} + ref={LAYOUT_SIDER_REF} > { @@ -175,6 +182,7 @@ export default defineComponent({ modelShow.value = false changeMenuModelValue(option.fullPath, option) + setTimeout(positionSelectedMenuItem, 300) } } } @@ -183,7 +191,6 @@ export default defineComponent({ const autoFocusingSearchItem = () => { const currentOption = state.searchOptions[searchElementIndex] // 获取当前搜索项 const preOption = state.searchOptions[preSearchElementIndex] // 获取上一搜索项 - const activeClass = 'content-item--active' // 激活样式 class name if (currentOption) { nextTick().then(() => { @@ -197,13 +204,13 @@ export default defineComponent({ if (preSearchElementOptions?.length) { const [el] = preSearchElementOptions - removeClass(el, activeClass) + removeClass(el, ACTIVE_CLASS) } if (searchElementOptions?.length) { const [el] = searchElementOptions - setClass(el, activeClass) + setClass(el, ACTIVE_CLASS) } }) } @@ -225,13 +232,19 @@ export default defineComponent({ /** 更新索引 */ const updateIndex = (type: 'up' | 'down') => { if (type === 'up') { - searchElementIndex = - searchElementIndex - 1 < 0 ? 0 : searchElementIndex - 1 - } else if (type === 'down') { - searchElementIndex = - searchElementIndex + 1 >= state.searchOptions.length - ? state.searchOptions.length - 1 - : searchElementIndex + 1 + searchElementIndex -= 1 + + if (searchElementIndex < 0) { + searchElementIndex = state.searchOptions.length - 1 + } + } + + if (type === 'down') { + searchElementIndex += 1 + + if (searchElementIndex >= state.searchOptions.length) { + searchElementIndex = 0 + } } } @@ -256,10 +269,12 @@ export default defineComponent({ updateIndex('up') break + case 'ArrowDown': updateIndex('down') break + case 'Enter': // eslint-disable-next-line no-case-declarations const option = state.searchOptions[searchElementIndex] @@ -386,7 +401,7 @@ export default defineComponent({ justify="center" class="global-search__empty-content" > - 没有搜索结果 + 没有搜索结果 ), }} diff --git a/src/layout/components/SiderBar/components/GlobalSearchButton/index.scss b/src/layout/components/Search/GlobalSearchButton/index.scss similarity index 100% rename from src/layout/components/SiderBar/components/GlobalSearchButton/index.scss rename to src/layout/components/Search/GlobalSearchButton/index.scss diff --git a/src/layout/components/SiderBar/components/GlobalSearchButton/index.tsx b/src/layout/components/Search/GlobalSearchButton/index.tsx similarity index 100% rename from src/layout/components/SiderBar/components/GlobalSearchButton/index.tsx rename to src/layout/components/Search/GlobalSearchButton/index.tsx diff --git a/src/layout/components/SiderBar/components/index.ts b/src/layout/components/SiderBar/components/index.ts index b6c88703..12a1c8ec 100644 --- a/src/layout/components/SiderBar/components/index.ts +++ b/src/layout/components/SiderBar/components/index.ts @@ -1,8 +1,8 @@ import TooltipIcon from './TooltipIcon' import SettingDrawer from './SettingDrawer' import Breadcrumb from './Breadcrumb' -import GlobalSearch from './GlobalSearch' -import GlobalSearchButton from './GlobalSearchButton' +import GlobalSearch from '../../Search/GlobalSearch' +import GlobalSearchButton from '../../Search/GlobalSearchButton' export { TooltipIcon, diff --git a/src/layout/components/SiderBar/index.scss b/src/layout/components/SiderBar/index.scss index de4bfaa7..62d9d979 100644 --- a/src/layout/components/SiderBar/index.scss +++ b/src/layout/components/SiderBar/index.scss @@ -16,3 +16,7 @@ .ray-template--dark .layout-header { box-shadow: 0 1px 2px $layoutShadowColorDark; } + +.override-button__layout { + padding: 0 9px; +} diff --git a/src/layout/components/SiderBar/index.tsx b/src/layout/components/SiderBar/index.tsx index 756b45ed..4c9adf45 100644 --- a/src/layout/components/SiderBar/index.tsx +++ b/src/layout/components/SiderBar/index.tsx @@ -19,7 +19,7 @@ import './index.scss' -import { NLayoutHeader, NFlex, NDropdown } from 'naive-ui' +import { NLayoutHeader, NFlex, NDropdown, NButton, NScrollbar } from 'naive-ui' import { RIcon } from '@/components' import { TooltipIcon, @@ -146,8 +146,9 @@ export default defineComponent({ class="layout-header__method" align="center" justify="space-between" + wrap={false} > - + {leftIconOptions.map((curr) => ( : null} - + {isRenderVNode( { @@ -172,34 +173,40 @@ export default defineComponent({ />, )} {rightTooltipIconOptions.map((curr) => ( - + > + + ))} updateLocale(String(key))} trigger="click" > - + + + - + diff --git a/src/layout/default/ContentWrapper/index.tsx b/src/layout/default/ContentWrapper/index.tsx index ccce14cc..b22fc22d 100644 --- a/src/layout/default/ContentWrapper/index.tsx +++ b/src/layout/default/ContentWrapper/index.tsx @@ -74,15 +74,18 @@ export default defineComponent({ globalMainLayoutLoad, layoutContentMaximize, layoutContentSpinning, + maximize, + spinning, + themeOverridesSpin, + getContentTransition, } = this - const { maximize } = this return ( ) : null} diff --git a/src/layout/index.tsx b/src/layout/index.tsx index 1f5e6ae9..1d1b7e8c 100644 --- a/src/layout/index.tsx +++ b/src/layout/index.tsx @@ -55,7 +55,7 @@ export default defineComponent({ const { getLockAppScreen } = this return !getLockAppScreen() ? ( - + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts index 833890c5..79ee739d 100644 --- a/src/router/modules/dashboard.ts +++ b/src/router/modules/dashboard.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const dashboard: AppRouteRecordRaw = { path: '/dashboard', - name: 'RDashboard', component: () => import('@/views/dashboard'), meta: { i18nKey: t('menu.Dashboard'), diff --git a/src/router/modules/demo/barcode.ts b/src/router/modules/demo/barcode.ts index 94e2b506..ea5f73c3 100644 --- a/src/router/modules/demo/barcode.ts +++ b/src/router/modules/demo/barcode.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const barcode: AppRouteRecordRaw = { path: 'barcode', - name: 'Barcode', component: () => import('@/views/demo/BarcodeDemo'), meta: { i18nKey: t('menu.Barcode'), diff --git a/src/router/modules/demo/cache-demo.ts b/src/router/modules/demo/cache-demo.ts index f9dfdbee..304fc88e 100644 --- a/src/router/modules/demo/cache-demo.ts +++ b/src/router/modules/demo/cache-demo.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const cacheDemo: AppRouteRecordRaw = { path: '/cache-demo', - name: 'CacheDemo', component: () => import('@/views/demo/cache-demo/index'), meta: { i18nKey: t('menu.CacheDemo'), diff --git a/src/router/modules/demo/context-menu.ts b/src/router/modules/demo/context-menu.ts index 75202988..466465a8 100644 --- a/src/router/modules/demo/context-menu.ts +++ b/src/router/modules/demo/context-menu.ts @@ -4,7 +4,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const contextMenu: AppRouteRecordRaw = { path: '/context-menu', - name: 'ContextMenuDemo', component: () => import('@/views/demo/context-menu/index'), meta: { i18nKey: t('menu.ContextMenu'), diff --git a/src/router/modules/demo/directive.ts b/src/router/modules/demo/directive.ts index 851de9db..8943b234 100644 --- a/src/router/modules/demo/directive.ts +++ b/src/router/modules/demo/directive.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const directive: AppRouteRecordRaw = { path: '/directive', - name: 'RDirective', component: () => import('@/views/demo/directive/index'), meta: { i18nKey: t('menu.Directive'), diff --git a/src/router/modules/demo/echart.ts b/src/router/modules/demo/echart.ts index 5ec03d9a..5c060bd3 100644 --- a/src/router/modules/demo/echart.ts +++ b/src/router/modules/demo/echart.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const echart: AppRouteRecordRaw = { path: '/echart', - name: 'REchart', component: () => import('@/views/demo/echart/index'), meta: { i18nKey: t('menu.Echart'), diff --git a/src/router/modules/demo/form.ts b/src/router/modules/demo/form.ts index 53467a63..33386d7b 100644 --- a/src/router/modules/demo/form.ts +++ b/src/router/modules/demo/form.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const form: AppRouteRecordRaw = { path: '/form', - name: 'FormView', component: () => import('@/views/demo/form'), meta: { i18nKey: t('menu.Form'), diff --git a/src/router/modules/demo/iframe.ts b/src/router/modules/demo/iframe.ts index f23bfd0e..9ae199d9 100644 --- a/src/router/modules/demo/iframe.ts +++ b/src/router/modules/demo/iframe.ts @@ -4,7 +4,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const iframe: AppRouteRecordRaw = { path: '/iframe', - name: 'IframeDemo', component: () => import('@/views/demo/iframe/index'), meta: { icon: 'other', diff --git a/src/router/modules/demo/mock.ts b/src/router/modules/demo/mock.ts index 0b17c934..8c5de8eb 100644 --- a/src/router/modules/demo/mock.ts +++ b/src/router/modules/demo/mock.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const mockDemo: AppRouteRecordRaw = { path: '/mock-demo', - name: 'MockDemo', component: () => import('@/views/demo/mock-demo/index'), meta: { i18nKey: t('menu.Mock'), diff --git a/src/router/modules/demo/modal.ts b/src/router/modules/demo/modal.ts index 93f3c623..1ade81cd 100644 --- a/src/router/modules/demo/modal.ts +++ b/src/router/modules/demo/modal.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const mockDemo: AppRouteRecordRaw = { path: '/modal-demo', - name: 'ModalDemo', component: () => import('@/views/demo/modal-demo/index'), meta: { i18nKey: t('menu.Modal'), diff --git a/src/router/modules/demo/multi-menu.ts b/src/router/modules/demo/multi-menu.ts index 51ed415a..938bdae8 100644 --- a/src/router/modules/demo/multi-menu.ts +++ b/src/router/modules/demo/multi-menu.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const multiMenu: AppRouteRecordRaw = { path: '/multi', - name: 'MultiMenu', component: LAYOUT, meta: { i18nKey: t('menu.MultiMenu'), diff --git a/src/router/modules/demo/precision.ts b/src/router/modules/demo/precision.ts index 18dd4efc..a1dc64c7 100644 --- a/src/router/modules/demo/precision.ts +++ b/src/router/modules/demo/precision.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const precision: AppRouteRecordRaw = { path: '/precision', - name: 'CalculatePrecision', component: () => import('@/views/demo/precision/index'), meta: { i18nKey: t('menu.CalculatePrecision'), diff --git a/src/router/modules/demo/qrcode.ts b/src/router/modules/demo/qrcode.ts index c79f4aec..e2c5956d 100644 --- a/src/router/modules/demo/qrcode.ts +++ b/src/router/modules/demo/qrcode.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const qrcode: AppRouteRecordRaw = { path: '/qrcode', - name: 'RQRCode', component: () => import('@/views/demo/qrcode/index'), meta: { i18nKey: t('menu.QRCode'), diff --git a/src/router/modules/demo/rely.ts b/src/router/modules/demo/rely.ts index 67d2b838..f46d60b4 100644 --- a/src/router/modules/demo/rely.ts +++ b/src/router/modules/demo/rely.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const rely: AppRouteRecordRaw = { path: 'rely-about', - name: 'RelyAbout', component: () => import('@/views/demo/rely/views/rely-about/index'), meta: { i18nKey: t('menu.RelyAbout'), diff --git a/src/router/modules/demo/router-demo.ts b/src/router/modules/demo/router-demo.ts index d33ed5ea..8e68064d 100644 --- a/src/router/modules/demo/router-demo.ts +++ b/src/router/modules/demo/router-demo.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const routerDemo: AppRouteRecordRaw = { path: '/router-demo', - name: 'RouterDemoRoot', component: LAYOUT, meta: { i18nKey: t('menu.RouterDemo'), @@ -15,7 +14,6 @@ const routerDemo: AppRouteRecordRaw = { children: [ { path: 'router-demo-home', - name: 'RouterDemoHome', component: () => import('@/views/demo/router-demo/router-demo-home/index'), meta: { @@ -24,7 +22,6 @@ const routerDemo: AppRouteRecordRaw = { }, { path: 'router-demo-detail', - name: 'RouterDemoDetail', component: () => import('@/views/demo/router-demo/router-demo-detail/index'), meta: { diff --git a/src/router/modules/demo/scroll-reveal.ts b/src/router/modules/demo/scroll-reveal.ts index a8588681..4d3609db 100644 --- a/src/router/modules/demo/scroll-reveal.ts +++ b/src/router/modules/demo/scroll-reveal.ts @@ -11,7 +11,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const scrollReveal: AppRouteRecordRaw = { path: '/scroll-reveal', - name: 'ScrollReveal', component: () => import('@/views/demo/scroll-reveal/index'), meta: { i18nKey: t('menu.scrollReveal'), diff --git a/src/router/modules/demo/segment.ts b/src/router/modules/demo/segment.ts index 44a9bb69..75a84622 100644 --- a/src/router/modules/demo/segment.ts +++ b/src/router/modules/demo/segment.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const segment: AppRouteRecordRaw = { path: '/segment', - name: 'RAxios', component: () => import('@/views/demo/segment'), meta: { i18nKey: t('menu.Segment'), diff --git a/src/router/modules/demo/svg-icons.ts b/src/router/modules/demo/svg-icons.ts index 963e56d4..d71aa290 100644 --- a/src/router/modules/demo/svg-icons.ts +++ b/src/router/modules/demo/svg-icons.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const previewSVGIcons: AppRouteRecordRaw = { path: '/svg-icons', - name: 'PreviewSVGIcons', component: () => import('@/views/demo/svg-icons/index'), meta: { i18nKey: t('menu.SvgIcon'), diff --git a/src/router/modules/demo/table.ts b/src/router/modules/demo/table.ts index c9a2148d..dfe76e0a 100644 --- a/src/router/modules/demo/table.ts +++ b/src/router/modules/demo/table.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const table: AppRouteRecordRaw = { path: '/table', - name: 'TableView', component: () => import('@/views/demo/table/index'), meta: { i18nKey: t('menu.Table'), diff --git a/src/router/modules/demo/template-hooks.ts b/src/router/modules/demo/template-hooks.ts index a071549f..3e39c24e 100644 --- a/src/router/modules/demo/template-hooks.ts +++ b/src/router/modules/demo/template-hooks.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const axios: AppRouteRecordRaw = { path: '/template-hooks', - name: 'TemplateHooks', component: () => import('@/views/demo/template-hooks/index'), meta: { i18nKey: t('menu.TemplateHooks'), diff --git a/src/router/modules/error-404.ts b/src/router/modules/error-404.ts index 5a18080c..aae71a62 100644 --- a/src/router/modules/error-404.ts +++ b/src/router/modules/error-404.ts @@ -5,7 +5,6 @@ import type { AppRouteRecordRaw } from '@/router/types' const error404: AppRouteRecordRaw = { path: '/:catchAll(.*)', - name: 'ErrorPage', component: () => import('@/views/error/views/Error404'), meta: { i18nKey: t('menu.Error'), diff --git a/src/router/types.ts b/src/router/types.ts index 179a27d5..52b8ba13 100644 --- a/src/router/types.ts +++ b/src/router/types.ts @@ -11,39 +11,202 @@ export type Component = | (() => Promise) export interface AppMenuExtraOptions { + /** + * + * @description + * 标签标题。 + */ label?: string | number + /** + * + * @description + * 标签图标。 + */ icon?: VNode + /** + * + * @description + * 标签渲染类型。 + */ type?: TagProps['type'] + /** + * + * @description + * 是否显示。 + */ show?: boolean + /** + * + * @description + * 标签标题，带有 i18n 国际化切换效果。 + */ i18nLabel?: string } export interface AppRouteMeta { + /** + * + * @description + * 菜单 i18n 国际化 标题 + */ i18nKey?: string + /** + * + * @description + * 菜单图标。 + * 如果配置为 string，则会自动使用 RIcon 尝试获取 icons 包下的图标。 + * VNode 类型，会直接使用传递图标渲染。 + */ icon?: string | VNode + /** + * + * @description + * 是否以新窗口打开该菜单。 + */ windowOpen?: string + /** + * + * @description + * 权限表，启用则会验证该菜单项是否权限匹配。 + * 并且，该配置项优先级最高。 + */ role?: (string | number)[] + /** + * + * @description + * 配置菜单项是否隐藏。 + * 但是，允许被跳转，例如 404, 500 类似页面。 + */ hidden?: boolean + /** + * + * @description + * 菜单标题，无需国际化。 + */ noLocalTitle?: string | number + /** + * + * @description + * 是否需要在切换菜单的时候，该页面的内容区域置顶。 + * 默认都需要。 + */ ignoreAutoResetScroll?: boolean + /** + * + * @description + * 菜单项排序。 + */ order?: number + /** + * + * @description + * 页面缓存。 + * + * 如果缓存会出现失败的情况，请查看该文档排查。 + * @see https://xiaodaigua-ray.github.io/ray-template-doc/ray-template-docs/common-problem/keep-alive.html + */ keepAlive?: boolean + /** + * + * @description + * 配置该页面是否为平级模式。 + * 当配置为 true 的时候，会在跳转至该页面的时候，追加面包屑后再跳转，不会追加 MenuTag。 + */ sameLevel?: boolean + /** + * + * @description + * 配置当前菜单项的在什么环境下才会显示。 + * 优先级最低。 + */ env?: string | string[] + /** + * + * @description + * 菜单项的额外标签项。 + */ extra?: AppMenuExtraOptions } // @ts-ignore -export interface AppRouteRecordRaw extends Omit { - name: string +interface BaseAppRouteRecordRaw extends Omit { + /** + * + * @description + * 请注意 name 在新版本的 vue-router 中不再推荐被使用为导航。 + * + * 但是，如果你需要缓存该页面，那么该配置项就一定要配置！ + * 否则，缓存将会失效。 + */ + name?: string + /** + * + * @description + * 配置当前页面额外信息，用于菜单渲染。 + */ meta: AppRouteMeta + /** + * + * @description + * 路由依赖渲染组件。 + * 如果需要嵌套路由，可以考虑使用 LAYOUT 作为父路由组件。 + * + * @example + * { + * path: '/dashboard', + * component: LAYOUT, + * children: [ ... ] + * } + */ component?: Component | string + /** + * + * @description + * 路由依赖渲染组件。 + * + * @deprecated + * 不推荐使用。 + */ components?: Component + /** + * + * @description + * 嵌套路由。 + */ children?: AppRouteRecordRaw[] + /** + * + * @description + * 需要传递给组件的 props。 + */ props?: Recordable + /** + * + * @description + * 包括 search 和 hash 在内的完整地址。 + * 该字符串是经过百分号编码的。 + */ fullPath?: string } +interface KeepAliveAppRouteRecordRaw extends BaseAppRouteRecordRaw { + meta: AppRouteMeta & { + keepAlive: true + } + name: string +} + +interface NonKeepAliveAppRouteRecordRaw extends BaseAppRouteRecordRaw { + meta: AppRouteMeta & { + keepAlive?: false + } + name?: string +} + +export type AppRouteRecordRaw = + | KeepAliveAppRouteRecordRaw + | NonKeepAliveAppRouteRecordRaw + export interface RouteModules { [propName: string]: { default: AppRouteRecordRaw diff --git a/src/router/utils/combine-raw-route-modules.ts b/src/router/utils/combine-raw-route-modules.ts index 30e03b15..fe2fc7c7 100644 --- a/src/router/utils/combine-raw-route-modules.ts +++ b/src/router/utils/combine-raw-route-modules.ts @@ -4,12 +4,14 @@ import type { AppRouteRecordRaw, RouteModules } from '@/router/types' * * @returns 所有路由模块 * - * @remark 自动合并所有路由模块, 每一个 ts 文件都视为一个 route module 与 views 一一对应 + * @description + * 自动合并所有路由模块，每一个 ts 文件都视为一个 route module 与 views 一一对应。 + * 会将 modules 中每一个 ts 文件当作一个路由模块，即使你以分包的形式创建了路由模块。 * - * 请注意, 如果更改了 modules 的目录位置或者该方法的位置, 需要同步更改 import.meta.glob 方法的路径 - * 该方法会以本文件为起始位置去查找对应 URL 目录的资源 + * 请注意，如果更改了 modules 的目录位置或者该方法的位置，需要同步更改 import.meta.glob 方法的路径。 + * 该方法会以本文件为起始位置去查找对应 URL 目录的资源。 * - * 会将 modules 中每一个 ts 文件当作一个路由模块, 即使你以分包的形式创建了路由模块 + * 如果组件的 name 属性出现重复或者冲突，会导致一些意想不到的情况。 */ export const combineRawRouteModules = () => { const modulesFiles: RouteModules = import.meta.glob( @@ -19,18 +21,18 @@ export const combineRawRouteModules = () => { }, ) - const modules = Object.keys(modulesFiles).reduce((modules, modulePath) => { - const route = modulesFiles[modulePath].default + const modules = Object.keys(modulesFiles).reduce((pre, curr) => { + const module = modulesFiles[curr].default - if (route) { - modules.push(route) + if (module) { + pre.push(module) } else { throw new Error( - 'router helper combine: an exception occurred while parsing the routing file!', + `[combineRawRouteModules]: ${curr} module must export default.`, ) } - return modules + return pre }, [] as AppRouteRecordRaw[]) return modules diff --git a/src/store/modules/menu/index.ts b/src/store/modules/menu/index.ts index f9083d87..3c85ae22 100644 --- a/src/store/modules/menu/index.ts +++ b/src/store/modules/menu/index.ts @@ -332,6 +332,7 @@ export const piniaMenuStore = defineStore( let fullPath = `${ parentPath.endsWith('/') ? parentPath : parentPath + '/' }${curr.path}` + // 使用正则表达式替换重复的 '/' fullPath = fullPath.replace(/\/+/g, '/') diff --git a/src/types/modules/app.ts b/src/types/modules/app.ts index 05b3ee3b..a186b536 100644 --- a/src/types/modules/app.ts +++ b/src/types/modules/app.ts @@ -1,9 +1,9 @@ import type { VNode } from 'vue' -import type { AppRouteRecordRaw, AppRouteMeta } from '@/router/types' +import type { AppRouteMeta } from '@/router/types' export type Key = string | number -export interface AppMenuOption extends AppRouteRecordRaw { +export interface AppMenuOption { name: string key: Key path: string diff --git a/src/types/modules/vite-custom-config.ts b/src/types/modules/vite-custom-config.ts index c0f5557a..f9e88f7d 100644 --- a/src/types/modules/vite-custom-config.ts +++ b/src/types/modules/vite-custom-config.ts @@ -7,9 +7,10 @@ import type { } from 'vite' import type { Recordable } from '@/types' import type { GlobalThemeOverrides } from 'naive-ui' +import type { VNode } from 'vue' export interface LayoutSideBarLogo { - icon?: string + icon?: string | VNode title?: string url?: string jumpType?: 'station' | 'outsideStation' diff --git a/src/utils/basic.ts b/src/utils/basic.ts index b93c2186..b6f22526 100644 --- a/src/utils/basic.ts +++ b/src/utils/basic.ts @@ -162,6 +162,7 @@ export const downloadAnyFile = ( try { if (typeof data === 'string') { downloadBase64File(data, fileName) + return resolve() } @@ -200,6 +201,8 @@ export const downloadAnyFile = ( document.body.appendChild(link) link.click() + + return resolve() } catch (error) { return reject(error) } diff --git a/src/utils/cache.ts b/src/utils/cache.ts index 35e051b2..ab06eb48 100644 --- a/src/utils/cache.ts +++ b/src/utils/cache.ts @@ -171,6 +171,7 @@ const removeStorage: RemoveStorageFC = (key, storageType, options) => { console.error( `[removeStorage]: Failed to remove stored data: key ${key} is empty or undefined`, ) + return } @@ -185,6 +186,7 @@ const removeStorage: RemoveStorageFC = (key, storageType, options) => { : removeType === 'localStorage' ? localStorageKeys : sessionStorageKeys + keys.forEach((curr) => { if (key === '__all__') { window.sessionStorage.removeItem(_prefix + curr) diff --git a/src/utils/index.ts b/src/utils/index.ts index 45970f13..0c467dce 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,3 +1,5 @@ +import { positionSelectedMenuItem } from './position-selected-menu-item' + export * from './basic' export * from './cache' export * from './dom' @@ -5,3 +7,4 @@ export * from './element' export * from './precision' export * from './vue' export * from './app' +export { positionSelectedMenuItem } diff --git a/src/utils/position-selected-menu-item.ts b/src/utils/position-selected-menu-item.ts new file mode 100644 index 00000000..567a9192 --- /dev/null +++ b/src/utils/position-selected-menu-item.ts @@ -0,0 +1,55 @@ +import { LAYOUT_SIDER_REF } from '@/app-config' +import { useSiderScroll } from '@/hooks' +import { unrefElement } from '@/utils' +import { SIDER_BAR_LOGO } from '@/layout/components/Menu/components/SiderBarLogo' + +const MENU_ITEM_SELECTED = '.n-menu-item-content--selected' // 菜单激活样式 class name +const MENU_ITEM = 'n-menu-item' + +/** + * + * @description + * 将 Sider 滚动条滚动到当前激活菜单项的位置。 + * + * 但是，该方法目前存在一个问题，由于 NMenu 的渲染机制，默认不会渲染子菜单； + * 所以导致一个问题，则是不能准确的获取到激活菜单项的元素。 + * + * 有考虑过使用 setTimeout 来延迟执行，但是该渲染受到机器配置的影响，不是一个稳定的解决方案。 + * + * @example + * positionSelectedMenuItem() // 滚动到当前激活菜单项的位置 + */ +export const positionSelectedMenuItem = () => { + const siderEl = unrefElement(LAYOUT_SIDER_REF as Ref) + const selectedEl = siderEl?.querySelector(MENU_ITEM_SELECTED) + const siderBarLogoEl = unrefElement(SIDER_BAR_LOGO) + let siderBarLogoHeight: number = 0 + const menuItemEl = siderEl?.querySelector(MENU_ITEM) + + if (siderBarLogoEl) { + const { height } = siderBarLogoEl.getBoundingClientRect() + + siderBarLogoHeight = height + } + + if (selectedEl && siderEl) { + const siderScroll = useSiderScroll() + const { top: siderTop } = siderEl.getBoundingClientRect() + const { top: selectedTop } = selectedEl.getBoundingClientRect() + const siderScrollTop = siderEl.scrollTop + const menuItemMarginTop = menuItemEl + ? parseInt(window.getComputedStyle(menuItemEl).marginTop) + : 6 + + siderScroll({ + top: + selectedTop - + siderTop + + siderScrollTop - + siderBarLogoHeight - + menuItemMarginTop, + left: 0, + behavior: 'smooth', + }) + } +} diff --git a/src/views/demo/BarcodeDemo.tsx b/src/views/demo/BarcodeDemo.tsx index 52c3efcd..49091b87 100644 --- a/src/views/demo/BarcodeDemo.tsx +++ b/src/views/demo/BarcodeDemo.tsx @@ -10,7 +10,15 @@ */ import { RBarcode } from '@/components' -import { NAlert, NCard, NFlex, NGrid, NGridItem, NSwitch } from 'naive-ui' +import { + NAlert, + NCard, + NFlex, + NGrid, + NGridItem, + NInput, + NSwitch, +} from 'naive-ui' export default defineComponent({ name: 'BarcodeDemo', @@ -19,10 +27,12 @@ export default defineComponent({ width: 4, } const loading = ref(false) + const text = ref('RayTemplate') return { baseOptions, loading, + text, } }, render() { @@ -119,6 +129,14 @@ export default defineComponent({ + + + + + + + + ) }, diff --git a/src/views/demo/form/index.tsx b/src/views/demo/form/index.tsx index 3c77c068..bccb3213 100644 --- a/src/views/demo/form/index.tsx +++ b/src/views/demo/form/index.tsx @@ -22,7 +22,7 @@ import { NRadioGroup, } from 'naive-ui' -import { useForm } from '@/components' +import { useForm, useModal } from '@/components' import type { RFormRules } from '@/components' @@ -138,6 +138,8 @@ export default defineComponent({ type="info" onClick={() => { this.condition = formModel() + + restoreValidation() }} > 重置表单为初始状态 diff --git a/src/views/demo/mock-demo/index.tsx b/src/views/demo/mock-demo/index.tsx index d36e45d6..5be7bad8 100644 --- a/src/views/demo/mock-demo/index.tsx +++ b/src/views/demo/mock-demo/index.tsx @@ -158,7 +158,7 @@ const MockDemo = defineComponent({ ), action: () => ( - + 搜索 ), diff --git a/src/views/demo/precision/index.tsx b/src/views/demo/precision/index.tsx index 2bb440d8..e8140219 100644 --- a/src/views/demo/precision/index.tsx +++ b/src/views/demo/precision/index.tsx @@ -47,6 +47,7 @@ const CalculatePrecision = defineComponent({ ) }) } + updateDistributeValue() return { diff --git a/unplugin/.eslintrc-auto-import.json b/unplugin/.eslintrc-auto-import.json index 5717910b..dd00b5cf 100644 --- a/unplugin/.eslintrc-auto-import.json +++ b/unplugin/.eslintrc-auto-import.json @@ -69,11 +69,7 @@ "useAttrs": true, "useCssModule": true, "useCssVars": true, - "useDialog": true, "useLink": true, - "useLoadingBar": true, - "useMessage": true, - "useNotification": true, "useRoute": true, "useRouter": true, "useSlots": true, @@ -81,7 +77,6 @@ "watchEffect": true, "watchPostEffect": true, "watchSyncEffect": true, - "NEllipsis": true, "ExtractDefaultPropTypes": true, "ExtractPropTypes": true, "ExtractPublicPropTypes": true diff --git a/unplugin/auto-imports.d.ts b/unplugin/auto-imports.d.ts index 68400517..0ce0ca81 100644 --- a/unplugin/auto-imports.d.ts +++ b/unplugin/auto-imports.d.ts @@ -6,7 +6,6 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] - const NEllipsis: typeof import('naive-ui')['NEllipsis'] const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate'] const computed: typeof import('vue')['computed'] const createApp: typeof import('vue')['createApp'] @@ -67,11 +66,7 @@ declare global { const useAttrs: typeof import('vue')['useAttrs'] const useCssModule: typeof import('vue')['useCssModule'] const useCssVars: typeof import('vue')['useCssVars'] - const useDialog: typeof import('naive-ui')['useDialog'] const useLink: typeof import('vue-router')['useLink'] - const useLoadingBar: typeof import('naive-ui')['useLoadingBar'] - const useMessage: typeof import('naive-ui')['useMessage'] - const useNotification: typeof import('naive-ui')['useNotification'] const useRoute: typeof import('vue-router')['useRoute'] const useRouter: typeof import('vue-router')['useRouter'] const useSlots: typeof import('vue')['useSlots'] diff --git a/vite.custom.config.ts b/vite.custom.config.ts index 95794b11..b9fb96e8 100644 --- a/vite.custom.config.ts +++ b/vite.custom.config.ts @@ -47,7 +47,7 @@ import type { BuildOptions } from 'vite' const config: AppConfigExport = { /** 公共基础路径配置, 如果为空则会默认以 '/' 填充 */ - base: '/ray-template/', + // base: '/ray-template/', /** 配置首屏加载信息 */ preloadingConfig: PRE_LOADING_CONFIG, /** 默认主题色(不可省略, 必填), 也用于 ejs 注入 */ diff --git a/vite.plugin.config.ts b/vite.plugin.config.ts index 61bb1dea..ec6cda97 100644 --- a/vite.plugin.config.ts +++ b/vite.plugin.config.ts @@ -17,7 +17,7 @@ import viteVeI18nPlugin from '@intlify/unplugin-vue-i18n/vite' import viteInspect from 'vite-plugin-inspect' import viteSvgLoader from 'vite-svg-loader' import vitePluginImp from 'vite-plugin-imp' -import { analyzer } from 'vite-bundle-analyzer' +import { analyzer, adapter } from 'vite-bundle-analyzer' import viteCompression from 'vite-plugin-compression' import { ViteEjsPlugin as viteEjsPlugin } from 'vite-plugin-ejs' import viteAutoImport from 'unplugin-auto-import/vite' @@ -25,15 +25,19 @@ import viteEslint from 'vite-plugin-eslint' import mockDevServerPlugin from 'vite-plugin-mock-dev-server' import { createSvgIconsPlugin } from 'vite-plugin-svg-icons' import unpluginViteComponents from 'unplugin-vue-components/vite' -import { cdn as viteCDNPlugin } from 'vite-plugin-cdn2' -import { cdnResolve, svgIconResolve } from './vite-helper' +import { cdn as viteCDNPlugin } from 'vite-plugin-cdn2' import { NaiveUiResolver } from 'unplugin-vue-components/resolvers' +import { cdnResolve, svgIconResolve } from './vite-helper' import config from './vite.custom.config' import type { PluginOption } from 'vite' +function pathResolve(dir: string) { + return path.resolve(__dirname, dir) +} + // 仅适用于报告模式（report） function onlyReportOptions(mode: string): PluginOption[] { if (mode !== 'report') { @@ -41,10 +45,12 @@ function onlyReportOptions(mode: string): PluginOption[] { } return [ - analyzer({ - analyzerMode: 'server', // 以默认服务器代理打开文件 - openAnalyzer: true, // 以默认服务器代理打开文件 - }), + adapter( + analyzer({ + analyzerMode: 'server', // 以默认服务器代理打开文件 + openAnalyzer: true, // 以默认服务器代理打开文件 + }), + ), ] } @@ -107,7 +113,7 @@ function onlyBuildOptions(mode: string): PluginOption[] { // 仅适用于开发模式 function onlyDevOptions(mode: string): PluginOption[] { - if (mode === 'development') { + if (mode !== 'development') { return [] } @@ -127,7 +133,7 @@ function baseOptions(mode: string): PluginOption[] { compositionOnly: true, forceStringify: true, defaultSFCLang: 'json', - include: [path.resolve(__dirname, '../locales/**')], + include: [pathResolve('../locales/**')], }), viteAutoImport({ eslintrc: { @@ -141,19 +147,7 @@ function baseOptions(mode: string): PluginOption[] { /\.md$/, // .md ], dts: './unplugin/auto-imports.d.ts', - imports: [ - 'vue', - 'vue-router', - 'pinia', - { - 'naive-ui': [ - 'useDialog', - 'useMessage', - 'useNotification', - 'useLoadingBar', - ], - }, - ], + imports: ['vue', 'vue-router', 'pinia'], resolvers: [NaiveUiResolver()], }), unpluginViteComponents({ diff --git a/vitest.config.ts b/vitest.config.ts index 04a310df..959141fb 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -9,11 +9,11 @@ export default defineConfig((configEnv) => defineConfig({ plugins: [tsconfigPaths()], test: { - include: ['**/__test__/**/*.(spec).(ts|tsx)'], + include: ['./__test__/**/*.(spec).(ts|tsx)'], exclude: [ ...configDefaults.exclude, '**/src/**', - '**/__test__/utils/**/*', + './__test__/utils/**/*', ], environment: 'happy-dom', globals: true,