Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into antdv-next

This commit is contained in:
dap
2026-03-31 10:07:28 +08:00
25 changed files with 307 additions and 75 deletions

View File

@@ -40,7 +40,7 @@ catalog:
'@ctrl/tinycolor': ^4.2.0
'@eslint-community/eslint-plugin-eslint-comments': ^4.7.1
'@eslint/js': ^10.0.1
'@iconify/json': ^2.2.451
'@iconify/json': ^2.2.454
'@iconify/tailwind4': ^1.2.3
'@iconify/vue': ^5.0.0
'@intlify/core-base': ^11.3.0
@@ -76,7 +76,7 @@ catalog:
'@vueuse/integrations': ^14.2.1
'@vueuse/motion': ^3.0.3
alova: ^3.4.1
antdv-next: ^1.1.5
antdv-next: ^1.1.7
archiver: ^7.0.1
axios: ^1.13.6
axios-mock-adapter: ^2.1.0
@@ -100,7 +100,7 @@ catalog:
dotenv: ^17.3.1
echarts: ^6.0.0
es-toolkit: ^1.45.1
eslint: ^10.0.3
eslint: ^10.1.0
eslint-plugin-better-tailwindcss: ^4.3.2
eslint-plugin-command: ^3.5.2
eslint-plugin-jsonc: ^3.1.2
@@ -113,7 +113,7 @@ catalog:
eslint-plugin-yml: ^3.3.1
execa: ^9.6.1
find-up: ^8.0.0
get-port: ^7.1.0
get-port: ^7.2.0
globals: ^17.4.0
happy-dom: ^20.8.4
html-minifier-terser: ^7.2.0
@@ -143,12 +143,13 @@ catalog:
reka-ui: ^2.9.2
resolve.exports: ^2.0.3
rimraf: ^6.1.3
rolldown: ^1.0.0-rc.10
rollup-plugin-visualizer: ^7.0.1
sass: ^1.98.0
sass-embedded: ^1.98.0
secure-ls: ^2.0.0
sortablejs: ^1.15.7
stylelint: ^17.4.0
stylelint: ^17.5.0
stylelint-config-recess-order: ^7.7.0
stylelint-config-recommended: ^18.0.0
stylelint-config-recommended-scss: ^17.0.0
@@ -184,15 +185,12 @@ catalog:
vue-i18n: ^11.3.0
vue-json-pretty: ^2.4.0
vue-json-viewer: ^3.0.4
vue-router: ^5.0.3
vue-router: ^5.0.4
vue-tippy: ^6.7.1
vue-tsc: ^3.2.6
vxe-pc-ui: ^4.13.10
vxe-table: ^4.18.5
vxe-pc-ui: ^4.13.13
vxe-table: ^4.18.8
watermark-js-plus: ^1.6.3
yaml-eslint-parser: ^2.0.0
zod: ^3.25.76
zod-defaults: 0.1.3
catalogs:
conflicts_echarts_h5_5_1:
echarts: ^5.5.1