diff --git a/CHANGELOG.md b/CHANGELOG.md index 8731cb48..d791a1b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # CHANGE LOG +## 4.9.3 + +## Feats + +- 更新 `vue` 版本至 `3.4.38` +- 更新 `vite` 版本至 `5.4.1` +- 调整 `RCollapseGrid` 支持 `actionAlign` 配置型，配置按钮垂直方向，默认为 `end` +- `MenuTag` 组件 + - 调整 `MenuTag` 滚动条样式，现在将它隐藏了 + - 优化关闭按钮样式 +- `RTable` 新增 `renderWrapperHeader` 配置项，配置外层容器 `header` 是否渲染 +- `postcss` 配置 `not dead`，忽略兼容已经无需兼容的浏览器 +- `RChart` 组件 `setOptions` 方法配置项默认不启用 `merge` 模式 +- 调整 `header` 的样式，增加了一点点间隙 +- `useDevice` 新增 `observer` 配置项，可以自定义观察回调 +- 新增 `components-pro` 包，助力简化业务开发 + - 新增 `RTablePro` 组件，大幅简化中后台带有过滤请求条件的表格显示业务 + - 新增 `RCollapse` 组件，允许折叠过滤条件 + +## Fixes + +- 移除 `postcss-px-to-viewport-8-plugin` 插件，使用 `postcss-px-to-viewport-8-with-include` 替换，修复 `include` 失效问题 +- 修复 `useElementFullscreen` 在退出时，没有正确的回滚 `zIndex` 的问题 +- 修复 `RChart` 配置 `setChartOptions` 不生效的问题 + ## 4.9.2 ## Feats diff --git a/package.json b/package.json index df3c8d63..8f581d4b 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ray-template", "private": false, - "version": "4.9.2", + "version": "4.9.3", "type": "module", "engines": { "node": "^18.0.0 || >=20.0.0", @@ -48,7 +48,7 @@ "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.0", "print-js": "^1.6.0", - "vue": "^3.4.34", + "vue": "^3.4.38", "vue-demi": "0.14.6", "vue-hooks-plus": "2.2.1", "vue-i18n": "^9.13.1", @@ -85,14 +85,14 @@ "husky": "8.0.3", "lint-staged": "^15.1.0", "postcss": "^8.4.31", - "postcss-px-to-viewport-8-plugin": "1.2.3", + "postcss-px-to-viewport-8-with-include": "1.2.2", "prettier": "^3.2.5", "sass": "1.71.1", "svg-sprite-loader": "^6.0.11", "typescript": "^5.2.2", "unplugin-auto-import": "^0.17.5", "unplugin-vue-components": "^0.26.0", - "vite": "^5.3.5", + "vite": "^5.4.1", "vite-bundle-analyzer": "0.9.4", "vite-plugin-cdn2": "1.1.0", "vite-plugin-compression": "^0.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fcf0cb92..3f91603c 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.34) + version: 10.9.0(vue@3.4.38) axios: specifier: ^1.7.2 version: 1.7.2 @@ -40,10 +40,10 @@ dependencies: version: 1.1.0 naive-ui: specifier: ^2.39.0 - version: 2.39.0(vue@3.4.34) + version: 2.39.0(vue@3.4.38) pinia: specifier: ^2.1.7 - version: 2.1.7(typescript@5.2.2)(vue@3.4.34) + version: 2.1.7(typescript@5.2.2)(vue@3.4.38) pinia-plugin-persistedstate: specifier: ^3.2.0 version: 3.2.1(pinia@2.1.7) @@ -51,20 +51,20 @@ dependencies: specifier: ^1.6.0 version: 1.6.0 vue: - specifier: ^3.4.34 - version: 3.4.34(typescript@5.2.2) + specifier: ^3.4.38 + version: 3.4.38(typescript@5.2.2) vue-demi: specifier: 0.14.6 - version: 0.14.6(vue@3.4.34) + version: 0.14.6(vue@3.4.38) vue-hooks-plus: specifier: 2.2.1 - version: 2.2.1(vue@3.4.34) + version: 2.2.1(vue@3.4.38) vue-i18n: specifier: ^9.13.1 - version: 9.13.1(vue@3.4.34) + version: 9.13.1(vue@3.4.38) vue-router: specifier: ^4.3.2 - version: 4.3.2(vue@3.4.34) + version: 4.3.2(vue@3.4.38) vue3-next-qrcode: specifier: 2.0.10 version: 2.0.10(typescript@5.2.2) @@ -105,10 +105,10 @@ devDependencies: version: 6.21.0(eslint@8.57.0)(typescript@5.2.2) '@vitejs/plugin-vue': specifier: ^5.1.0 - version: 5.1.0(vite@5.3.5)(vue@3.4.34) + version: 5.1.0(vite@5.4.1)(vue@3.4.38) '@vitejs/plugin-vue-jsx': specifier: ^4.0.0 - version: 4.0.0(vite@5.3.5)(vue@3.4.34) + version: 4.0.0(vite@5.4.1)(vue@3.4.38) '@vitest/ui': specifier: 1.4.0 version: 1.4.0(vitest@1.5.2) @@ -120,7 +120,7 @@ devDependencies: 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.34) + version: 2.4.3(vue@3.4.38) autoprefixer: specifier: ^10.4.15 version: 10.4.16(postcss@8.4.38) @@ -157,9 +157,9 @@ devDependencies: postcss: specifier: ^8.4.31 version: 8.4.38 - postcss-px-to-viewport-8-plugin: - specifier: 1.2.3 - version: 1.2.3 + postcss-px-to-viewport-8-with-include: + specifier: 1.2.2 + version: 1.2.2 prettier: specifier: ^3.2.5 version: 3.2.5 @@ -177,10 +177,10 @@ devDependencies: version: 0.17.5(@vueuse/core@10.9.0) unplugin-vue-components: specifier: ^0.26.0 - version: 0.26.0(vue@3.4.34) + version: 0.26.0(vue@3.4.38) vite: - specifier: ^5.3.5 - version: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + specifier: ^5.4.1 + version: 5.4.1(@types/node@20.5.1)(sass@1.71.1) vite-bundle-analyzer: specifier: 0.9.4 version: 0.9.4 @@ -189,28 +189,28 @@ devDependencies: version: 1.1.0 vite-plugin-compression: specifier: ^0.5.1 - version: 0.5.1(vite@5.3.5) + version: 0.5.1(vite@5.4.1) vite-plugin-ejs: specifier: ^1.7.0 - version: 1.7.0(vite@5.3.5) + version: 1.7.0(vite@5.4.1) vite-plugin-eslint: specifier: 1.8.1 - version: 1.8.1(eslint@8.57.0)(vite@5.3.5) + version: 1.8.1(eslint@8.57.0)(vite@5.4.1) vite-plugin-inspect: specifier: ^0.8.3 - version: 0.8.3(vite@5.3.5) + version: 0.8.3(vite@5.4.1) vite-plugin-mock-dev-server: specifier: 1.4.7 - version: 1.4.7(vite@5.3.5) + version: 1.4.7(vite@5.4.1) vite-plugin-svg-icons: specifier: ^2.0.1 - version: 2.0.1(vite@5.3.5) + version: 2.0.1(vite@5.4.1) 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.3.5) + version: 4.3.2(typescript@5.2.2)(vite@5.4.1) vitest: 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) @@ -558,6 +558,14 @@ packages: hasBin: true dependencies: '@babel/types': 7.24.9 + dev: true + + /@babel/parser@7.25.3: + resolution: {integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.25.2 /@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.7): resolution: {integrity: sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==} @@ -653,6 +661,15 @@ packages: '@babel/helper-string-parser': 7.24.8 '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 + dev: true + + /@babel/types@7.25.2: + resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.24.8 + '@babel/helper-validator-identifier': 7.24.7 + to-fast-properties: 2.0.0 /@commitlint/cli@17.8.1: resolution: {integrity: sha512-ay+WbzQesE0Rv4EQKfNbSMiJJ12KdKTDzIt0tcK4k11FdsWmtwP0Kp1NWMOUswfIWo6Eb7p7Ln721Nx9FLNBjg==} @@ -837,12 +854,12 @@ packages: css-render: 0.15.14 dev: false - /@css-render/vue3-ssr@0.15.14(vue@3.4.34): + /@css-render/vue3-ssr@0.15.14(vue@3.4.38): resolution: {integrity: sha512-//8027GSbxE9n3QlD73xFY6z4ZbHbvrOVB7AO6hsmrEzGbg+h2A09HboUyDgu+xsmj7JnvJD39Irt+2D0+iV8g==} peerDependencies: vue: ^3.0.11 dependencies: - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) dev: false /@emotion/hash@0.8.0: @@ -1348,7 +1365,7 @@ packages: jsonc-eslint-parser: 2.4.0 mlly: 1.6.1 source-map-js: 1.2.0 - vue-i18n: 9.13.1(vue@3.4.34) + vue-i18n: 9.13.1(vue@3.4.38) yaml-eslint-parser: 1.2.2 dev: true @@ -1397,7 +1414,7 @@ packages: picocolors: 1.0.1 source-map-js: 1.2.0 unplugin: 1.10.1 - vue-i18n: 9.13.1(vue@3.4.34) + vue-i18n: 9.13.1(vue@3.4.38) transitivePeerDependencies: - rollup - supports-color @@ -1443,6 +1460,10 @@ packages: /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + dev: true + + /@jridgewell/sourcemap-codec@1.5.0: + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} /@jridgewell/trace-mapping@0.3.25: resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} @@ -1455,7 +1476,7 @@ packages: resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 dev: true /@juggle/resize-observer@3.4.0: @@ -1531,128 +1552,128 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/rollup-android-arm-eabi@4.18.0: - resolution: {integrity: sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==} + /@rollup/rollup-android-arm-eabi@4.20.0: + resolution: {integrity: sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==} cpu: [arm] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-android-arm64@4.18.0: - resolution: {integrity: sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==} + /@rollup/rollup-android-arm64@4.20.0: + resolution: {integrity: sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-arm64@4.18.0: - resolution: {integrity: sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==} + /@rollup/rollup-darwin-arm64@4.20.0: + resolution: {integrity: sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-x64@4.18.0: - resolution: {integrity: sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==} + /@rollup/rollup-darwin-x64@4.20.0: + resolution: {integrity: sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.18.0: - resolution: {integrity: sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==} + /@rollup/rollup-linux-arm-gnueabihf@4.20.0: + resolution: {integrity: sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-musleabihf@4.18.0: - resolution: {integrity: sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==} + /@rollup/rollup-linux-arm-musleabihf@4.20.0: + resolution: {integrity: sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.18.0: - resolution: {integrity: sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==} + /@rollup/rollup-linux-arm64-gnu@4.20.0: + resolution: {integrity: sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.18.0: - resolution: {integrity: sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==} + /@rollup/rollup-linux-arm64-musl@4.20.0: + resolution: {integrity: sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-powerpc64le-gnu@4.18.0: - resolution: {integrity: sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==} + /@rollup/rollup-linux-powerpc64le-gnu@4.20.0: + resolution: {integrity: sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==} cpu: [ppc64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.18.0: - resolution: {integrity: sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==} + /@rollup/rollup-linux-riscv64-gnu@4.20.0: + resolution: {integrity: sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==} cpu: [riscv64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-s390x-gnu@4.18.0: - resolution: {integrity: sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==} + /@rollup/rollup-linux-s390x-gnu@4.20.0: + resolution: {integrity: sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==} cpu: [s390x] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.18.0: - resolution: {integrity: sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==} + /@rollup/rollup-linux-x64-gnu@4.20.0: + resolution: {integrity: sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.18.0: - resolution: {integrity: sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==} + /@rollup/rollup-linux-x64-musl@4.20.0: + resolution: {integrity: sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.18.0: - resolution: {integrity: sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==} + /@rollup/rollup-win32-arm64-msvc@4.20.0: + resolution: {integrity: sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.18.0: - resolution: {integrity: sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==} + /@rollup/rollup-win32-ia32-msvc@4.20.0: + resolution: {integrity: sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.18.0: - resolution: {integrity: sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==} + /@rollup/rollup-win32-x64-msvc@4.20.0: + resolution: {integrity: sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==} cpu: [x64] os: [win32] requiresBuild: true @@ -1916,7 +1937,7 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@vitejs/plugin-vue-jsx@4.0.0(vite@5.3.5)(vue@3.4.34): + /@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.1)(vue@3.4.38): resolution: {integrity: sha512-A+6wL2AdQhDsLsDnY+2v4rRDI1HLJGIMc97a8FURO9tqKsH5QvjWrzsa5DH3NlZsM742W2wODl2fF+bfcTWtXw==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: @@ -1926,21 +1947,21 @@ packages: '@babel/core': 7.24.7 '@babel/plugin-transform-typescript': 7.24.8(@babel/core@7.24.7) '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.24.7) - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) - vue: 3.4.34(typescript@5.2.2) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) + vue: 3.4.38(typescript@5.2.2) transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue@5.1.0(vite@5.3.5)(vue@3.4.34): + /@vitejs/plugin-vue@5.1.0(vite@5.4.1)(vue@3.4.38): resolution: {integrity: sha512-QMRxARyrdiwi1mj3AW4fLByoHTavreXq0itdEW696EihXglf1MB3D4C2gBvE0jMPH29ZjC3iK8aIaUMLf4EOGA==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) - vue: 3.4.34(typescript@5.2.2) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) + vue: 3.4.38(typescript@5.2.2) dev: true /@vitest/expect@1.5.2: @@ -2063,7 +2084,7 @@ packages: '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.24.8 '@babel/parser': 7.24.8 - '@vue/compiler-sfc': 3.4.32 + '@vue/compiler-sfc': 3.4.36 dev: true /@vue/compiler-core@3.4.21: @@ -2086,21 +2107,21 @@ packages: source-map-js: 1.2.0 dev: true - /@vue/compiler-core@3.4.32: - resolution: {integrity: sha512-8tCVWkkLe/QCWIsrIvExUGnhYCAOroUs5dzhSoKL5w4MJS8uIYiou+pOPSVIOALOQ80B0jBs+Ri+kd5+MBnCDw==} + /@vue/compiler-core@3.4.36: + resolution: {integrity: sha512-qBkndgpwFKdupmOPoiS10i7oFdN7a+4UNDlezD0GlQ1kuA1pNrscg9g12HnB5E8hrWSuEftRsbJhL1HI2zpJhg==} dependencies: - '@babel/parser': 7.24.8 - '@vue/shared': 3.4.32 - entities: 4.5.0 + '@babel/parser': 7.25.3 + '@vue/shared': 3.4.36 + entities: 5.0.0 estree-walker: 2.0.2 source-map-js: 1.2.0 dev: true - /@vue/compiler-core@3.4.34: - resolution: {integrity: sha512-Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ==} + /@vue/compiler-core@3.4.38: + resolution: {integrity: sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==} dependencies: - '@babel/parser': 7.24.8 - '@vue/shared': 3.4.34 + '@babel/parser': 7.25.3 + '@vue/shared': 3.4.38 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.2.0 @@ -2119,18 +2140,18 @@ packages: '@vue/shared': 3.4.27 dev: true - /@vue/compiler-dom@3.4.32: - resolution: {integrity: sha512-PbSgt9KuYo4fyb90dynuPc0XFTfFPs3sCTbPLOLlo+PrUESW1gn/NjSsUvhR+mI2AmmEzexwYMxbHDldxSOr2A==} + /@vue/compiler-dom@3.4.36: + resolution: {integrity: sha512-eEIjy4GwwZTFon/Y+WO8tRRNGqylaRlA79T1RLhUpkOzJ7EtZkkb8MurNfkqY6x6Qiu0R7ESspEF7GkPR/4yYg==} dependencies: - '@vue/compiler-core': 3.4.32 - '@vue/shared': 3.4.32 + '@vue/compiler-core': 3.4.36 + '@vue/shared': 3.4.36 dev: true - /@vue/compiler-dom@3.4.34: - resolution: {integrity: sha512-3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw==} + /@vue/compiler-dom@3.4.38: + resolution: {integrity: sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==} dependencies: - '@vue/compiler-core': 3.4.34 - '@vue/shared': 3.4.34 + '@vue/compiler-core': 3.4.38 + '@vue/shared': 3.4.38 /@vue/compiler-sfc@3.4.21: resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} @@ -2160,31 +2181,31 @@ packages: source-map-js: 1.2.0 dev: true - /@vue/compiler-sfc@3.4.32: - resolution: {integrity: sha512-STy9im/WHfaguJnfKjjVpMHukxHUrOKjm2vVCxiojQJyo3Sb6Os8SMXBr/MI+ekpstEGkDONfqAQoSbZhspLYw==} + /@vue/compiler-sfc@3.4.36: + resolution: {integrity: sha512-rhuHu7qztt/rNH90dXPTzhB7hLQT2OC4s4GrPVqmzVgPY4XBlfWmcWzn4bIPEWNImt0CjO7kfHAf/1UXOtx3vw==} dependencies: - '@babel/parser': 7.24.8 - '@vue/compiler-core': 3.4.32 - '@vue/compiler-dom': 3.4.32 - '@vue/compiler-ssr': 3.4.32 - '@vue/shared': 3.4.32 + '@babel/parser': 7.25.3 + '@vue/compiler-core': 3.4.36 + '@vue/compiler-dom': 3.4.36 + '@vue/compiler-ssr': 3.4.36 + '@vue/shared': 3.4.36 estree-walker: 2.0.2 - magic-string: 0.30.10 - postcss: 8.4.39 + magic-string: 0.30.11 + postcss: 8.4.40 source-map-js: 1.2.0 dev: true - /@vue/compiler-sfc@3.4.34: - resolution: {integrity: sha512-x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw==} + /@vue/compiler-sfc@3.4.38: + resolution: {integrity: sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==} dependencies: - '@babel/parser': 7.24.8 - '@vue/compiler-core': 3.4.34 - '@vue/compiler-dom': 3.4.34 - '@vue/compiler-ssr': 3.4.34 - '@vue/shared': 3.4.34 + '@babel/parser': 7.25.3 + '@vue/compiler-core': 3.4.38 + '@vue/compiler-dom': 3.4.38 + '@vue/compiler-ssr': 3.4.38 + '@vue/shared': 3.4.38 estree-walker: 2.0.2 - magic-string: 0.30.10 - postcss: 8.4.39 + magic-string: 0.30.11 + postcss: 8.4.40 source-map-js: 1.2.0 /@vue/compiler-ssr@3.4.21: @@ -2201,18 +2222,18 @@ packages: '@vue/shared': 3.4.27 dev: true - /@vue/compiler-ssr@3.4.32: - resolution: {integrity: sha512-nyu/txTecF6DrxLrpLcI34xutrvZPtHPBj9yRoPxstIquxeeyywXpYZrQMsIeDfBhlw1abJb9CbbyZvDw2kjdg==} + /@vue/compiler-ssr@3.4.36: + resolution: {integrity: sha512-Wt1zyheF0zVvRJyhY74uxQbnkXV2Le/JPOrAxooR4rFYKC7cFr+cRqW6RU3cM/bsTy7sdZ83IDuy/gLPSfPGng==} dependencies: - '@vue/compiler-dom': 3.4.32 - '@vue/shared': 3.4.32 + '@vue/compiler-dom': 3.4.36 + '@vue/shared': 3.4.36 dev: true - /@vue/compiler-ssr@3.4.34: - resolution: {integrity: sha512-8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g==} + /@vue/compiler-ssr@3.4.38: + resolution: {integrity: sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==} dependencies: - '@vue/compiler-dom': 3.4.34 - '@vue/shared': 3.4.34 + '@vue/compiler-dom': 3.4.38 + '@vue/shared': 3.4.38 /@vue/devtools-api@6.6.1: resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==} @@ -2265,8 +2286,8 @@ packages: optional: true dependencies: '@volar/language-core': 2.2.0-alpha.8 - '@vue/compiler-dom': 3.4.32 - '@vue/shared': 3.4.32 + '@vue/compiler-dom': 3.4.36 + '@vue/shared': 3.4.36 computeds: 0.0.1 minimatch: 9.0.3 path-browserify: 1.0.1 @@ -2274,33 +2295,33 @@ packages: vue-template-compiler: 2.7.16 dev: true - /@vue/reactivity@3.4.34: - resolution: {integrity: sha512-ua+Lo+wBRlBEX9TtgPOShE2JwIO7p6BTZ7t1KZVPoaBRfqbC7N3c8Mpzicx173fXxx5VXeU6ykiHo7WgLzJQDA==} + /@vue/reactivity@3.4.38: + resolution: {integrity: sha512-4vl4wMMVniLsSYYeldAKzbk72+D3hUnkw9z8lDeJacTxAkXeDAP1uE9xr2+aKIN0ipOL8EG2GPouVTH6yF7Gnw==} dependencies: - '@vue/shared': 3.4.34 + '@vue/shared': 3.4.38 - /@vue/runtime-core@3.4.34: - resolution: {integrity: sha512-PXhkiRPwcPGJ1BnyBZFI96GfInCVskd0HPNIAZn7i3YOmLbtbTZpB7/kDTwC1W7IqdGPkTVC63IS7J2nZs4Ebg==} + /@vue/runtime-core@3.4.38: + resolution: {integrity: sha512-21z3wA99EABtuf+O3IhdxP0iHgkBs1vuoCAsCKLVJPEjpVqvblwBnTj42vzHRlWDCyxu9ptDm7sI2ZMcWrQqlA==} dependencies: - '@vue/reactivity': 3.4.34 - '@vue/shared': 3.4.34 + '@vue/reactivity': 3.4.38 + '@vue/shared': 3.4.38 - /@vue/runtime-dom@3.4.34: - resolution: {integrity: sha512-dXqIe+RqFAK2Euak4UsvbIupalrhc67OuQKpD7HJ3W2fv8jlqvI7szfBCsAEcE8o/wyNpkloxB6J8viuF/E3gw==} + /@vue/runtime-dom@3.4.38: + resolution: {integrity: sha512-afZzmUreU7vKwKsV17H1NDThEEmdYI+GCAK/KY1U957Ig2NATPVjCROv61R19fjZNzMmiU03n79OMnXyJVN0UA==} dependencies: - '@vue/reactivity': 3.4.34 - '@vue/runtime-core': 3.4.34 - '@vue/shared': 3.4.34 + '@vue/reactivity': 3.4.38 + '@vue/runtime-core': 3.4.38 + '@vue/shared': 3.4.38 csstype: 3.1.3 - /@vue/server-renderer@3.4.34(vue@3.4.34): - resolution: {integrity: sha512-GeyEUfMVRZMD/mZcNONEqg7MiU10QQ1DB3O/Qr6+8uXpbwdlmVgQ5Qs1/ZUAFX1X2UUtqMoGrDRbxdWfOJFT7Q==} + /@vue/server-renderer@3.4.38(vue@3.4.38): + resolution: {integrity: sha512-NggOTr82FbPEkkUvBm4fTGcwUY8UuTsnWC/L2YZBmvaQ4C4Jl/Ao4HHTB+l7WnFCt5M/dN3l0XLuyjzswGYVCA==} peerDependencies: - vue: 3.4.34 + vue: 3.4.38 dependencies: - '@vue/compiler-ssr': 3.4.34 - '@vue/shared': 3.4.34 - vue: 3.4.34(typescript@5.2.2) + '@vue/compiler-ssr': 3.4.38 + '@vue/shared': 3.4.38 + vue: 3.4.38(typescript@5.2.2) /@vue/shared@3.4.21: resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} @@ -2310,14 +2331,14 @@ packages: resolution: {integrity: sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==} dev: true - /@vue/shared@3.4.32: - resolution: {integrity: sha512-ep4mF1IVnX/pYaNwxwOpJHyBtOMKWoKZMbnUyd+z0udqIxLUh7YCCd/JfDna8aUrmnG9SFORyIq2HzEATRrQsg==} + /@vue/shared@3.4.36: + resolution: {integrity: sha512-fdPLStwl1sDfYuUftBaUVn2pIrVFDASYerZSrlBvVBfylObPA1gtcWJHy5Ox8jLEJ524zBibss488Q3SZtU1uA==} dev: true - /@vue/shared@3.4.34: - resolution: {integrity: sha512-x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A==} + /@vue/shared@3.4.38: + resolution: {integrity: sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==} - /@vue/test-utils@2.4.3(vue@3.4.34): + /@vue/test-utils@2.4.3(vue@3.4.38): resolution: {integrity: sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==} peerDependencies: '@vue/server-renderer': ^3.0.1 @@ -2327,17 +2348,17 @@ packages: optional: true dependencies: js-beautify: 1.14.11 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) vue-component-type-helpers: 1.8.26 dev: true - /@vueuse/core@10.9.0(vue@3.4.34): + /@vueuse/core@10.9.0(vue@3.4.38): 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.34) - vue-demi: 0.14.7(vue@3.4.34) + '@vueuse/shared': 10.9.0(vue@3.4.38) + vue-demi: 0.14.7(vue@3.4.38) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -2345,10 +2366,10 @@ packages: /@vueuse/metadata@10.9.0: resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==} - /@vueuse/shared@10.9.0(vue@3.4.34): + /@vueuse/shared@10.9.0(vue@3.4.38): resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.7(vue@3.4.34) + vue-demi: 0.14.7(vue@3.4.38) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -2837,7 +2858,7 @@ packages: /builtins@5.1.0: resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==} dependencies: - semver: 7.6.2 + semver: 7.6.3 dev: true /bundle-name@4.1.0: @@ -3772,6 +3793,11 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + /entities@5.0.0: + resolution: {integrity: sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==} + engines: {node: '>=0.12'} + dev: true + /error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: @@ -3976,7 +4002,7 @@ packages: eslint: '>=6.0.0' dependencies: eslint: 8.57.0 - semver: 7.6.2 + semver: 7.6.3 dev: true /eslint-config-prettier@9.1.0(eslint@8.57.0): @@ -4029,7 +4055,7 @@ packages: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} dependencies: debug: 3.2.7 - is-core-module: 2.13.1 + is-core-module: 2.15.0 resolve: 1.22.8 transitivePeerDependencies: - supports-color @@ -4097,7 +4123,7 @@ packages: eslint-import-resolver-node: 0.3.9 eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.2 - is-core-module: 2.13.1 + is-core-module: 2.15.0 is-glob: 4.0.3 minimatch: 3.1.2 object.fromentries: 2.0.8 @@ -4125,10 +4151,10 @@ packages: globals: 13.24.0 ignore: 5.3.1 is-builtin-module: 3.2.1 - is-core-module: 2.13.1 + is-core-module: 2.15.0 minimatch: 3.1.2 resolve: 1.22.8 - semver: 7.6.2 + semver: 7.6.3 dev: true /eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5): @@ -5104,6 +5130,13 @@ packages: hasown: 2.0.2 dev: true + /is-core-module@2.15.0: + resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} + engines: {node: '>= 0.4'} + dependencies: + hasown: 2.0.2 + dev: true + /is-data-descriptor@1.0.1: resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==} engines: {node: '>= 0.4'} @@ -5681,6 +5714,12 @@ packages: resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + + /magic-string@0.30.11: + resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} + dependencies: + '@jridgewell/sourcemap-codec': 1.5.0 /magic-string@0.30.8: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} @@ -5931,13 +5970,13 @@ packages: minimatch: 3.1.2 dev: true - /naive-ui@2.39.0(vue@3.4.34): + /naive-ui@2.39.0(vue@3.4.38): resolution: {integrity: sha512-5oUJzRG+rtLSH8eRU+fJvVYiQids2BxF9jp+fwGoAqHOptEINrBlgBu9uy+95RHE5FLJ7Q/z41o+qkoGnUrKxQ==} peerDependencies: vue: ^3.0.0 dependencies: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) - '@css-render/vue3-ssr': 0.15.14(vue@3.4.34) + '@css-render/vue3-ssr': 0.15.14(vue@3.4.38) '@types/katex': 0.16.7 '@types/lodash': 4.17.6 '@types/lodash-es': 4.17.12 @@ -5952,10 +5991,10 @@ packages: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.4.34) - vooks: 0.2.12(vue@3.4.34) - vue: 3.4.34(typescript@5.2.2) - vueuc: 0.4.58(vue@3.4.34) + vdirs: 0.1.8(vue@3.4.38) + vooks: 0.2.12(vue@3.4.38) + vue: 3.4.38(typescript@5.2.2) + vueuc: 0.4.58(vue@3.4.38) dev: false /nanoid@3.3.7: @@ -6314,10 +6353,10 @@ packages: peerDependencies: pinia: ^2.0.0 dependencies: - pinia: 2.1.7(typescript@5.2.2)(vue@3.4.34) + pinia: 2.1.7(typescript@5.2.2)(vue@3.4.38) dev: false - /pinia@2.1.7(typescript@5.2.2)(vue@3.4.34): + /pinia@2.1.7(typescript@5.2.2)(vue@3.4.38): resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==} peerDependencies: '@vue/composition-api': ^1.4.0 @@ -6331,8 +6370,8 @@ packages: dependencies: '@vue/devtools-api': 6.6.1 typescript: 5.2.2 - vue: 3.4.34(typescript@5.2.2) - vue-demi: 0.14.6(vue@3.4.34) + vue: 3.4.38(typescript@5.2.2) + vue-demi: 0.14.6(vue@3.4.38) dev: false /pkg-types@1.0.3: @@ -6375,8 +6414,8 @@ packages: postcss: 5.2.18 dev: true - /postcss-px-to-viewport-8-plugin@1.2.3: - resolution: {integrity: sha512-HRNm9ZE4/7PWw4a6C0GmDxdnSJaQKtKxIqufMpPYymhKJM/3WbZCIuktyE8N5TXinXVIMkOJ1N6erlpoxvNMYA==} + /postcss-px-to-viewport-8-with-include@1.2.2: + resolution: {integrity: sha512-UFegTU9a1IsLsst+qpqH2uEBBlGB5NRFVouaj4ci9HJcCdpBDdhLPf4Z7rtXfMrFfi2MUQTpJu9xjfmz9S07Tg==} dependencies: object-assign: 4.1.1 dev: true @@ -6412,14 +6451,23 @@ packages: source-map-js: 1.2.0 dev: true - /postcss@8.4.39: - resolution: {integrity: sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==} + /postcss@8.4.40: + resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 picocolors: 1.0.1 source-map-js: 1.2.0 + /postcss@8.4.41: + resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.1 + source-map-js: 1.2.0 + dev: true + /posthtml-parser@0.2.1: resolution: {integrity: sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==} dependencies: @@ -6715,29 +6763,29 @@ packages: fsevents: 2.3.3 dev: true - /rollup@4.18.0: - resolution: {integrity: sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==} + /rollup@4.20.0: + resolution: {integrity: sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.18.0 - '@rollup/rollup-android-arm64': 4.18.0 - '@rollup/rollup-darwin-arm64': 4.18.0 - '@rollup/rollup-darwin-x64': 4.18.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.18.0 - '@rollup/rollup-linux-arm-musleabihf': 4.18.0 - '@rollup/rollup-linux-arm64-gnu': 4.18.0 - '@rollup/rollup-linux-arm64-musl': 4.18.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.18.0 - '@rollup/rollup-linux-riscv64-gnu': 4.18.0 - '@rollup/rollup-linux-s390x-gnu': 4.18.0 - '@rollup/rollup-linux-x64-gnu': 4.18.0 - '@rollup/rollup-linux-x64-musl': 4.18.0 - '@rollup/rollup-win32-arm64-msvc': 4.18.0 - '@rollup/rollup-win32-ia32-msvc': 4.18.0 - '@rollup/rollup-win32-x64-msvc': 4.18.0 + '@rollup/rollup-android-arm-eabi': 4.20.0 + '@rollup/rollup-android-arm64': 4.20.0 + '@rollup/rollup-darwin-arm64': 4.20.0 + '@rollup/rollup-darwin-x64': 4.20.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.20.0 + '@rollup/rollup-linux-arm-musleabihf': 4.20.0 + '@rollup/rollup-linux-arm64-gnu': 4.20.0 + '@rollup/rollup-linux-arm64-musl': 4.20.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.20.0 + '@rollup/rollup-linux-riscv64-gnu': 4.20.0 + '@rollup/rollup-linux-s390x-gnu': 4.20.0 + '@rollup/rollup-linux-x64-gnu': 4.20.0 + '@rollup/rollup-linux-x64-musl': 4.20.0 + '@rollup/rollup-win32-arm64-msvc': 4.20.0 + '@rollup/rollup-win32-ia32-msvc': 4.20.0 + '@rollup/rollup-win32-x64-msvc': 4.20.0 fsevents: 2.3.3 dev: true @@ -6864,6 +6912,12 @@ packages: hasBin: true dev: true + /semver@7.6.3: + resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} + engines: {node: '>=10'} + hasBin: true + dev: true + /set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} @@ -7699,7 +7753,7 @@ packages: dependencies: '@antfu/utils': 0.7.7 '@rollup/pluginutils': 5.1.0 - '@vueuse/core': 10.9.0(vue@3.4.34) + '@vueuse/core': 10.9.0(vue@3.4.38) fast-glob: 3.3.2 local-pkg: 0.5.0 magic-string: 0.30.8 @@ -7710,7 +7764,7 @@ packages: - rollup dev: true - /unplugin-vue-components@0.26.0(vue@3.4.34): + /unplugin-vue-components@0.26.0(vue@3.4.38): resolution: {integrity: sha512-s7IdPDlnOvPamjunVxw8kNgKNK8A5KM1YpK5j/p97jEKTjlPNrA0nZBiSfAKKlK1gWZuyWXlKL5dk3EDw874LQ==} engines: {node: '>=14'} peerDependencies: @@ -7733,7 +7787,7 @@ packages: minimatch: 9.0.3 resolve: 1.22.8 unplugin: 1.10.0 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) transitivePeerDependencies: - rollup - supports-color @@ -7831,13 +7885,13 @@ packages: engines: {node: '>= 0.8'} dev: true - /vdirs@0.1.8(vue@3.4.34): + /vdirs@0.1.8(vue@3.4.38): resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: vue: ^3.0.11 dependencies: evtd: 0.2.4 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) dev: false /vite-bundle-analyzer@0.9.4: @@ -7856,12 +7910,13 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - '@types/node' - less - lightningcss - sass + - sass-embedded - stylus - sugarss - supports-color @@ -7882,7 +7937,7 @@ packages: - supports-color dev: true - /vite-plugin-compression@0.5.1(vite@5.3.5): + /vite-plugin-compression@0.5.1(vite@5.4.1): resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -7890,21 +7945,21 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-ejs@1.7.0(vite@5.3.5): + /vite-plugin-ejs@1.7.0(vite@5.4.1): resolution: {integrity: sha512-JNP3zQDC4mSbfoJ3G73s5mmZITD8NGjUmLkq4swxyahy/W0xuokK9U9IJGXw7KCggq6UucT6hJ0p+tQrNtqTZw==} peerDependencies: vite: '>=5.0.0' dependencies: ejs: 3.1.9 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) dev: true - /vite-plugin-eslint@1.8.1(eslint@8.57.0)(vite@5.3.5): + /vite-plugin-eslint@1.8.1(eslint@8.57.0)(vite@5.4.1): resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==} peerDependencies: eslint: '>=7' @@ -7914,10 +7969,10 @@ packages: '@types/eslint': 8.56.6 eslint: 8.57.0 rollup: 2.79.1 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) dev: true - /vite-plugin-inspect@0.8.3(vite@5.3.5): + /vite-plugin-inspect@0.8.3(vite@5.4.1): resolution: {integrity: sha512-SBVzOIdP/kwe6hjkt7LSW4D0+REqqe58AumcnCfRNw4Kt3mbS9pEBkch+nupu2PBxv2tQi69EQHQ1ZA1vgB/Og==} engines: {node: '>=14'} peerDependencies: @@ -7936,13 +7991,13 @@ packages: perfect-debounce: 1.0.0 picocolors: 1.0.0 sirv: 2.0.4 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@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.3.5): + /vite-plugin-mock-dev-server@1.4.7(vite@5.4.1): resolution: {integrity: sha512-vGNW423fkmMibf0BfYL89n2n4tNKDt51d6Ee14gC1LlLiJAp6jabJBPsjWgU+uMgtp68+1uBb5F1qTlqdAhnoQ==} engines: {node: ^16 || ^18 || >= 20} peerDependencies: @@ -7964,7 +8019,7 @@ packages: mime-types: 2.1.35 path-to-regexp: 6.2.1 picocolors: 1.0.0 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) ws: 8.16.0 transitivePeerDependencies: - bufferutil @@ -7973,7 +8028,7 @@ packages: - utf-8-validate dev: true - /vite-plugin-svg-icons@2.0.1(vite@5.3.5): + /vite-plugin-svg-icons@2.0.1(vite@5.4.1): resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -7986,7 +8041,7 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true @@ -7998,7 +8053,7 @@ packages: svgo: 3.1.0 dev: true - /vite-tsconfig-paths@4.3.2(typescript@5.2.2)(vite@5.3.5): + /vite-tsconfig-paths@4.3.2(typescript@5.2.2)(vite@5.4.1): resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==} peerDependencies: vite: '*' @@ -8009,14 +8064,14 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.2.2) - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@types/node@20.5.1)(sass@1.71.1) transitivePeerDependencies: - supports-color - typescript dev: true - /vite@5.3.5(@types/node@20.5.1)(sass@1.71.1): - resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==} + /vite@5.4.1(@types/node@20.5.1)(sass@1.71.1): + resolution: {integrity: sha512-1oE6yuNXssjrZdblI9AfBbHCC41nnyoVoEZxQnID6yvQZAFBzxxkqoFLtHUMkYunL8hwOLEjgTuxpkRxvba3kA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -8024,6 +8079,7 @@ packages: less: '*' lightningcss: ^1.21.0 sass: '*' + sass-embedded: '*' stylus: '*' sugarss: '*' terser: ^5.4.0 @@ -8036,6 +8092,8 @@ packages: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: @@ -8045,8 +8103,8 @@ packages: dependencies: '@types/node': 20.5.1 esbuild: 0.21.5 - postcss: 8.4.39 - rollup: 4.18.0 + postcss: 8.4.41 + rollup: 4.20.0 sass: 1.71.1 optionalDependencies: fsevents: 2.3.3 @@ -8097,33 +8155,34 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.4 - vite: 5.3.5(@types/node@20.5.1)(sass@1.71.1) + vite: 5.4.1(@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 - lightningcss - sass + - sass-embedded - stylus - sugarss - supports-color - terser dev: true - /vooks@0.2.12(vue@3.4.34): + /vooks@0.2.12(vue@3.4.38): resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==} peerDependencies: vue: ^3.0.0 dependencies: evtd: 0.2.4 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(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.34): + /vue-demi@0.14.6(vue@3.4.38): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -8135,10 +8194,10 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) dev: false - /vue-demi@0.14.7(vue@3.4.34): + /vue-demi@0.14.7(vue@3.4.38): resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} engines: {node: '>=12'} hasBin: true @@ -8150,7 +8209,7 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) /vue-eslint-parser@9.3.2(eslint@8.57.0): resolution: {integrity: sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==} @@ -8188,7 +8247,7 @@ packages: - supports-color dev: true - /vue-hooks-plus@2.2.1(vue@3.4.34): + /vue-hooks-plus@2.2.1(vue@3.4.38): resolution: {integrity: sha512-YfZ+xwzeoTXpuXrCwu4zOe2kmc3hcOxD3eY9eoc5r+T8grCMQl25li0W9o8uY1/UA75sgLcE6B7KfKd2e3OURg==} peerDependencies: vue: ^3.2.25 @@ -8200,10 +8259,10 @@ packages: qs: 6.12.1 query-string: 7.1.3 screenfull: 5.2.0 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) dev: false - /vue-i18n@9.13.1(vue@3.4.34): + /vue-i18n@9.13.1(vue@3.4.38): resolution: {integrity: sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==} engines: {node: '>= 16'} peerDependencies: @@ -8212,15 +8271,15 @@ packages: '@intlify/core-base': 9.13.1 '@intlify/shared': 9.13.1 '@vue/devtools-api': 6.6.1 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) - /vue-router@4.3.2(vue@3.4.34): + /vue-router@4.3.2(vue@3.4.38): resolution: {integrity: sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==} peerDependencies: vue: ^3.2.0 dependencies: '@vue/devtools-api': 6.6.1 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) dev: false /vue-template-compiler@2.7.16: @@ -8246,39 +8305,39 @@ packages: resolution: {integrity: sha512-YwdQ1YjbHzcUsA7Vj5ziQLoX7oQZGWDZNaAadLu7EZzV9UU8Dd2IXAxGobF7dIHamgz5mPiOgH1Xb3qO8bCGDA==} dependencies: js-binary-schema-parser: 2.0.3 - vue: 3.4.34(typescript@5.2.2) + vue: 3.4.38(typescript@5.2.2) transitivePeerDependencies: - typescript dev: false - /vue@3.4.34(typescript@5.2.2): - resolution: {integrity: sha512-VZze05HWlA3ItreQ/ka7Sx7PoD0/3St8FEiSlSTVgb6l4hL+RjtP2/8g5WQBzZgyf8WG2f+g1bXzC7zggLhAJA==} + /vue@3.4.38(typescript@5.2.2): + resolution: {integrity: sha512-f0ZgN+mZ5KFgVv9wz0f4OgVKukoXtS3nwET4c2vLBGQR50aI8G0cqbFtLlX9Yiyg3LFGBitruPHt2PxwTduJEw==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.34 - '@vue/compiler-sfc': 3.4.34 - '@vue/runtime-dom': 3.4.34 - '@vue/server-renderer': 3.4.34(vue@3.4.34) - '@vue/shared': 3.4.34 + '@vue/compiler-dom': 3.4.38 + '@vue/compiler-sfc': 3.4.38 + '@vue/runtime-dom': 3.4.38 + '@vue/server-renderer': 3.4.38(vue@3.4.38) + '@vue/shared': 3.4.38 typescript: 5.2.2 - /vueuc@0.4.58(vue@3.4.34): + /vueuc@0.4.58(vue@3.4.38): resolution: {integrity: sha512-Wnj/N8WbPRSxSt+9ji1jtDHPzda5h2OH/0sFBhvdxDRuyCZbjGg3/cKMaKqEoe+dErTexG2R+i6Q8S/Toq1MYg==} peerDependencies: vue: ^3.0.11 dependencies: - '@css-render/vue3-ssr': 0.15.14(vue@3.4.34) + '@css-render/vue3-ssr': 0.15.14(vue@3.4.38) '@juggle/resize-observer': 3.4.0 css-render: 0.15.14 evtd: 0.2.4 seemly: 0.3.8 - vdirs: 0.1.8(vue@3.4.34) - vooks: 0.2.12(vue@3.4.34) - vue: 3.4.34(typescript@5.2.2) + vdirs: 0.1.8(vue@3.4.38) + vooks: 0.2.12(vue@3.4.38) + vue: 3.4.38(typescript@5.2.2) dev: false /webidl-conversions@7.0.0: diff --git a/postcss.config.cjs b/postcss.config.cjs index a8400a98..8b3b8b61 100644 --- a/postcss.config.cjs +++ b/postcss.config.cjs @@ -8,31 +8,32 @@ module.exports = { 'ff > 31', 'ie >= 8', 'last 10 versions', + 'not dead', ], grid: true, }, // 为了适配 postcss8.x 版本的转换库 - 'postcss-px-to-viewport-8-plugin': { - inlinePxToViewport: true, - /** 视窗的宽度(设计稿的宽度) */ + 'postcss-px-to-viewport-8-with-include': { + // 横屏时使用的视口宽度 + landscapeWidth: 1920, + // 视窗的宽度(设计稿的宽度) viewportWidth: 1920, - /** 视窗的高度(设计稿高度, 一般无需指定) */ - viewportHeight: 1080, - /** 指定 px 转换为视窗单位值的小数位数 */ + // 指定 px 转换为视窗单位值的小数位数 unitPrecision: 3, - /** 指定需要转换成的视窗单位 */ - viewportUnit: 'rem', - /** 制定字体转换单位 */ - fontViewportUnit: 'rem', - /** 指定不转换为视窗单位的类 */ + // 指定需要转换成的视窗单位 + viewportUnit: 'vw', + // 制定字体转换单位 + fontViewportUnit: 'vw', + // 指定不转换为视窗单位的类 selectorBlackList: ['.ignore'], - /** 小于或等于 1px 不转换为视窗单位 */ + // 小于或等于 1px 不转换为视窗单位 minPixelValue: 1, - /** 允许在媒体查询中转换 px */ + // 允许在媒体查询中转换 px mediaQuery: false, - exclude: /(\/|\\)(node_modules)(\/|\\)/, // 忽略某些文件夹下的文件或特定文件，例如 'node_modules' 下的文件 - include: [/^src[/\\].*\.(vue|tsx|jsx|ts(?!d))$/], - preserve: true, + // 忽略某些文件夹下的文件或特定文件，例如 'node_modules' 下的文件 + exclude: /node_modules/, + // 指定一个空的文件夹，避免影响到无需转换的文件 + include: [], }, }, } diff --git a/src/components-pro/RCollapse/Collapse.tsx b/src/components-pro/RCollapse/Collapse.tsx new file mode 100644 index 00000000..511de544 --- /dev/null +++ b/src/components-pro/RCollapse/Collapse.tsx @@ -0,0 +1,49 @@ +/** + * + * @author Ray + * + * @date 2024-05-16 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import { RCollapseGrid, RForm } from '@/components' + +import { collapseGridProps, formProps } from '@/components' + +/** + * + * @description + * 基于 RCollapseGrid 和 RForm 的折叠表单组件； + * 同样也继承了 RCollapseGrid 组件的缺点，必须使用 NFormItemGi, NGridItem 组件包裹表单项。 + */ +export default defineComponent({ + name: 'RCollapse', + props: Object.assign( + {}, + { + ...collapseGridProps, + open: { + type: Boolean, + default: true, + }, + cols: { + type: Number, + default: 4, + }, + }, + formProps, + ), + render() { + const { $slots, $props } = this + const { labelPlacement, showFeedback, ...rest } = $props + + return ( + + {$slots} + + ) + }, +}) diff --git a/src/components-pro/RTablePro/index.ts b/src/components-pro/RTablePro/index.ts new file mode 100644 index 00000000..45850acf --- /dev/null +++ b/src/components-pro/RTablePro/index.ts @@ -0,0 +1,11 @@ +import RTablePro from './src/TablePro' +import tableProProps from './src/props' +import { useTablePro } from './src/hooks/useTablePro' + +import type { ExtractPropTypes } from 'vue' + +type TableProProps = ExtractPropTypes + +export type { TableProProps } + +export { RTablePro, useTablePro, tableProProps } diff --git a/src/components-pro/RTablePro/src/TablePro.tsx b/src/components-pro/RTablePro/src/TablePro.tsx new file mode 100644 index 00000000..5741ddf0 --- /dev/null +++ b/src/components-pro/RTablePro/src/TablePro.tsx @@ -0,0 +1,179 @@ +/** + * + * @author Ray + * + * @date 2024-05-10 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import { RTable } from '@/components' + +import props from './props' +import { useTable } from '@/components' +import { call } from '@/utils' +import { usePagination } from '@/hooks' + +import type { TablePagination, TableRequestConfig, TableProInst } from './types' +import type { Recordable } from '@/types' + +export default defineComponent({ + name: 'RTablePro', + props, + setup(props) { + const [register, { getTableInstance }] = useTable() + const [ + paginationRef, + { + getPage, + getPageSize, + setCallback, + setItemCount, + getPagination, + resetPagination, + getItemCount, + }, + ] = usePagination(void 0, { + prefix: (info) => `共 ${info.itemCount} 条`, + }) + const tableRequestRef = computed(() => props.request) + + // 获取最新 statistics 和 pagination 值 + const update = (): TablePagination => { + const pagination = getPagination() + + return { + getItemCount, + getPage, + getPageSize, + } + } + + // 派发表格更新事件 + const emitTableUpdate = () => { + const { onTablePaginationUpdate } = props + + if (onTablePaginationUpdate) { + call(onTablePaginationUpdate, update()) + } + } + + // 合并请求参数 + const combineRequestParams = (extraConfig?: TableRequestConfig) => { + const config = Object.assign({}, props.requestConfig, extraConfig) + + const { params, formatRangeTime } = config + + // 转换时间范围，该功能仅支持 NDatePicker range 模式参数 + if (formatRangeTime?.length && params) { + formatRangeTime.forEach((curr) => { + const { key, target } = curr + const val = params[key] as [number, number] | null + + if (val && target?.length) { + const [start, end] = val + + params[target[0]] = start + params[target[1]] = end + } else { + // 当传递时间参数被清空时，则清空对应 time key + params[key] = null + params[target[0]] = null + params[target[1]] = null + } + }) + } + + const requestParams = Object.assign({}, params, { + page: getPage(), + pageSize: getPageSize(), + }) + + return requestParams + } + + // 会重置 pagination 的请求 + const runResetPaginationRequest = (extraConfig?: TableRequestConfig) => { + resetPagination() + + const requestParams = combineRequestParams(extraConfig) + + tableRequestRef.value?.(requestParams) + } + + // 不会重置 pagination 的请求 + const runRequest = (extraConfig?: TableRequestConfig) => { + const requestParams = combineRequestParams(extraConfig) + + tableRequestRef.value?.(requestParams) + } + + watchEffect(() => { + setItemCount(props.paginationCount) + setCallback(() => { + const { manual } = props + + if (!manual) { + runRequest() + } + + emitTableUpdate() + }) + }) + + onMounted(() => { + const { onRegister } = props + + if (onRegister && getTableInstance()) { + const { + clearFilters, + clearSorter, + downloadCsv, + filters, + page, + scrollTo, + sort, + filter, + print, + } = getTableInstance() + + call(onRegister, { + getTablePagination: update, + runTableRequest: runResetPaginationRequest, + clearFilters, + clearSorter, + downloadCsv, + filters, + page, + scrollTo, + sort, + filter, + print, + getCurrentTableRequestParams: + combineRequestParams as TableProInst['getCurrentTableRequestParams'], + }) + } + }) + + return { + register, + paginationRef, + } + }, + render() { + const { register, $props, paginationRef, $slots } = this + const { onRegister, showPagination, ...rest } = $props + + return ( + + {$slots} + + ) + }, +}) diff --git a/src/components-pro/RTablePro/src/hooks/useTablePro.ts b/src/components-pro/RTablePro/src/hooks/useTablePro.ts new file mode 100644 index 00000000..947a1246 --- /dev/null +++ b/src/components-pro/RTablePro/src/hooks/useTablePro.ts @@ -0,0 +1,172 @@ +import type { Recordable } from '@/types' +import type { TableProInst, TableRequestConfig } from '../types' +import type { + RTableInst, + CsvOptionsType, + FilterState, + ScrollToOptions, + ColumnKey, + SortOrder, +} from '@/components/RTable/src/types' + +/** + * + * @description + * 获取 TablePro 实例上的一些方法。 + * 使用方法与 useTable 类似。 + */ +export const useTablePro = () => { + const tableInst = ref() + + const register = (inst: TableProInst) => { + if (inst) { + tableInst.value = inst + } + } + + /** + * + * @description + * 获取 TablePro 实例。 + */ + const getTableProInstance = () => { + if (!tableInst.value) { + throw new Error( + '[useTablePro]: table instance is not ready yet. if you are using useTablePro, please make sure you have called register method in onRegister event.', + ) + } + + return tableInst.value + } + + /** + * + * @description + * 获取 statistics, pagination 更新信息。 + */ + const getTablePagination = () => + getTableProInstance().getTablePagination.call(null) + + /** + * + * @description + * 手动触发表格请求，用于手动刷新表格。 + * 如果设置了 manual 为 true，则需要手动调用该函数。 + * 该函数会自动匹配 statistics, pagination 更新的值去请求。 + * + * 允许手动配置 TableRequestConfig 参数，会自动合并 props tableRequestConfig 配置。 + * 并且，运行该函数会重置 pagination 为初始状态。 + */ + const runTableRequest = ( + extraConfig?: TableRequestConfig, + ) => getTableProInstance().runTableRequest.call(null, extraConfig) + + /** + * + * @description + * 清空所有 filter 状态。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#filter-and-sorter + */ + const clearFilters = () => getTableProInstance().clearFilters.call(null) + + /** + * + * @description + * 清空所有 sort 状态。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#filter-and-sorter + */ + const clearSorter = () => getTableProInstance().clearSorter.call(null) + + /** + * + * @description + * 下载 CSV。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#export-csv.vue + */ + const downloadCsv = (options?: CsvOptionsType) => + getTableProInstance().downloadCsv.call(null, options) + + /** + * + * @description + * 设定表格当前的过滤器。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#filter-and-sorter + */ + const filters = (filters: FilterState | null) => + getTableProInstance().filters.call(null, filters) + + /** + * + * @description + * 手动设置 page。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#DataTable-Methods + */ + const page = (page: number) => getTableProInstance().page.call(null, page) + + /** + * + * @description + * 滚动内容。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#DataTable-Methods + */ + const scrollTo: ScrollToOptions = (options) => + // eslint-disable-next-line @typescript-eslint/no-explicit-any + getTableProInstance().scrollTo(options as any) + + /** + * + * @description + * 设定表格的过滤状态。 + * + * @see https://www.naiveui.com/zh-CN/dark/components/data-table#DataTable-Methods + */ + const sort = (columnKey: ColumnKey, order: SortOrder) => + getTableProInstance().sort.call(null, columnKey, order) + + /** + * + * @description + * 打印表格。 + */ + const print = () => getTableProInstance().print.call(null) + + /** + * + * @param extraConfig 额外请求合并配置项 + * + * @description + * 获取当前内部表格请求参数。 + */ + const getCurrentTableRequestParams = ( + extraConfig?: TableRequestConfig, + ): T & Recordable => + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + getTableProInstance().getCurrentTableRequestParams.call(null, extraConfig) + + return [ + register, + { + clearFilters, + getTableProInstance, + clearSorter, + downloadCsv, + filters, + page, + scrollTo, + sort, + getTablePagination, + runTableRequest, + print, + getCurrentTableRequestParams, + }, + ] as const +} + +export type UseTableProReturn = ReturnType diff --git a/src/components-pro/RTablePro/src/props.ts b/src/components-pro/RTablePro/src/props.ts new file mode 100644 index 00000000..0e83bd2a --- /dev/null +++ b/src/components-pro/RTablePro/src/props.ts @@ -0,0 +1,106 @@ +import { tableProps } from '@/components' +import { omit } from 'lodash-es' + +import type { PropType } from 'vue' +import type { TableProInst, TablePagination, TableRequestConfig } from './types' +import type { AnyFC } from '@/types' + +const props = { + ...omit(tableProps, ['pagination']), + /** + * + * @description + * 分页总数。 + * + * @default 1 + */ + paginationCount: { + type: Number, + default: 1, + }, + /** + * + * @description + * 注册 useTablePro 钩子函数。 + * + * @default undefined + */ + onRegister: { + type: Function as PropType<(inst: TableProInst) => void>, + default: void 0, + }, + /** + * + * @description + * 是否需要手动控制表格的刷新。 + * 如果设置为 true，在 Pagination 更新时，不会自动触发表格的刷新。 + * + * @default false + */ + manual: { + type: Boolean, + default: false, + }, + /** + * + * @description + * 刷新表格的请求函数。 + * 该属性用于配置表格的刷新请求函数。 + * + * 如果设置了该属性，则会在表格刷新时调用该函数。 + * + * @default undefined + */ + request: { + type: Function as PropType, + }, + /** + * + * @description + * pagination 更新时的回调函数。 + * + * @default undefined + */ + onTablePaginationUpdate: { + type: Function as PropType<(pagination: TablePagination) => void>, + }, + /** + * + * @description + * 请求函数的参数。 + * 该属性用于配置请求函数的参数。 + * + * @default {} + */ + requestConfig: { + type: Object as PropType, + default: () => ({}), + }, + /** + * + * @description + * 是否显示分页器。 + * 如果需要显示分页器，则设置为 true。 + * + * @default false + */ + showPagination: { + type: Boolean, + default: false, + }, + /** + * + * @description + * 设置表格数据为异步状态。 + * 当你使用该组件的时候，会默认认为你总是异步获取数据，所以重写了原组件的 remote， + * 现在 remote 默认为开启状态，也就是默认为 true。 + * + * @default true + */ + remote: { + type: Boolean, + default: true, + }, +} + +export default props diff --git a/src/components-pro/RTablePro/src/types.ts b/src/components-pro/RTablePro/src/types.ts new file mode 100644 index 00000000..2583693d --- /dev/null +++ b/src/components-pro/RTablePro/src/types.ts @@ -0,0 +1,75 @@ +import type { TableProps, RTableInst } from '@/components' +import type { UsePaginationReturn } from '@/hooks' +import type { Recordable } from '@/types' + +export type FormatRangeTime = { + /** + * + * @description + * 请求参数中需要格式化的时间参数字段。 + */ + key: string | number + /** + * + * @description + * 后端接口中需要的起止时间参数字段。 + */ + target: [string | number, string | number] +} + +/** + * + * @description + * Pagination 分页配置。 + */ +export type TablePagination = Pick< + UsePaginationReturn[1], + 'getItemCount' | 'getPage' | 'getPageSize' +> + +export interface TableRequestConfig { + /** + * + * @description + * 请求参数。 + * @default undefined + */ + params?: Params + /** + * + * @description + * 格式化时间范围，该字段用于格式化时间范围。 + * 并且仅支持 NDatePicker range 模式。 + * 如果在请求的参数中，有时间段的字段，且需要格式化时间段，则需要配置该字段。 + * + * @default undefined + */ + formatRangeTime?: FormatRangeTime[] +} + +export type TableProProps = Omit + +export interface TableProInst extends Omit { + /** + * + * @description + * 获取 pagination 更新值。 + */ + getTablePagination: () => TablePagination + /** + * + * @description + * 手动触发表格请求，用于手动刷新表格。 + */ + runTableRequest: (extraConfig?: TableRequestConfig) => void + /** + * + * @param extraConfig 额外请求合并配置项 + * + * @description + * 获取当前内部表格请求参数。 + */ + getCurrentTableRequestParams: ( + extraConfig?: TableRequestConfig, + ) => TableRequestConfig['params'] & Recordable +} diff --git a/src/components-pro/index.ts b/src/components-pro/index.ts new file mode 100644 index 00000000..517094e4 --- /dev/null +++ b/src/components-pro/index.ts @@ -0,0 +1,4 @@ +import RCollapse from './RCollapse/Collapse' + +export * from './RTablePro' +export { RCollapse } diff --git a/src/components/RChart/src/index.tsx b/src/components/RChart/src/index.tsx index 96b6716d..25689759 100644 --- a/src/components/RChart/src/index.tsx +++ b/src/components/RChart/src/index.tsx @@ -48,7 +48,7 @@ import type { DropdownProps, DropdownOption } from 'naive-ui' // setOption 默认配置项 const defaultChartOptions = { - notMerge: false, + notMerge: true, lazyUpdate: true, silent: false, replaceMerge: [], @@ -434,8 +434,8 @@ export default defineComponent({ const options = combineChartOptions(ndata) const setOpt = Object.assign( {}, - props.setChartOptions, defaultChartOptions, + props.setChartOptions, ) // 如果 options 发生变动更新 echarts diff --git a/src/components/RChart/src/props.ts b/src/components/RChart/src/props.ts index 1a5fa87b..727d1ed5 100644 --- a/src/components/RChart/src/props.ts +++ b/src/components/RChart/src/props.ts @@ -356,12 +356,12 @@ const props = { * @description * 设置 setOptions 方法配置项。 * - * @default {notMerge:false,lazyUpdate:true,silent:false,replaceMerge:[]} + * @default {notMerge:true,lazyUpdate:true,silent:false,replaceMerge:[]} */ setChartOptions: { type: Object as PropType, default: () => ({ - notMerge: false, + notMerge: true, lazyUpdate: true, silent: false, replaceMerge: [], diff --git a/src/components/RCollapseGrid/src/index.scss b/src/components/RCollapseGrid/src/index.scss index f841bddf..4e6b293d 100644 --- a/src/components/RCollapseGrid/src/index.scss +++ b/src/components/RCollapseGrid/src/index.scss @@ -20,4 +20,8 @@ } } } + + .ray-collapse-grid__suffix--btn { + align-self: var(--r-collapse-grid-action-align); + } } diff --git a/src/components/RCollapseGrid/src/index.tsx b/src/components/RCollapseGrid/src/index.tsx index 3d74a3dd..57c050f7 100644 --- a/src/components/RCollapseGrid/src/index.tsx +++ b/src/components/RCollapseGrid/src/index.tsx @@ -32,6 +32,13 @@ export default defineComponent({ props, setup(props) { const modelCollapsed = ref(!props.open) + const cssVars = computed(() => { + const cssVar = { + '--r-collapse-grid-action-align': props.actionAlign, + } + + return cssVar + }) const collapseClick = () => { modelCollapsed.value = !modelCollapsed.value @@ -68,11 +75,14 @@ export default defineComponent({ modelCollapsed, collapseClick, CollapseIcon, + cssVars, } }, render() { + const { cssVars } = this + return ( - + {{ default: () => ( {this.$slots.default?.()} - + {this.$slots.action?.()} {this.CollapseIcon()} diff --git a/src/components/RCollapseGrid/src/props.ts b/src/components/RCollapseGrid/src/props.ts index 776d66c3..1a0abc5b 100644 --- a/src/components/RCollapseGrid/src/props.ts +++ b/src/components/RCollapseGrid/src/props.ts @@ -1,10 +1,21 @@ import { gridProps } from 'naive-ui' import type { PropType } from 'vue' -import type { CollapseToggleText } from './types' +import type { CollapseToggleText, ActionAlignType } from './types' import type { AnyFC, MaybeArray } from '@/types' const props = { + /** + * + * @description + * 自定义操作按钮区域按钮列排列方式。 + * + * @default end + */ + actionAlign: { + type: String as PropType, + default: 'end', + }, open: { /** * diff --git a/src/components/RCollapseGrid/src/types.ts b/src/components/RCollapseGrid/src/types.ts index 12094f2a..3fb53aa6 100644 --- a/src/components/RCollapseGrid/src/types.ts +++ b/src/components/RCollapseGrid/src/types.ts @@ -1 +1,3 @@ export type CollapseToggleText = [string | number, string | number] + +export type ActionAlignType = 'auto' | 'end' | 'center' | 'start' diff --git a/src/components/RModal/src/hooks/useModal.ts b/src/components/RModal/src/hooks/useModal.ts index 2332f6a9..50937c65 100644 --- a/src/components/RModal/src/hooks/useModal.ts +++ b/src/components/RModal/src/hooks/useModal.ts @@ -25,8 +25,6 @@ const useModal = () => { }, trigger: 'none', style: { - padding: - '0 var(--n-padding-left) var(--n-padding-bottom) var(--n-padding-left)', width: 'auto', height: 'calc(100vh - 29px - var(--n-padding-bottom) - var(--n-padding-bottom) - var(--n-padding-top))', diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx index dc221da5..7dcda266 100644 --- a/src/components/RTable/src/Table.tsx +++ b/src/components/RTable/src/Table.tsx @@ -25,7 +25,11 @@ import { pick } from 'lodash-es' import type { DropdownOption, DataTableInst } from 'naive-ui' import type { ComponentSize } from '@/types' -import type { C as CType, PropsComponentPopselectKeys } from './types' +import type { + C as CType, + PropsComponentPopselectKeys, + RTableInst, +} from './types' export default defineComponent({ name: 'RTable', @@ -34,7 +38,7 @@ export default defineComponent({ setup(props, ctx) { const { expose, emit } = ctx - const rTableInst = ref() + const rTableInst = ref() const wrapperRef = ref() const uuidWrapper = uuid(16) // wrapper id @@ -147,7 +151,7 @@ export default defineComponent({ const { toolOptions } = props return toolOptions - ?.filter(() => Boolean) + ?.filter(Boolean) .map((curr) => (typeof curr === 'function' ? curr() : curr)) } @@ -251,6 +255,7 @@ export default defineComponent({ title, $slots, propsPopselectValue, + renderWrapperHeader, } = this const { class: className } = $attrs const { tool, combineRowProps, contextMenuSelect } = this @@ -299,9 +304,11 @@ export default defineComponent({ ) : null} ), - header: renderNode(title, { - defaultElement:
, - }), + header: renderWrapperHeader + ? renderNode(title, { + defaultElement:
, + }) + : null, // eslint-disable-next-line @typescript-eslint/no-explicit-any 'header-extra': tool($props as any), footer: () => $slots.tableFooter?.(), diff --git a/src/components/RTable/src/hooks/useCheckedRowKeys.ts b/src/components/RTable/src/hooks/useCheckedRowKeys.ts index 6590f6de..26f42581 100644 --- a/src/components/RTable/src/hooks/useCheckedRowKeys.ts +++ b/src/components/RTable/src/hooks/useCheckedRowKeys.ts @@ -280,7 +280,7 @@ const useCheckedRowKeys = < * 选中指定的 keys。 * 当你调用该方法时，会将 keys 与 data 中的 rows 进行比对，将匹配的 rows 添加到已选中的 rows 中。 * - * 如果 multiple 为 false，那么只会选中一个 key； + * 如果 multiple 为 false，那么只会选中一个 key；重复的选择，将会以最后一次绑定的 key 为准。 * 所以，如果你需要选中多个 key，需要将 multiple 设置为 true。 */ const selectKey = (key: RowKey) => { diff --git a/src/components/RTable/src/hooks/useTable.ts b/src/components/RTable/src/hooks/useTable.ts index 5d6ec7bf..2a3cfcc0 100644 --- a/src/components/RTable/src/hooks/useTable.ts +++ b/src/components/RTable/src/hooks/useTable.ts @@ -61,7 +61,6 @@ const useTable = () => { '[useTable]: table instance is not ready yet. if you are using useTable, please make sure you have called register method in onRegister event.', ) } - console.log(tableRef.value) return tableRef.value } diff --git a/src/components/RTable/src/props.ts b/src/components/RTable/src/props.ts index 7163f282..0eff3b35 100644 --- a/src/components/RTable/src/props.ts +++ b/src/components/RTable/src/props.ts @@ -25,6 +25,18 @@ import type { Recordable } from '@/types' const props = { ...dataTableProps, + /** + * + * @description + * 是否渲染外层容器 header，默认渲染。 + * 如果配置为 false，则不会显示外层容器的头部。 + * + * @default true + */ + renderWrapperHeader: { + type: Boolean, + default: true, + }, /** * * @description diff --git a/src/components/RTable/src/types.ts b/src/components/RTable/src/types.ts index e22388c1..cdc1e625 100644 --- a/src/components/RTable/src/types.ts +++ b/src/components/RTable/src/types.ts @@ -47,7 +47,14 @@ export interface C extends DataTableBaseColumn { children?: C[] } -export interface RTableInst extends Omit {} +export interface RTableInst extends Omit { + /** + * + * @description + * 打印表格。 + */ + print: () => void +} export type OverridesTableColumn = C | DataTableColumn diff --git a/src/hooks/web/useDevice.ts b/src/hooks/web/useDevice.ts index f3c94190..09d767c3 100644 --- a/src/hooks/web/useDevice.ts +++ b/src/hooks/web/useDevice.ts @@ -33,6 +33,13 @@ export interface UseDeviceOptions extends UseWindowSizeOptions { * @default 768 */ media?: number + /** + * + * @description + * 当尺寸更新后的回调函数。 + * + * @default undefined + */ observer?: Callback } @@ -72,7 +79,7 @@ export function useDevice(options?: UseDeviceOptions) { width, height, isTabletOrSmaller: readonly(isTabletOrSmaller), - } + } as const } export type UseDeviceReturnType = ReturnType diff --git a/src/hooks/web/useElementFullscreen.ts b/src/hooks/web/useElementFullscreen.ts index 9a93728c..2cbdb8e2 100644 --- a/src/hooks/web/useElementFullscreen.ts +++ b/src/hooks/web/useElementFullscreen.ts @@ -196,6 +196,9 @@ export const useElementFullscreen = ( element.removeAttribute(ID_TAG) } + // 回滚 z-index 值，避免无限增加 + currentZIndex-- + stopWatch() }) diff --git a/src/layout/components/MenuTag/index.scss b/src/layout/components/MenuTag/index.scss index 6b91db41..f8d4829a 100644 --- a/src/layout/components/MenuTag/index.scss +++ b/src/layout/components/MenuTag/index.scss @@ -55,7 +55,8 @@ $menuTagWrapperWidth: 76px; opacity: 0; & .ray-icon { - transform: translate(-1px, 0px); + width: 11px !important; + height: 11px !important; } } @@ -70,6 +71,9 @@ $menuTagWrapperWidth: 76px; padding: 1px; transition: all 0.3s var(--r-bezier); opacity: 1; + display: flex; + justify-content: center; + align-items: center; } } } diff --git a/src/layout/components/MenuTag/index.tsx b/src/layout/components/MenuTag/index.tsx index c23d3eba..19b24a7c 100644 --- a/src/layout/components/MenuTag/index.tsx +++ b/src/layout/components/MenuTag/index.tsx @@ -490,6 +490,10 @@ export default defineComponent({ {...{ id: uuidScrollBar, }} + themeOverrides={{ + width: '0px', + height: '0px', + }} > : null} - + {isRenderVNode( { diff --git a/src/locales/lang/en-US/menu.json b/src/locales/lang/en-US/menu.json index 1b410da5..0097b828 100644 --- a/src/locales/lang/en-US/menu.json +++ b/src/locales/lang/en-US/menu.json @@ -27,5 +27,6 @@ "SvgIcon": "SVG Icon", "Table": "Table", "TemplateHooks": "Template Api", - "scrollReveal": "Scroll Reveal" + "scrollReveal": "Scroll Reveal", + "TablePro": "Table Pro" } diff --git a/src/locales/lang/zh-CN/menu.json b/src/locales/lang/zh-CN/menu.json index 987d424d..f40c728f 100644 --- a/src/locales/lang/zh-CN/menu.json +++ b/src/locales/lang/zh-CN/menu.json @@ -27,5 +27,6 @@ "SvgIcon": "SVG 图标", "Table": "表格", "TemplateHooks": "模板内置 Api", - "scrollReveal": "滚动动画" + "scrollReveal": "滚动动画", + "TablePro": "高级表格" } diff --git a/src/router/modules/demo/table-pro.ts b/src/router/modules/demo/table-pro.ts new file mode 100644 index 00000000..362fa778 --- /dev/null +++ b/src/router/modules/demo/table-pro.ts @@ -0,0 +1,19 @@ +import { t } from '@/hooks/web/useI18n' +import { LAYOUT } from '@/router/constant' + +import type { AppRouteRecordRaw } from '@/router/types' + +const r: AppRouteRecordRaw = { + path: '/table-pro', + component: () => import('@/views/demo/TablePro'), + meta: { + i18nKey: t('menu.TablePro'), + icon: 'other', + order: 2, + extra: { + label: 'TablePro', + }, + }, +} + +export default r diff --git a/src/views/demo/TablePro.tsx b/src/views/demo/TablePro.tsx new file mode 100644 index 00000000..431514eb --- /dev/null +++ b/src/views/demo/TablePro.tsx @@ -0,0 +1,470 @@ +/** + * + * @author Ray + * + * @date 2024-08-23 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import { RTablePro, RCollapse } from '@/components-pro' +import { + NFlex, + NTag, + NButton, + NFormItemGi, + NInput, + NCard, + NRadioGroup, + NRadioButton, + NFormItem, + NSelect, + NDatePicker, +} from 'naive-ui' + +import { uuid } from '@/utils' +import { useHookPlusRequest } from '@/axios' +import Mock from 'mockjs' +import dayjs from 'dayjs' +import { useTablePro } from '@/components-pro' +import { useCheckedRowKeys } from '@/components' +import { useDayjs } from '@/hooks' + +import type { DataTableColumns } from 'naive-ui' + +type RowData = { + key: number | string + name: string + age: number + address: string + tags: string[] + remark: string + status: string + statusText: string + signTimeEnd: number + signTimeStart: number +} + +interface ParamsRef + extends Partial< + Pick + > { + page?: number + pageSize?: number + RangeTime?: [number, number] | null +} + +interface BasicResponse { + /** + * + * @description + * 返回数据。 + */ + data: T + /** + * + * @description + * 返回描述信息。 + */ + message: string + /** + * + * @description + * 返回状态码。 + */ + code: number + /** + * + * @description + * 额外的错误描述信息。 + */ + exceptionMessage: string +} + +interface PaginationResponse extends BasicResponse { + /** + * + * @description + * 分页总条数。 + */ + total: number + /** + * + * @description + * 分页页数。 + */ + pageSize: number + /** + * + * @description + * 当前页数。 + */ + page: number +} + +export default defineComponent({ + name: 'TableProDemo', + setup() { + const { format } = useDayjs() + + /** + * + * @description + * register: 注册表格实例 + * runTableRequest: 获取 TablePro 内部管理的请求方法，会自动合并 page, pageSize 等参数，如果有。 + * getUpdateInfo: 如果需要自定义请求情况，可以使用该方法获取最新的 page, pageSize 等参数。 + */ + const [ + tableProRegister, + { runTableRequest, getCurrentTableRequestParams, print, downloadCsv }, + ] = useTablePro() + // 表格数据 + const tableDataRef = ref([]) + // 表格列 + const baseColumns: DataTableColumns = [ + { + type: 'selection', + }, + { + title: 'Name', + key: 'name', + }, + { + title: 'Sign Status', + key: 'statusText', + }, + { + title: 'Sign Time', + key: 'signTimeStart', + render: (row: RowData) => + format(row.signTimeStart) + ' ~ ' + format(row.signTimeEnd), + }, + { + title: 'Age', + key: 'age', + }, + { + title: 'Address', + key: 'address', + }, + { + title: 'Tags', + key: 'tags', + render: (row: RowData) => { + const tags = row.tags.map((tagKey) => { + return ( + + {tagKey} + + ) + }) + + return tags + }, + }, + { + title: 'Remark', + key: 'remark', + }, + ] + // 表格分页数据 + const itemCountRef = ref(0) + // 查询条件 + const conditionRef = ref({}) + // 缓存模拟数据，不用关心 + const mockPersonList = ref( + (() => { + const length = 30 + const list: RowData[] = [] + const time = dayjs().valueOf() + + for (let i = 0; i < length; i++) { + list.push({ + key: uuid(), + name: Mock.Random.cname(), + age: i + 20, + address: Mock.Random.city(), + tags: ['nice', 'developer'], + remark: '我是一条很长很长的备注', + status: i % 2 === 0 ? 'success' : 'error', + statusText: i % 2 === 0 ? '在线' : '离线', + signTimeStart: dayjs(time) + .add(i * 2, 'year') + .valueOf(), + signTimeEnd: dayjs(time) + .add(i + 5, 'day') + .valueOf(), + }) + } + + return list + })(), + ) + const radioRef = ref({ + pagination: true, + manual: false, + }) + const [ + checkedRowKeys, + { checkedRowKeysBind, getKeys, getRows, clearKey, clearAll, selectKey }, + ] = useCheckedRowKeys(tableDataRef, baseColumns, { + rowKey: 'key', + onChange: (keys, rows, meta) => {}, + }) + + const isNullOrUndefined = (value: unknown) => { + return value === null || value === void 0 + } + + // 模拟请求 + const getPersonList = ( + params: ParamsRef, + ): Promise> => { + return new Promise((resolve) => { + const { + page = 1, + pageSize = 10, + name, + status, + signTimeStart, + signTimeEnd, + } = params || {} + let list: RowData[] = mockPersonList.value + const defaultLength = mockPersonList.value.length + + if (name) { + list = list.filter((curr) => curr.name.includes(name)) + } + + if (status) { + list = list.filter((curr) => curr.status === status) + } + + if (signTimeStart && signTimeEnd) { + list = list.filter((curr) => { + return ( + curr.signTimeStart >= signTimeStart && + curr.signTimeEnd <= signTimeEnd + ) + }) + } + + list = list.slice((page - 1) * pageSize, page * pageSize) + + setTimeout(() => { + resolve({ + code: 0, + data: list, + total: + isNullOrUndefined(status) && + isNullOrUndefined(name) && + (isNullOrUndefined(signTimeStart) || + isNullOrUndefined(signTimeEnd)) + ? defaultLength + : list.length, + message: 'success', + page, + pageSize, + } as PaginationResponse) + }, 1000) + }) + } + + const { run: runGetPersonList, loading: loadingGetPersonList } = + useHookPlusRequest(getPersonList, { + onSuccess: (res) => { + const { data, total } = res + + tableDataRef.value = data + itemCountRef.value = total + }, + }) + + return { + tableDataRef, + baseColumns, + itemCountRef, + loadingGetPersonList, + runGetPersonList, + conditionRef, + radioRef, + runTableRequest, + tableProRegister, + print, + downloadCsv, + checkedRowKeysBind, + checkedRowKeys, + getKeys, + getRows, + clearKey, + clearAll, + selectKey, + } + }, + render() { + const { + tableDataRef, + baseColumns, + itemCountRef, + loadingGetPersonList, + runGetPersonList, + conditionRef, + radioRef, + runTableRequest, + tableProRegister, + print, + downloadCsv, + checkedRowKeysBind, + getKeys, + getRows, + clearKey, + clearAll, + selectKey, + } = this + + return ( + + + {{ + default: () => ( + <> + + + + + + + + + + + + + + ), + action: () => ( + + runTableRequest()} + loading={loadingGetPersonList} + > + 查询 + + + ), + }} + + + + + + 显示分页 + 隐藏分页 + + + + + 自动更新 + 取消自动 + + + + + + + + 打印 + + downloadCsv()}> + 下载 csv + + + + + + { + const key = tableDataRef[1].key + + selectKey(key) + }} + > + 选中第二行 + + { + const key = tableDataRef[1].key + + clearKey(key) + }} + > + 取消选中第二行 + + { + tableDataRef?.forEach((curr) => selectKey(curr.key)) + }} + > + 选中当前页面所有行 + + { + clearAll() + }} + > + 取消所有已选中行 + + + + row.key} + v-model:checkedRowKeys={this.checkedRowKeys} + onUpdateCheckedRowKeys={checkedRowKeysBind} + /> + + ) + }, +})