Browse Source

chore: update deps

xingyu 2 years ago
parent
commit
3b3404747e

+ 1 - 1
README.md

@@ -211,7 +211,7 @@ ps:核心功能已经实现,正在对接微信小程序中...
 |----------------------------------------------------------------------|-----------------|--------|
 | [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架          | 3.2.41 |
 | [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具         | 3.1.8  |
-| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.18 |
+| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus    | 2.2.19 |
 | [TypeScript](https://www.typescriptlang.org/docs/)                   | TypeScript      | 4.8.4  |
 | [pinia](https://pinia.vuejs.org/)                                    | vuex5           | 2.0.23 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化             | 9.2.2  |

+ 9 - 9
yudao-ui-admin-vue3/README.md

@@ -28,16 +28,16 @@
 | 框架 | 说明 | 版本     |
 | --- | --- |--------|
 | [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.41 |
-| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8 |
-| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.18 |
-| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4 |
+| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8  |
+| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.19 |
+| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4  |
 | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.23 |
-| [vueuse](https://vueuse.org//) | 常用工具集 | 9.3.1 |
-| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
-| [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.5 |
-| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
-| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.0 |
-| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.21 |
+| [vueuse](https://vueuse.org//) | 常用工具集 | 9.4.0  |
+| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2  |
+| [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.6  |
+| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6  |
+| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.0  |
+| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.22 |
 
 ### 推荐 VScode 开发,插件如下
 

+ 12 - 12
yudao-ui-admin-vue3/package.json

@@ -26,19 +26,19 @@
   },
   "dependencies": {
     "@iconify/iconify": "^3.0.0",
-    "@vueuse/core": "^9.3.1",
+    "@vueuse/core": "^9.4.0",
     "@wangeditor/editor": "^5.1.22",
     "@wangeditor/editor-for-vue": "^5.1.10",
     "@zxcvbn-ts/core": "^2.1.0",
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.5",
+    "dayjs": "^1.11.6",
     "echarts": "^5.4.0",
     "echarts-wordcloud": "^2.0.0",
-    "element-plus": "2.2.18",
+    "element-plus": "2.2.19",
     "intro.js": "^6.0.0",
-    "jsencrypt": "^3.2.1",
+    "jsencrypt": "^3.3.0",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
@@ -49,7 +49,7 @@
     "vue": "3.2.41",
     "vue-cropper": "^1.0.3",
     "vue-i18n": "9.2.2",
-    "vue-router": "^4.1.5",
+    "vue-router": "^4.1.6",
     "vue-types": "^4.2.1",
     "vxe-table": "^4.3.5",
     "web-storage-cache": "^1.1.1",
@@ -58,7 +58,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@iconify/json": "^2.1.124",
+    "@iconify/json": "^2.1.127",
     "@intlify/vite-plugin-vue-i18n": "^6.0.3",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.0",
@@ -67,14 +67,14 @@
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
+    "@typescript-eslint/eslint-plugin": "^5.41.0",
+    "@typescript-eslint/parser": "^5.41.0",
     "@vitejs/plugin-vue": "^3.1.2",
     "@vitejs/plugin-vue-jsx": "^2.0.1",
     "autoprefixer": "^10.4.12",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-define-config": "^1.7.0",
+    "eslint-define-config": "^1.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.6.0",
     "less": "^4.1.3",
@@ -93,7 +93,7 @@
     "stylelint-config-standard": "^29.0.0",
     "stylelint-order": "^5.0.0",
     "typescript": "4.8.4",
-    "unplugin-vue-macros": "^0.13.3",
+    "unplugin-vue-macros": "^0.14.0",
     "vite": "3.1.8",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
@@ -102,7 +102,7 @@
     "vite-plugin-style-import": "2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-windicss": "^1.8.8",
-    "vue-tsc": "^1.0.8",
+    "vue-tsc": "^1.0.9",
     "windicss": "^3.5.6"
   },
   "engines": {

+ 224 - 231
yudao-ui-admin-vue3/pnpm-lock.yaml

@@ -4,7 +4,7 @@ specifiers:
   '@commitlint/cli': ^17.1.2
   '@commitlint/config-conventional': ^17.1.0
   '@iconify/iconify': ^3.0.0
-  '@iconify/json': ^2.1.124
+  '@iconify/json': ^2.1.127
   '@intlify/vite-plugin-vue-i18n': ^6.0.3
   '@purge-icons/generated': ^0.9.0
   '@types/intro.js': ^5.1.0
@@ -13,11 +13,11 @@ specifiers:
   '@types/nprogress': ^0.2.0
   '@types/qrcode': ^1.5.0
   '@types/qs': ^6.9.7
-  '@typescript-eslint/eslint-plugin': ^5.40.1
-  '@typescript-eslint/parser': ^5.40.1
+  '@typescript-eslint/eslint-plugin': ^5.41.0
+  '@typescript-eslint/parser': ^5.41.0
   '@vitejs/plugin-vue': ^3.1.2
   '@vitejs/plugin-vue-jsx': ^2.0.1
-  '@vueuse/core': ^9.3.1
+  '@vueuse/core': ^9.4.0
   '@wangeditor/editor': ^5.1.22
   '@wangeditor/editor-for-vue': ^5.1.10
   '@zxcvbn-ts/core': ^2.1.0
@@ -25,17 +25,17 @@ specifiers:
   autoprefixer: ^10.4.12
   axios: ^0.27.2
   crypto-js: ^4.1.1
-  dayjs: ^1.11.5
+  dayjs: ^1.11.6
   echarts: ^5.4.0
   echarts-wordcloud: ^2.0.0
-  element-plus: 2.2.18
-  eslint: ^8.25.0
+  element-plus: 2.2.19
+  eslint: ^8.26.0
   eslint-config-prettier: ^8.5.0
-  eslint-define-config: ^1.7.0
+  eslint-define-config: ^1.8.0
   eslint-plugin-prettier: ^4.2.1
   eslint-plugin-vue: ^9.6.0
   intro.js: ^6.0.0
-  jsencrypt: ^3.2.1
+  jsencrypt: ^3.3.0
   less: ^4.1.3
   lint-staged: ^13.0.3
   lodash-es: ^4.17.21
@@ -58,7 +58,7 @@ specifiers:
   stylelint-config-standard: ^29.0.0
   stylelint-order: ^5.0.0
   typescript: 4.8.4
-  unplugin-vue-macros: ^0.13.3
+  unplugin-vue-macros: ^0.14.0
   url: ^0.11.0
   vite: 3.1.8
   vite-plugin-compression: ^0.5.1
@@ -71,8 +71,8 @@ specifiers:
   vue: 3.2.41
   vue-cropper: ^1.0.3
   vue-i18n: 9.2.2
-  vue-router: ^4.1.5
-  vue-tsc: ^1.0.8
+  vue-router: ^4.1.6
+  vue-tsc: ^1.0.9
   vue-types: ^4.2.1
   vxe-table: ^4.3.5
   web-storage-cache: ^1.1.1
@@ -81,19 +81,19 @@ specifiers:
 
 dependencies:
   '@iconify/iconify': 3.0.0
-  '@vueuse/core': 9.3.1_vue@3.2.41
+  '@vueuse/core': 9.4.0_vue@3.2.41
   '@wangeditor/editor': 5.1.22
   '@wangeditor/editor-for-vue': 5.1.12_wrllzy32b3ic46yjdgf3mkhqlq
   '@zxcvbn-ts/core': 2.1.0
   animate.css: 4.1.1
   axios: 0.27.2
   crypto-js: 4.1.1
-  dayjs: 1.11.5
+  dayjs: 1.11.6
   echarts: 5.4.0
   echarts-wordcloud: 2.0.0_echarts@5.4.0
-  element-plus: 2.2.18_vue@3.2.41
+  element-plus: 2.2.19_vue@3.2.41
   intro.js: 6.0.0
-  jsencrypt: 3.2.1
+  jsencrypt: 3.3.0
   lodash-es: 4.17.21
   mitt: 3.0.0
   nprogress: 0.2.0
@@ -104,7 +104,7 @@ dependencies:
   vue: 3.2.41
   vue-cropper: 1.0.5
   vue-i18n: 9.2.2_vue@3.2.41
-  vue-router: 4.1.5_vue@3.2.41
+  vue-router: 4.1.6_vue@3.2.41
   vue-types: 4.2.1_vue@3.2.41
   vxe-table: 4.3.5_vue@3.2.41+xe-utils@3.5.7
   web-storage-cache: 1.1.1
@@ -113,7 +113,7 @@ dependencies:
 devDependencies:
   '@commitlint/cli': 17.1.2
   '@commitlint/config-conventional': 17.1.0
-  '@iconify/json': 2.1.124
+  '@iconify/json': 2.1.127
   '@intlify/vite-plugin-vue-i18n': 6.0.3_vite@3.1.8+vue-i18n@9.2.2
   '@purge-icons/generated': 0.9.0
   '@types/intro.js': 5.1.0
@@ -122,16 +122,16 @@ devDependencies:
   '@types/nprogress': 0.2.0
   '@types/qrcode': 1.5.0
   '@types/qs': 6.9.7
-  '@typescript-eslint/eslint-plugin': 5.40.1_ukgdydjtebaxmxfqp5v5ulh64y
-  '@typescript-eslint/parser': 5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q
+  '@typescript-eslint/eslint-plugin': 5.41.0_huremdigmcnkianavgfk3x6iou
+  '@typescript-eslint/parser': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m
   '@vitejs/plugin-vue': 3.1.2_vite@3.1.8+vue@3.2.41
   '@vitejs/plugin-vue-jsx': 2.0.1_vite@3.1.8+vue@3.2.41
   autoprefixer: 10.4.12_postcss@8.4.18
-  eslint: 8.25.0
-  eslint-config-prettier: 8.5.0_eslint@8.25.0
-  eslint-define-config: 1.7.0
-  eslint-plugin-prettier: 4.2.1_hvbqyfstm4urdpm6ffpwfka4e4
-  eslint-plugin-vue: 9.6.0_eslint@8.25.0
+  eslint: 8.26.0
+  eslint-config-prettier: 8.5.0_eslint@8.26.0
+  eslint-define-config: 1.8.0
+  eslint-plugin-prettier: 4.2.1_aniwkeyvlpmwkidetuytnokvcm
+  eslint-plugin-vue: 9.6.0_eslint@8.26.0
   less: 4.1.3
   lint-staged: 13.0.3
   plop: 3.1.1
@@ -148,16 +148,16 @@ devDependencies:
   stylelint-config-standard: 29.0.0_stylelint@14.14.0
   stylelint-order: 5.0.0_stylelint@14.14.0
   typescript: 4.8.4
-  unplugin-vue-macros: 0.13.3_dvkpm5u3cxmoawvcrwfi6jocmq
+  unplugin-vue-macros: 0.14.0_vzwbnacjq6rhyu4ywwt6bu33j4
   vite: 3.1.8_less@4.1.3
   vite-plugin-compression: 0.5.1_vite@3.1.8
-  vite-plugin-eslint: 1.8.1_eslint@8.25.0+vite@3.1.8
+  vite-plugin-eslint: 1.8.1_eslint@8.26.0+vite@3.1.8
   vite-plugin-html: 3.2.0_vite@3.1.8
   vite-plugin-purge-icons: 0.9.1_vite@3.1.8
   vite-plugin-style-import: 2.0.0_vite@3.1.8
   vite-plugin-svg-icons: 2.0.1_vite@3.1.8
   vite-plugin-windicss: 1.8.8_vite@3.1.8
-  vue-tsc: 1.0.8_typescript@4.8.4
+  vue-tsc: 1.0.9_typescript@4.8.4
   windicss: 3.5.6
 
 packages:
@@ -174,6 +174,10 @@ packages:
     resolution: {integrity: sha512-CQkeV+oJxUazwjlHD0/3ZD08QWKuGQkhnrKo3e6ly5pd48VUpXbb77q0xMU4+vc2CkJnDS02Eq/M9ugyX20XZA==}
     dev: true
 
+  /@antfu/utils/0.6.0:
+    resolution: {integrity: sha512-VauUKmo22NYo3y6fIjGjVU7LJyhaedYL9kyabdvIIIl7P+qbNPbQiaLwwk4UOU4McFfA2eg+aIWpEYhkHzsE9Q==}
+    dev: true
+
   /@babel/code-frame/7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
@@ -722,8 +726,8 @@ packages:
       '@floating-ui/core': 1.0.1
     dev: false
 
-  /@humanwhocodes/config-array/0.10.7:
-    resolution: {integrity: sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==}
+  /@humanwhocodes/config-array/0.11.6:
+    resolution: {integrity: sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -755,8 +759,8 @@ packages:
     dependencies:
       '@iconify/types': 2.0.0
 
-  /@iconify/json/2.1.124:
-    resolution: {integrity: sha512-b8oQpGFiPOli65TB1deM5Pv4OGYIsN4T3+QBek85h9t+Ckae5lBg0aUVYm6lpC6FJ3iVlKU7DuPWXsqYVZdHyQ==}
+  /@iconify/json/2.1.127:
+    resolution: {integrity: sha512-pahFCt5Q8XyXHgDz/PQ7LDwqcB+GZ6fuIcikxMYTTI/uoodjT+97QqYV2AcNrYK+gWZU7DqzY2T689Icf4uYfA==}
     dependencies:
       '@iconify/types': 2.0.0
       pathe: 0.3.9
@@ -1088,8 +1092,8 @@ packages:
   /@types/web-bluetooth/0.0.16:
     resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
 
-  /@typescript-eslint/eslint-plugin/5.40.1_ukgdydjtebaxmxfqp5v5ulh64y:
-    resolution: {integrity: sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg==}
+  /@typescript-eslint/eslint-plugin/5.41.0_huremdigmcnkianavgfk3x6iou:
+    resolution: {integrity: sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -1099,12 +1103,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q
-      '@typescript-eslint/scope-manager': 5.40.1
-      '@typescript-eslint/type-utils': 5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q
-      '@typescript-eslint/utils': 5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q
+      '@typescript-eslint/parser': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m
+      '@typescript-eslint/scope-manager': 5.41.0
+      '@typescript-eslint/type-utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m
+      '@typescript-eslint/utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m
       debug: 4.3.4
-      eslint: 8.25.0
+      eslint: 8.26.0
       ignore: 5.2.0
       regexpp: 3.2.0
       semver: 7.3.8
@@ -1114,8 +1118,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q:
-    resolution: {integrity: sha512-IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg==}
+  /@typescript-eslint/parser/5.41.0_wyqvi574yv7oiwfeinomdzmc3m:
+    resolution: {integrity: sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -1124,26 +1128,26 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.40.1
-      '@typescript-eslint/types': 5.40.1
-      '@typescript-eslint/typescript-estree': 5.40.1_typescript@4.8.4
+      '@typescript-eslint/scope-manager': 5.41.0
+      '@typescript-eslint/types': 5.41.0
+      '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4
       debug: 4.3.4
-      eslint: 8.25.0
+      eslint: 8.26.0
       typescript: 4.8.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.40.1:
-    resolution: {integrity: sha512-jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg==}
+  /@typescript-eslint/scope-manager/5.41.0:
+    resolution: {integrity: sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.40.1
-      '@typescript-eslint/visitor-keys': 5.40.1
+      '@typescript-eslint/types': 5.41.0
+      '@typescript-eslint/visitor-keys': 5.41.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q:
-    resolution: {integrity: sha512-DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q==}
+  /@typescript-eslint/type-utils/5.41.0_wyqvi574yv7oiwfeinomdzmc3m:
+    resolution: {integrity: sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -1152,23 +1156,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.40.1_typescript@4.8.4
-      '@typescript-eslint/utils': 5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q
+      '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4
+      '@typescript-eslint/utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m
       debug: 4.3.4
-      eslint: 8.25.0
+      eslint: 8.26.0
       tsutils: 3.21.0_typescript@4.8.4
       typescript: 4.8.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.40.1:
-    resolution: {integrity: sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw==}
+  /@typescript-eslint/types/5.41.0:
+    resolution: {integrity: sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.40.1_typescript@4.8.4:
-    resolution: {integrity: sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA==}
+  /@typescript-eslint/typescript-estree/5.41.0_typescript@4.8.4:
+    resolution: {integrity: sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -1176,8 +1180,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.40.1
-      '@typescript-eslint/visitor-keys': 5.40.1
+      '@typescript-eslint/types': 5.41.0
+      '@typescript-eslint/visitor-keys': 5.41.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -1188,31 +1192,31 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.40.1_z4bbprzjrhnsfa24uvmcbu7f5q:
-    resolution: {integrity: sha512-a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw==}
+  /@typescript-eslint/utils/5.41.0_wyqvi574yv7oiwfeinomdzmc3m:
+    resolution: {integrity: sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.12
-      '@typescript-eslint/scope-manager': 5.40.1
-      '@typescript-eslint/types': 5.40.1
-      '@typescript-eslint/typescript-estree': 5.40.1_typescript@4.8.4
-      eslint: 8.25.0
+      '@typescript-eslint/scope-manager': 5.41.0
+      '@typescript-eslint/types': 5.41.0
+      '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4
+      eslint: 8.26.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.25.0
+      eslint-utils: 3.0.0_eslint@8.26.0
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.40.1:
-    resolution: {integrity: sha512-A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw==}
+  /@typescript-eslint/visitor-keys/5.41.0:
+    resolution: {integrity: sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.40.1
+      '@typescript-eslint/types': 5.41.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
@@ -1285,48 +1289,48 @@ packages:
       vue: 3.2.41
     dev: true
 
-  /@volar/language-core/1.0.8:
-    resolution: {integrity: sha512-uxYSOqBk8ZFSzGjUIPOBEFPOg8F3CE6cLO5meK95DODGIlUlPytGiy9sy8QZ9w7RpUH4XMOX3MH/G48SLgP07A==}
+  /@volar/language-core/1.0.9:
+    resolution: {integrity: sha512-5Fty3slLet6svXiJw2YxhYeo6c7wFdtILrql5bZymYLM+HbiZtJbryW1YnUEKAP7MO9Mbeh+TNH4Z0HFxHgIqw==}
     dependencies:
-      '@volar/source-map': 1.0.8
-      '@vue/reactivity': 3.2.40
+      '@volar/source-map': 1.0.9
+      '@vue/reactivity': 3.2.41
       muggle-string: 0.1.0
     dev: true
 
-  /@volar/source-map/1.0.8:
-    resolution: {integrity: sha512-uKMe+alyfl1Abs5SviKejFoe7x9g6jDPVpVt63Tet4qn1Ziy7tFsvtCpM2Y1Ko5qw2nLIeloLslPqm9/gmbBLQ==}
+  /@volar/source-map/1.0.9:
+    resolution: {integrity: sha512-fazB/vy5ZEJ3yKx4fabJyGNI3CBkdLkfEIRVu6+1P3VixK0Mn+eqyUIkLBrzGYaeFM3GybhCLCvsVdNz0Fu/CQ==}
     dependencies:
       muggle-string: 0.1.0
     dev: true
 
-  /@volar/typescript/1.0.8:
-    resolution: {integrity: sha512-2oY1Apvzcs/5tAn7p1tRlDxNgal5ezaK0h9cutcWALeimsaQBAEE2NAirCrLMHl8DneuDce0tzJqHaQeHw9RmQ==}
+  /@volar/typescript/1.0.9:
+    resolution: {integrity: sha512-dVziu+ShQUWuMukM6bvK2v2O446/gG6l1XkTh2vfkccw1IzjfbiP1TWQoNo1ipTfZOtu5YJGYAx+o5HNrGXWfQ==}
     dependencies:
-      '@volar/language-core': 1.0.8
+      '@volar/language-core': 1.0.9
     dev: true
 
-  /@volar/vue-language-core/1.0.8:
-    resolution: {integrity: sha512-cXb7oTybxcm1vpz003agdYQHyxij7UAaSub60d7W1aMWpqb2iaCbVaq9izgQFlrpC4/JnVs+cJPb/Q6fAUVxBg==}
+  /@volar/vue-language-core/1.0.9:
+    resolution: {integrity: sha512-tofNoR8ShPFenHT1YVMuvoXtXWwoQE+fiXVqSmW0dSKZqEDjWQ3YeXSd0a6aqyKaIbvR7kWWGp34WbpQlwf9Ww==}
     dependencies:
-      '@volar/language-core': 1.0.8
-      '@volar/source-map': 1.0.8
-      '@vue/compiler-dom': 3.2.40
-      '@vue/compiler-sfc': 3.2.40
-      '@vue/reactivity': 3.2.40
-      '@vue/shared': 3.2.40
+      '@volar/language-core': 1.0.9
+      '@volar/source-map': 1.0.9
+      '@vue/compiler-dom': 3.2.41
+      '@vue/compiler-sfc': 3.2.41
+      '@vue/reactivity': 3.2.41
+      '@vue/shared': 3.2.41
       minimatch: 5.1.0
       vue-template-compiler: 2.7.10
     dev: true
 
-  /@volar/vue-typescript/1.0.8:
-    resolution: {integrity: sha512-6jBvA7iwBkRqS2VQx2gLJgfLcF3hcODyJ6Lmiw2tN8D/LVfFCovvzJgPvIQb9Y4i+rha1Y0cpsYOUt9XW2Z7ZA==}
+  /@volar/vue-typescript/1.0.9:
+    resolution: {integrity: sha512-ZLe4y9YNbviACa7uAMCilzxA76gbbSlKfjspXBzk6fCobd8QCIig+VyDYcjANIlm2HhgSCX8jYTzhCKlegh4mw==}
     dependencies:
-      '@volar/typescript': 1.0.8
-      '@volar/vue-language-core': 1.0.8
+      '@volar/typescript': 1.0.9
+      '@volar/vue-language-core': 1.0.9
     dev: true
 
-  /@vue-macros/common/0.12.2:
-    resolution: {integrity: sha512-IxLvuJ2/ixGxNJJAg3kHi2KOHgEpSvEXSGstimp3tB/3eDGM9nvyAqgdWjFyFxKxg0LgyRmvaS4+iaq+c4FoPw==}
+  /@vue-macros/common/0.12.3:
+    resolution: {integrity: sha512-APF/V0WaUwdED+x1BfEoak0GeFXa/mDffQLl4A6WRfHRoJYv+tfJ86CDVqV0KgNhTemEXpMxvR1vY/pARmy3Ow==}
     engines: {node: '>=14.19.0'}
     dependencies:
       '@babel/types': 7.19.4
@@ -1334,8 +1338,8 @@ packages:
       magic-string: 0.26.7
     dev: true
 
-  /@vue-macros/define-model/0.13.3_@vueuse+core@9.3.1:
-    resolution: {integrity: sha512-95NcHc5qEa8gcr1kbCwHntVoiOLa28v8TxNDVEi7GlkwUa8Q76TwikQp7voN9QB1MZGTjSGStxjDqCegHuYn7A==}
+  /@vue-macros/define-model/0.13.4_@vueuse+core@9.4.0:
+    resolution: {integrity: sha512-GjCE4YRon9sfWvvq0SyNXJFg4B9803Q1KhSRq55waj9qD7xh97rFQhqfSLf9mr3NgM1OlgzQf8kFm6J8N7CTvg==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
       '@vueuse/core': ^9.0.0
@@ -1344,57 +1348,87 @@ packages:
         optional: true
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
-      '@vueuse/core': 9.3.1_vue@3.2.41
+      '@vue-macros/common': 0.12.3
+      '@vueuse/core': 9.4.0_vue@3.2.41
       ast-walker-scope: 0.2.3
       unplugin: 0.9.6
     dev: true
 
-  /@vue-macros/define-render/0.13.3_vue@3.2.41:
-    resolution: {integrity: sha512-Nakx1YV2gqnapbYPyy4l76IOR7I2sgyUvAbWdtjJgTMlpklNXGBErwP+NtDWA5QzDdB9YthostQn4YS/LkTsGw==}
+  /@vue-macros/define-render/0.13.4_vue@3.2.41:
+    resolution: {integrity: sha512-cKl8RzTVgmgnnUzK40KmEtV7C92Y4VRpxG5rgkdwNvdvLtDYPkTEg4gnnYtyhZ/DnwJujOKjvfX381TNToVh3Q==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
       vue: ^2.7.0 || ^3.0.0
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
+      '@vue-macros/common': 0.12.3
       unplugin: 0.9.6
       vue: 3.2.41
     dev: true
 
-  /@vue-macros/hoist-static/0.12.2:
-    resolution: {integrity: sha512-Rit90CwTS0ORfmd/UhY1azERdCKycZ/Mlbi//Sv8hI+H8xZJZz508GGLH+hMsRlgqP6FX7PUgCWnMzA8rqR6Zg==}
+  /@vue-macros/define-slots/0.0.1_vue@3.2.41:
+    resolution: {integrity: sha512-Qdo7H0GI9cRBDDUpws8a7e/E8se1a2JqrR88JIHJCCiUAThLex66o64+tUa19EAVgO/0c877n5rQKZobALwEew==}
     engines: {node: '>=14.19.0'}
+    peerDependencies:
+      vue: ^2.7.0 || ^3.0.0
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
+      '@vue-macros/common': 0.12.3
       unplugin: 0.9.6
+      vue: 3.2.41
     dev: true
 
-  /@vue-macros/setup-component/0.12.2:
-    resolution: {integrity: sha512-735Ev+84qrNSUEyZPiXgm0to01v/LHY/LiTPOAlnmTwfJxi1bisyt3QoMSOM0Arisu6SwKAPViN4+oU4JqBgVA==}
+  /@vue-macros/hoist-static/0.12.3:
+    resolution: {integrity: sha512-TdwTg8rZvbz4nJlEdzZBaZ7V+89x4WgHm9A1HM0O2oMaARUKUJWGEJHTEA3Qpgs5//kVylJRITiCTgUKvJAWbw==}
     engines: {node: '>=14.19.0'}
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
+      '@vue-macros/common': 0.12.3
       unplugin: 0.9.6
     dev: true
 
-  /@vue-macros/setup-sfc/0.12.2:
-    resolution: {integrity: sha512-hrgtSYnSIW5HZQtoNRD8eAeGySWuVRvTWs7dYmCkIN0tjlv3RNaAgUiPeZztkh7TL6cvhXadJCY3TXkmD88AWw==}
+  /@vue-macros/named-template/0.0.1_fqlke5zd32z6y6rj5ddmcmlgue:
+    resolution: {integrity: sha512-o6FUkZJ5NaXJ9QRm0yyW+dJ6WI0p97pNQ042l8i5wp8iV5/bel52rMb7QPavvZxpNYrKhnkcJTN8F5W2ofwJlQ==}
     engines: {node: '>=14.19.0'}
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
+      '@vitejs/plugin-vue': 3.1.2_vite@3.1.8+vue@3.2.41
+      '@vue-macros/common': 0.12.3
+      '@vue/compiler-dom': 3.2.41
       unplugin: 0.9.6
+      unplugin-combine: 0.2.5_rollup@2.79.1+vite@3.1.8
+    transitivePeerDependencies:
+      - esbuild
+      - rollup
+      - vite
+      - vue
+      - webpack
     dev: true
 
-  /@vue-macros/short-emits/0.12.3:
-    resolution: {integrity: sha512-A0+KsyuLigFkrP9jIMjrZ1Ci15pWbIHMMl2pL2DUb/hz6BW/CiGPlPveiJ6IHcfaXEN79on+IlI0EDB2of5AJQ==}
+  /@vue-macros/setup-component/0.12.3:
+    resolution: {integrity: sha512-wKSrBY/HFpKiydMqj0uyAeB3tiPwCT1SV4GoQwUimktEaVpvEx6Zo6ZTdlX7mSlFBGeL2MQEL1OmHMrJ5j1ncQ==}
     engines: {node: '>=14.19.0'}
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
+      '@vue-macros/common': 0.12.3
+      unplugin: 0.9.6
+    dev: true
+
+  /@vue-macros/setup-sfc/0.12.3:
+    resolution: {integrity: sha512-ppxmCZfc2oNVqj2/qq3jLA7mW+1jLRuu4f/mj/sPtlp0SVRE6OlgQe6ngrczGPmhT8yRVLjBrstMPWNTFQDLCQ==}
+    engines: {node: '>=14.19.0'}
+    dependencies:
+      '@rollup/pluginutils': 4.2.1
+      '@vue-macros/common': 0.12.3
+      unplugin: 0.9.6
+    dev: true
+
+  /@vue-macros/short-emits/0.12.4:
+    resolution: {integrity: sha512-8DcVobiMkjxZ7EjsDEuABJ88s3cB7RtMMqQVNOGG667k73PQKhdraz/ZKNYpPStGQD/0Cn2DDH3fqAKTc+vvwg==}
+    engines: {node: '>=14.19.0'}
+    dependencies:
+      '@rollup/pluginutils': 4.2.1
+      '@vue-macros/common': 0.12.3
       unplugin: 0.9.6
     dev: true
 
@@ -1419,15 +1453,6 @@ packages:
       - supports-color
     dev: true
 
-  /@vue/compiler-core/3.2.40:
-    resolution: {integrity: sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==}
-    dependencies:
-      '@babel/parser': 7.19.3
-      '@vue/shared': 3.2.40
-      estree-walker: 2.0.2
-      source-map: 0.6.1
-    dev: true
-
   /@vue/compiler-core/3.2.41:
     resolution: {integrity: sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==}
     dependencies:
@@ -1436,34 +1461,12 @@ packages:
       estree-walker: 2.0.2
       source-map: 0.6.1
 
-  /@vue/compiler-dom/3.2.40:
-    resolution: {integrity: sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==}
-    dependencies:
-      '@vue/compiler-core': 3.2.40
-      '@vue/shared': 3.2.40
-    dev: true
-
   /@vue/compiler-dom/3.2.41:
     resolution: {integrity: sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==}
     dependencies:
       '@vue/compiler-core': 3.2.41
       '@vue/shared': 3.2.41
 
-  /@vue/compiler-sfc/3.2.40:
-    resolution: {integrity: sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==}
-    dependencies:
-      '@babel/parser': 7.19.3
-      '@vue/compiler-core': 3.2.40
-      '@vue/compiler-dom': 3.2.40
-      '@vue/compiler-ssr': 3.2.40
-      '@vue/reactivity-transform': 3.2.40
-      '@vue/shared': 3.2.40
-      estree-walker: 2.0.2
-      magic-string: 0.25.9
-      postcss: 8.4.18
-      source-map: 0.6.1
-    dev: true
-
   /@vue/compiler-sfc/3.2.41:
     resolution: {integrity: sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==}
     dependencies:
@@ -1478,13 +1481,6 @@ packages:
       postcss: 8.4.18
       source-map: 0.6.1
 
-  /@vue/compiler-ssr/3.2.40:
-    resolution: {integrity: sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==}
-    dependencies:
-      '@vue/compiler-dom': 3.2.40
-      '@vue/shared': 3.2.40
-    dev: true
-
   /@vue/compiler-ssr/3.2.41:
     resolution: {integrity: sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==}
     dependencies:
@@ -1498,15 +1494,9 @@ packages:
     resolution: {integrity: sha512-Ku31WzpOV/8cruFaXaEZKF81WkNnvCSlBY4eOGtz5WMSdJvX1v1WWlSMGZeqUwPtQ27ZZz7B62erEMq8JDjcXw==}
     dev: false
 
-  /@vue/reactivity-transform/3.2.40:
-    resolution: {integrity: sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==}
-    dependencies:
-      '@babel/parser': 7.19.3
-      '@vue/compiler-core': 3.2.40
-      '@vue/shared': 3.2.40
-      estree-walker: 2.0.2
-      magic-string: 0.25.9
-    dev: true
+  /@vue/devtools-api/6.4.5:
+    resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
+    dev: false
 
   /@vue/reactivity-transform/3.2.41:
     resolution: {integrity: sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==}
@@ -1517,12 +1507,6 @@ packages:
       estree-walker: 2.0.2
       magic-string: 0.25.9
 
-  /@vue/reactivity/3.2.40:
-    resolution: {integrity: sha512-N9qgGLlZmtUBMHF9xDT4EkD9RdXde1Xbveb+niWMXuHVWQP5BzgRmE3SFyUBBcyayG4y1lhoz+lphGRRxxK4RA==}
-    dependencies:
-      '@vue/shared': 3.2.40
-    dev: true
-
   /@vue/reactivity/3.2.41:
     resolution: {integrity: sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g==}
     dependencies:
@@ -1550,29 +1534,25 @@ packages:
       '@vue/shared': 3.2.41
       vue: 3.2.41
 
-  /@vue/shared/3.2.40:
-    resolution: {integrity: sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==}
-    dev: true
-
   /@vue/shared/3.2.41:
     resolution: {integrity: sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==}
 
-  /@vueuse/core/9.3.1_vue@3.2.41:
-    resolution: {integrity: sha512-xriyD+v3D2ObH/UtnkEl+1sbcLBVHNaZaLi/rqoNEe/B92hggDEFQIGXoQUjdRzYOjASHSezf9uCDtmd7LeWyA==}
+  /@vueuse/core/9.4.0_vue@3.2.41:
+    resolution: {integrity: sha512-JzgenGj1ZF2BHOen5rsFiAyyI9sXAv7aKhNLlm9b7SwYQeKTcxTWdhudonURCSP3Egl9NQaRBzes2lv/1JUt/Q==}
     dependencies:
       '@types/web-bluetooth': 0.0.16
-      '@vueuse/metadata': 9.3.1
-      '@vueuse/shared': 9.3.1_vue@3.2.41
+      '@vueuse/metadata': 9.4.0
+      '@vueuse/shared': 9.4.0_vue@3.2.41
       vue-demi: 0.13.11_vue@3.2.41
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  /@vueuse/metadata/9.3.1:
-    resolution: {integrity: sha512-G1BPhtx3OHaL/y4OZBofh6Xt02G1VA9PuOO8nac9sTKMkMqfyez5VfkF3D9GUjSRNO7cVWyH4rceeGXfr2wdMg==}
+  /@vueuse/metadata/9.4.0:
+    resolution: {integrity: sha512-7GKMdGAsJyQJl35MYOz/RDpP0FxuiZBRDSN79QIPbdqYx4Sd0sVTnIC68KJ6Oln0t0SouvSUMvRHuno216Ud2Q==}
 
-  /@vueuse/shared/9.3.1_vue@3.2.41:
-    resolution: {integrity: sha512-YFu3qcnVeu0S2L4XdQJtBpDcjz6xwqHZtTv/XRhu66/yge1XVhxskUcc7VZbX52xF9A34V6KCfwncP9YDqYFiw==}
+  /@vueuse/shared/9.4.0_vue@3.2.41:
+    resolution: {integrity: sha512-fTuem51KwMCnqUKkI8B57qAIMcFovtGgsCtAeqxIzH3i6nE9VYge+gVfneNHAAy7lj8twbkNfqQSygOPJTm4tQ==}
     dependencies:
       vue-demi: 0.13.11_vue@3.2.41
     transitivePeerDependencies:
@@ -1978,7 +1958,7 @@ packages:
     engines: {node: '>=14.19.0'}
     dependencies:
       '@babel/parser': 7.19.3
-      '@babel/types': 7.19.3
+      '@babel/types': 7.19.4
     dev: true
 
   /astral-regex/2.0.0:
@@ -2647,8 +2627,8 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /dayjs/1.11.5:
-    resolution: {integrity: sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==}
+  /dayjs/1.11.6:
+    resolution: {integrity: sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==}
     dev: false
 
   /de-indent/1.0.2:
@@ -2921,8 +2901,8 @@ packages:
     resolution: {integrity: sha512-EpuHPqu8YhonqLBXHoU6hDJCD98FCe6KDoet3/gY1qsQ6usjJoHqBH2YIVs8FXaAtHwVL8Uqa/fsYao/vq9VWQ==}
     dev: true
 
-  /element-plus/2.2.18_vue@3.2.41:
-    resolution: {integrity: sha512-2pK2zmVOwP14eFl3rGoR+3BWJwDyO+DZCvzjQ8L6qjUR+hVKwFhgxIcSkKJatbcHFw5Xui6UyN20jV+gQP7mLg==}
+  /element-plus/2.2.19_vue@3.2.41:
+    resolution: {integrity: sha512-uN0gt9lUus/IHzu5J6vkbYoYJgUtU05osdtFv9RO27bHKOG5GN7dH6uA3OKfkQQ6R2sV8ZxY1rc9PH1X8Dgrow==}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
@@ -2932,9 +2912,9 @@ packages:
       '@popperjs/core': /@sxzz/popperjs-es/2.11.7
       '@types/lodash': 4.14.186
       '@types/lodash-es': 4.17.6
-      '@vueuse/core': 9.3.1_vue@3.2.41
+      '@vueuse/core': 9.4.0_vue@3.2.41
       async-validator: 4.2.5
-      dayjs: 1.11.5
+      dayjs: 1.11.6
       escape-html: 1.0.3
       lodash: 4.17.21
       lodash-es: 4.17.21
@@ -3248,21 +3228,21 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-config-prettier/8.5.0_eslint@8.25.0:
+  /eslint-config-prettier/8.5.0_eslint@8.26.0:
     resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.25.0
+      eslint: 8.26.0
     dev: true
 
-  /eslint-define-config/1.7.0:
-    resolution: {integrity: sha512-13zk8z8eKO4tpPMvAGV0sa6ok0XuMeu7Zhcizu2bLwcLy1fbNt7/h8PU1wbp9IoIgQETggZJozU0nPXUXOao2g==}
+  /eslint-define-config/1.8.0:
+    resolution: {integrity: sha512-YibjbNkHKMo3QAnV3bgc+BdvmYCcCpuoRdAIc+6W/P91G02ZOrCVaPrco9Uf4md25NanjkV2bnfwce8XfPRS7A==}
     engines: {node: '>= 14.6.0', npm: '>= 6.0.0', pnpm: '>= 7.0.0'}
     dev: true
 
-  /eslint-plugin-prettier/4.2.1_hvbqyfstm4urdpm6ffpwfka4e4:
+  /eslint-plugin-prettier/4.2.1_aniwkeyvlpmwkidetuytnokvcm:
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -3273,25 +3253,25 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.25.0
-      eslint-config-prettier: 8.5.0_eslint@8.25.0
+      eslint: 8.26.0
+      eslint-config-prettier: 8.5.0_eslint@8.26.0
       prettier: 2.7.1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-vue/9.6.0_eslint@8.25.0:
+  /eslint-plugin-vue/9.6.0_eslint@8.26.0:
     resolution: {integrity: sha512-zzySkJgVbFCylnG2+9MDF7N+2Rjze2y0bF8GyUNpFOnT8mCMfqqtLDJkHBuYu9N/psW1A6DVbQhPkP92E+qakA==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      eslint: 8.25.0
-      eslint-utils: 3.0.0_eslint@8.25.0
+      eslint: 8.26.0
+      eslint-utils: 3.0.0_eslint@8.26.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.10
       semver: 7.3.8
-      vue-eslint-parser: 9.1.0_eslint@8.25.0
+      vue-eslint-parser: 9.1.0_eslint@8.26.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -3320,13 +3300,13 @@ packages:
       eslint-visitor-keys: 1.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.25.0:
+  /eslint-utils/3.0.0_eslint@8.26.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.25.0
+      eslint: 8.26.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -3345,14 +3325,15 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.25.0:
-    resolution: {integrity: sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==}
+  /eslint/8.26.0:
+    resolution: {integrity: sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
       '@eslint/eslintrc': 1.3.3
-      '@humanwhocodes/config-array': 0.10.7
+      '@humanwhocodes/config-array': 0.11.6
       '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
@@ -3360,7 +3341,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.25.0
+      eslint-utils: 3.0.0_eslint@8.26.0
       eslint-visitor-keys: 3.3.0
       espree: 9.4.0
       esquery: 1.4.0
@@ -3370,12 +3351,12 @@ packages:
       find-up: 5.0.0
       glob-parent: 6.0.2
       globals: 13.17.0
-      globby: 11.1.0
       grapheme-splitter: 1.0.4
       ignore: 5.2.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
+      is-path-inside: 3.0.3
       js-sdsl: 4.1.5
       js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
@@ -4459,8 +4440,8 @@ packages:
       argparse: 2.0.1
     dev: true
 
-  /jsencrypt/3.2.1:
-    resolution: {integrity: sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA==}
+  /jsencrypt/3.3.0:
+    resolution: {integrity: sha512-OPfQMUU3pJ6KKTvKzr83jePHfyD1zWiWeLtRU9yIWjcbaRWm8MuXIu1/eQlDXPwDZrUjZy+9HVamS2Kmwrvz/Q==}
     dev: false
 
   /jsesc/2.5.2:
@@ -6710,8 +6691,8 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unplugin-combine/0.2.2_rollup@2.79.1+vite@3.1.8:
-    resolution: {integrity: sha512-KkO9B40wjW3ige0a+lYkr1/Q97qZSbtXBTJY5MQdAJCVvSPXtG1mxaSYMoQABN1yF9RHcE9WeOxdl+zdOljeOQ==}
+  /unplugin-combine/0.2.5_rollup@2.79.1+vite@3.1.8:
+    resolution: {integrity: sha512-25XxqY7BVYR7788FhKfXZiLXrd3WMn6nTm3a7sHsb94chwTLseEdkOIIh7FnqhGuDiHKc1km508G+U1fbCNYNw==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
       esbuild: '>=0.13'
@@ -6728,37 +6709,40 @@ packages:
       webpack:
         optional: true
     dependencies:
+      '@antfu/utils': 0.6.0
       rollup: 2.79.1
-      unplugin: 0.9.6
+      unplugin: 0.10.2
       vite: 3.1.8_less@4.1.3
     dev: true
 
-  /unplugin-vue-define-options/0.12.2:
-    resolution: {integrity: sha512-RQd+JWKx7Z1kKVq5X+K8yBv5h1Of//R6DHY0kF2cF9NPgTxu5u1pfaL24Dup0mQ+5ulrPaiEXti5G/bWMMg+Ig==}
+  /unplugin-vue-define-options/0.12.3:
+    resolution: {integrity: sha512-Jo4XFyW8so2BnVxMKa1hcarnMErp9vOueOrHLUHxf3ixZ98aHsatrg9uYGw3Ax9u4IqheIRslU2upvpTp9yunQ==}
     engines: {node: '>=14.19.0'}
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/common': 0.12.2
+      '@vue-macros/common': 0.12.3
       ast-walker-scope: 0.2.3
       unplugin: 0.9.6
     dev: true
 
-  /unplugin-vue-macros/0.13.3_dvkpm5u3cxmoawvcrwfi6jocmq:
-    resolution: {integrity: sha512-+fUz2X1P73EdDnrCuxtS2muSiq4fi/AfYN6n8o68WVjrY09pYVzUeczEnPaPUap87kDSwknGrQSctdn3aTADNg==}
+  /unplugin-vue-macros/0.14.0_vzwbnacjq6rhyu4ywwt6bu33j4:
+    resolution: {integrity: sha512-Ve8kmHGskFAtrZVvhcCa2xQtNPCGCzaJmhYCCv+0PuSxDdVWIeyzEOEOzOM1aq6/rFxQ46iefJ7qdPjNlK8EXA==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
       vue: ^2.7.0 || ^3.2.25
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@vue-macros/define-model': 0.13.3_@vueuse+core@9.3.1
-      '@vue-macros/define-render': 0.13.3_vue@3.2.41
-      '@vue-macros/hoist-static': 0.12.2
-      '@vue-macros/setup-component': 0.12.2
-      '@vue-macros/setup-sfc': 0.12.2
-      '@vue-macros/short-emits': 0.12.3
+      '@vue-macros/define-model': 0.13.4_@vueuse+core@9.4.0
+      '@vue-macros/define-render': 0.13.4_vue@3.2.41
+      '@vue-macros/define-slots': 0.0.1_vue@3.2.41
+      '@vue-macros/hoist-static': 0.12.3
+      '@vue-macros/named-template': 0.0.1_fqlke5zd32z6y6rj5ddmcmlgue
+      '@vue-macros/setup-component': 0.12.3
+      '@vue-macros/setup-sfc': 0.12.3
+      '@vue-macros/short-emits': 0.12.4
       local-pkg: 0.4.2
-      unplugin-combine: 0.2.2_rollup@2.79.1+vite@3.1.8
-      unplugin-vue-define-options: 0.12.2
+      unplugin-combine: 0.2.5_rollup@2.79.1+vite@3.1.8
+      unplugin-vue-define-options: 0.12.3
       vue: 3.2.41
     transitivePeerDependencies:
       - '@vueuse/core'
@@ -6768,6 +6752,15 @@ packages:
       - webpack
     dev: true
 
+  /unplugin/0.10.2:
+    resolution: {integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==}
+    dependencies:
+      acorn: 8.8.0
+      chokidar: 3.5.3
+      webpack-sources: 3.2.3
+      webpack-virtual-modules: 0.4.5
+    dev: true
+
   /unplugin/0.9.6:
     resolution: {integrity: sha512-YYLtfoNiie/lxswy1GOsKXgnLJTE27la/PeCGznSItk+8METYZErO+zzV9KQ/hXhPwzIJsfJ4s0m1Rl7ZCWZ4Q==}
     dependencies:
@@ -6873,7 +6866,7 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-eslint/1.8.1_eslint@8.25.0+vite@3.1.8:
+  /vite-plugin-eslint/1.8.1_eslint@8.26.0+vite@3.1.8:
     resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==}
     peerDependencies:
       eslint: '>=7'
@@ -6881,7 +6874,7 @@ packages:
     dependencies:
       '@rollup/pluginutils': 4.2.1
       '@types/eslint': 8.4.6
-      eslint: 8.25.0
+      eslint: 8.26.0
       rollup: 2.79.1
       vite: 3.1.8_less@4.1.3
     dev: true
@@ -7014,14 +7007,14 @@ packages:
     dependencies:
       vue: 3.2.41
 
-  /vue-eslint-parser/9.1.0_eslint@8.25.0:
+  /vue-eslint-parser/9.1.0_eslint@8.26.0:
     resolution: {integrity: sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
       debug: 4.3.4
-      eslint: 8.25.0
+      eslint: 8.26.0
       eslint-scope: 7.1.1
       eslint-visitor-keys: 3.3.0
       espree: 9.4.0
@@ -7044,12 +7037,12 @@ packages:
       '@vue/devtools-api': 6.4.3
       vue: 3.2.41
 
-  /vue-router/4.1.5_vue@3.2.41:
-    resolution: {integrity: sha512-IsvoF5D2GQ/EGTs/Th4NQms9gd2NSqV+yylxIyp/OYp8xOwxmU8Kj/74E9DTSYAyH5LX7idVUngN3JSj1X4xcQ==}
+  /vue-router/4.1.6_vue@3.2.41:
+    resolution: {integrity: sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
-      '@vue/devtools-api': 6.4.3
+      '@vue/devtools-api': 6.4.5
       vue: 3.2.41
     dev: false
 
@@ -7060,14 +7053,14 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc/1.0.8_typescript@4.8.4:
-    resolution: {integrity: sha512-+0sJ+QVH7SHLt8mV/uIw4xlHDk1mWigZkMFugfZTv8rlHpM3S2tCVZ0BWEGclT/0rKdO8j+St+mljpvhWPN/eQ==}
+  /vue-tsc/1.0.9_typescript@4.8.4:
+    resolution: {integrity: sha512-vRmHD1K6DmBymNhoHjQy/aYKTRQNLGOu2/ESasChG9Vy113K6CdP0NlhR0bzgFJfv2eFB9Ez/9L5kIciUajBxQ==}
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
-      '@volar/vue-language-core': 1.0.8
-      '@volar/vue-typescript': 1.0.8
+      '@volar/vue-language-core': 1.0.9
+      '@volar/vue-typescript': 1.0.9
       typescript: 4.8.4
     dev: true
 

+ 0 - 3
yudao-ui-admin-vue3/src/components/ProTable/index.ts

@@ -1,3 +0,0 @@
-import ProTable from './src/ProTable.vue'
-
-export { ProTable }

+ 0 - 212
yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue

@@ -1,212 +0,0 @@
-<script setup lang="ts">
-import { PropType, reactive, ref } from 'vue'
-import { propTypes } from '@/utils/propTypes'
-import { VxeGrid, VxeGridProps, VXETable, VxeTableInstance } from 'vxe-table'
-import XEUtils from 'xe-utils'
-
-const props = defineProps({
-  columns: {
-    type: Array as PropType<any[]>,
-    default: () => []
-  },
-  form: {
-    type: Array as PropType<any[]>,
-    default: () => []
-  },
-  api: propTypes.string.def('')
-})
-const xGrid = ref<VxeTableInstance>()
-
-const gridOptions = reactive<VxeGridProps>({
-  id: 'crud',
-  height: 600,
-  showHeaderOverflow: true,
-  showOverflow: true,
-  align: null,
-  loading: true,
-  columnConfig: {
-    resizable: true
-  },
-  formConfig: {
-    titleWidth: 100,
-    titleAlign: 'right',
-    items: []
-  },
-  pagerConfig: {
-    pageSize: 10,
-    pageSizes: [5, 10, 15, 20, 50, 100, 200, 500]
-  },
-  columns: [],
-  toolbarConfig: {
-    buttons: [
-      { code: 'insert', name: '新增' },
-      { code: 'delete', name: '删除' },
-      { code: 'save', name: '保存', status: 'success' }
-    ],
-    refresh: true,
-    import: true,
-    export: true,
-    print: true,
-    zoom: true,
-    custom: true
-  },
-  importConfig: {
-    remote: true,
-    types: ['xlsx'],
-    modes: ['insert'],
-    // 自定义服务端导入
-    async importMethod({ file }) {
-      const formBody = new FormData()
-      formBody.append('file', file)
-      try {
-        const response = await fetch(`/api/pub/import`, {
-          method: 'POST',
-          body: formBody
-        })
-        const data = await response.json()
-        VXETable.modal.message({
-          content: `成功导入 ${data.result.insertRows} 条记录!`,
-          status: 'success'
-        })
-        // 导入完成,刷新表格
-        xGrid.value.commitProxy('query')
-      } catch {
-        VXETable.modal.message({ content: '导入失败,请检查数据是否正确!', status: 'error' })
-      }
-    }
-  },
-  proxyConfig: {
-    seq: true, // 启用动态序号代理,每一页的序号会根据当前页数变化
-    sort: true, // 启用排序代理,当点击排序时会自动触发 query 行为
-    filter: true, // 启用筛选代理,当点击筛选时会自动触发 query 行为
-    form: true, // 启用表单代理,当点击表单提交按钮时会自动触发 reload 行为
-    // 对应响应结果 { result: [], page: { total: 100 } }
-    props: {
-      result: 'result', // 配置响应结果列表字段
-      total: 'page.total' // 配置响应结果总页数字段
-    },
-    // 只接收Promise,具体实现自由发挥
-    ajax: {
-      // 当点击工具栏查询按钮或者手动提交指令 query或reload 时会被触发
-      query: ({ page, sorts, filters, form }) => {
-        const queryParams: any = Object.assign({}, form)
-        // 处理排序条件
-        const firstSort = sorts[0]
-        if (firstSort) {
-          queryParams.sort = firstSort.field
-          queryParams.order = firstSort.order
-        }
-        // 处理筛选条件
-        filters.forEach(({ field, values }) => {
-          queryParams[field] = values.join(',')
-        })
-        return fetch(
-          props.api + `/list${page.pageSize}/${page.currentPage}?${XEUtils.serialize(queryParams)}`
-        ).then((response) => response.json())
-      },
-      // 当点击工具栏删除按钮或者手动提交指令 delete 时会被触发
-      delete: ({ body }) => {
-        return fetch(props.api + `/save`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(body)
-        }).then((response) => response.json())
-      },
-      // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
-      save: ({ body }) => {
-        return fetch(props.api + `/save`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(body)
-        }).then((response) => response.json())
-      }
-    }
-  },
-  exportConfig: {
-    remote: true,
-    types: ['xlsx'],
-    modes: ['current', 'selected', 'all'],
-    // 自定义服务端导出
-    async exportMethod({ options }) {
-      const $grid = xGrid.value
-      const proxyInfo = $grid.getProxyInfo()
-      // 传给服务端的参数
-      const body = {
-        filename: options.filename,
-        sheetName: options.sheetName,
-        isHeader: options.isHeader,
-        original: options.original,
-        mode: options.mode,
-        pager: proxyInfo ? proxyInfo.pager : null,
-        ids: options.mode === 'selected' ? options.data.map((item) => item.id) : [],
-        fields: options.columns.map((column) => {
-          return {
-            field: column.field,
-            title: column.title
-          }
-        })
-      }
-      // 开始服务端导出
-      try {
-        const response = await fetch(`/api/pub/export`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(body)
-        })
-        const data = await response.json()
-        if (data.id) {
-          VXETable.modal.message({ content: '导出成功,开始下载', status: 'success' })
-          // 读取路径,请求文件
-          fetch(`/api/pub/export/download/${data.id}`).then((response_1) => {
-            response_1.blob().then((blob) => {
-              // 开始下载
-              VXETable.saveFile({ filename: '导出数据', type: 'xlsx', content: blob })
-            })
-          })
-        }
-      } catch {
-        VXETable.modal.message({ content: '导出失败!', status: 'error' })
-      }
-    }
-  }
-})
-const init = () => {
-  gridOptions.columns = props.columns
-  gridOptions.formConfig.items = props.form
-  gridOptions.loading = false
-}
-init()
-</script>
-
-<template>
-  <vxe-grid ref="xGrid" v-bind="gridOptions" class="pro-table-scrollbar" />
-</template>
-
-<style scoped>
-/*滚动条整体部分*/
-.pro-table-scrollbar ::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-/*滚动条的轨道*/
-.pro-table-scrollbar ::-webkit-scrollbar-track {
-  background-color: #ffffff;
-}
-/*滚动条里面的小方块,能向上向下移动*/
-.pro-table-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: #bfbfbf;
-  border-radius: 5px;
-  border: 1px solid #f1f1f1;
-  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-}
-.pro-table-scrollbar ::-webkit-scrollbar-thumb:hover {
-  background-color: #a8a8a8;
-}
-.pro-table-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: #787878;
-}
-/*边角,即两个滚动条的交汇处*/
-.pro-table-scrollbar ::-webkit-scrollbar-corner {
-  background-color: #ffffff;
-}
-</style>

+ 1 - 1
yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue

@@ -132,7 +132,7 @@ const doSocialLogin = async (type: string) => {
     location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
   // 进行跳转
   const res = await LoginApi.socialAuthRedirectApi(type, encodeURIComponent(redirectUri))
-  window.open = res
+  window.location.href = res
 }
 watch(
   () => currentRoute.value,

+ 2 - 7
yudao-ui-admin-vue3/src/views/system/user/index.vue

@@ -121,9 +121,10 @@ const handleAdd = () => {
 // 修改操作
 const handleUpdate = async (row: UserVO) => {
   await setDialogTile('update')
+  unref(formRef)?.delSchema('username')
+  unref(formRef)?.delSchema('password')
   // 设置数据
   const res = await UserApi.getUserApi(row.id)
-  console.info(res)
   deptId.value = res.deptId
   postIds.value = res.postIds
   unref(formRef)?.setValues(res)
@@ -358,9 +359,6 @@ onMounted(async () => {
         v-model:currentPage="tableObject.currentPage"
         @register="register"
       >
-        <template #sex="{ row }">
-          <DictTag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="row.sex" />
-        </template>
         <template #status="{ row }">
           <el-switch
             v-model="row.status"
@@ -461,9 +459,6 @@ onMounted(async () => {
           </template>
         </el-tag>
       </template>
-      <template #sex="{ row }">
-        <DictTag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="row.sex" />
-      </template>
       <template #status="{ row }">
         <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
       </template>

+ 10 - 8
yudao-ui-admin-vue3/src/views/system/user/user.data.ts

@@ -36,13 +36,20 @@ const crudSchemas = reactive<CrudSchema[]>([
   {
     label: '用户账号',
     field: 'username',
-    form: {
-      show: false
-    },
     search: {
       show: true
     }
   },
+  {
+    label: '用户密码',
+    field: 'password',
+    form: {
+      component: 'InputPassword'
+    },
+    detail: {
+      show: false
+    }
+  },
   {
     label: '用户昵称',
     field: 'nickname'
@@ -58,11 +65,6 @@ const crudSchemas = reactive<CrudSchema[]>([
       show: true
     }
   },
-  {
-    label: '用户性别',
-    field: 'sex',
-    dictType: DICT_TYPE.SYSTEM_USER_SEX
-  },
   {
     label: '部门',
     field: 'deptId',