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

docs/src/en/guide/introduction/quick-start.md

@@ -10,7 +10,7 @@ outline: deep
 
 Before starting the project, ensure that your environment meets the following requirements:
 
-- [Node.js](https://nodejs.org/en) version 20 or above. It is recommended to use [fnm](https://github.com/Schniz/fnm) or [nvm](https://github.com/nvm-sh/nvm) for version management.
+- [Node.js](https://nodejs.org/en) version 20.15.0 or above. It is recommended to use [fnm](https://github.com/Schniz/fnm), [nvm](https://github.com/nvm-sh/nvm), or directly use [pnpm](https://pnpm.io/cli/env) for version management.
 - [Git](https://git-scm.com/) any version.
 
 To verify if your environment meets the above requirements, you can check the versions using the following commands:

docs/src/guide/in-depth/loading.md

@@ -6,7 +6,7 @@
 
 ## 原理
 
-由 `vite-plugin-inject-app-loading` 插件实现，插件会在每个应用的注入一个全局的 `loading html`。
+由 `vite-plugin-inject-app-loading` 插件实现，插件会在每个应用都注入一个全局的 `loading html`。
 
 ## 关闭
 

docs/src/guide/introduction/quick-start.md

@@ -10,7 +10,7 @@ outline: deep
 
 在启动项目前，你需要确保你的环境满足以下要求：
 
-- [Node.js](https://nodejs.org/en) 20.15.0 及以上版本，推荐使用 [fnm](https://github.com/Schniz/fnm) 或者 [nvm](https://github.com/nvm-sh/nvm) 进行版本管理。
+- [Node.js](https://nodejs.org/en) 20.15.0 及以上版本，推荐使用 [fnm](https://github.com/Schniz/fnm) 、 [nvm](https://github.com/nvm-sh/nvm) 或者直接使用[pnpm](https://pnpm.io/cli/env) 进行版本管理。
 - [Git](https://git-scm.com/) 任意版本。
 
 验证你的环境是否满足以上要求，你可以通过以下命令查看版本：

package.json

@@ -107,6 +107,7 @@
       }
     },
     "overrides": {
+      "@ast-grep/napi": "catalog:",
       "@ctrl/tinycolor": "catalog:",
       "clsx": "catalog:",
       "pinia": "catalog:",

packages/effects/plugins/src/vxe-table/use-vxe-grid.vue

@@ -222,7 +222,9 @@ async function init() {
 
   // form 由 vben-form代替，所以不适配formConfig，这里给出警告
   const formConfig = gridOptions.value?.formConfig;
-  if (formConfig) {
+  // 处理某个页面加载多个Table时，第2个之后的Table初始化报出警告
+  // 因为第一次初始化之后会把defaultGridOptions和gridOptions合并后缓存进State
+  if (formConfig && formConfig.enabled) {
     console.warn(
       '[Vben Vxe Table]: The formConfig in the grid is not supported, please use the `formOptions` props',
     );

pnpm-workspace.yaml

@@ -13,6 +13,7 @@ packages:
   - docs
   - playground
 catalog:
+  '@ast-grep/napi': ^0.29.0
   '@changesets/changelog-github': ^0.5.0
   '@changesets/cli': ^2.27.9
   '@changesets/git': ^3.0.1
@@ -20,16 +21,16 @@ catalog:
   '@commitlint/cli': ^19.5.0
   '@commitlint/config-conventional': ^19.5.0
   '@ctrl/tinycolor': ^4.1.0
-  '@eslint/js': ^9.13.0
+  '@eslint/js': ^9.14.0
   '@faker-js/faker': ^9.1.0
-  '@iconify/json': ^2.2.265
+  '@iconify/json': ^2.2.266
   '@iconify/tailwind': ^1.1.3
   '@iconify/vue': ^4.1.2
   '@intlify/core-base': ^10.0.4
   '@intlify/unplugin-vue-i18n': ^5.2.0
   '@jspm/generator': ^2.4.1
   '@manypkg/get-packages': ^2.2.2
-  '@nolebase/vitepress-plugin-git-changelog': ^2.6.1
+  '@nolebase/vitepress-plugin-git-changelog': ^2.8.1
   '@playwright/test': ^1.48.2
   '@pnpm/workspace.read-manifest': ^2.2.1
   '@stylistic/stylelint-plugin': ^3.1.1
@@ -42,7 +43,7 @@ catalog:
   '@types/html-minifier-terser': ^7.0.2
   '@types/jsonwebtoken': ^9.0.7
   '@types/lodash.clonedeep': ^4.5.9
-  '@types/node': ^22.8.2
+  '@types/node': ^22.8.6
   '@types/nprogress': ^0.2.3
   '@types/postcss-import': ^14.0.3
   '@types/qrcode': ^1.5.5
@@ -56,8 +57,8 @@ catalog:
   '@vue/reactivity': ^3.5.12
   '@vue/shared': ^3.5.12
   '@vue/test-utils': ^2.4.6
-  '@vueuse/core': ^11.1.0
-  '@vueuse/integrations': ^11.1.0
+  '@vueuse/core': ^11.2.0
+  '@vueuse/integrations': ^11.2.0
   ant-design-vue: ^4.2.5
   archiver: ^7.0.1
   autoprefixer: ^10.4.20
@@ -72,7 +73,7 @@ catalog:
   commitlint-plugin-function-rules: ^4.0.0
   consola: ^3.2.3
   cross-env: ^7.0.3
-  cspell: ^8.15.4
+  cspell: ^8.15.5
   cssnano: ^7.0.6
   cz-git: ^1.10.1
   czg: ^1.10.1
@@ -81,15 +82,15 @@ catalog:
   depcheck: ^1.4.7
   dotenv: ^16.4.5
   echarts: ^5.5.1
-  element-plus: ^2.8.6
-  eslint: ^9.13.0
+  element-plus: ^2.8.7
+  eslint: ^9.14.0
   eslint-config-turbo: ^2.2.3
   eslint-plugin-command: ^0.2.6
   eslint-plugin-eslint-comments: ^3.2.0
-  eslint-plugin-import-x: ^4.3.1
+  eslint-plugin-import-x: ^4.4.0
   eslint-plugin-jsdoc: ^50.4.3
   eslint-plugin-jsonc: ^2.16.0
-  eslint-plugin-n: ^17.11.1
+  eslint-plugin-n: ^17.12.0
   eslint-plugin-no-only-tests: ^3.3.0
   eslint-plugin-perfectionist: ^3.9.1
   eslint-plugin-prettier: ^5.2.1
@@ -103,7 +104,7 @@ catalog:
   get-port: ^7.1.0
   globals: ^15.11.0
   h3: ^1.13.0
-  happy-dom: ^15.7.4
+  happy-dom: ^15.8.0
   html-minifier-terser: ^7.2.0
   husky: ^9.1.6
   is-ci: ^3.0.1
@@ -114,9 +115,9 @@ catalog:
   lucide-vue-next: ^0.454.0
   medium-zoom: ^1.1.0
   naive-ui: ^2.40.1
-  nitropack: ^2.9.7
+  nitropack: ^2.10.0
   nprogress: ^0.2.0
-  ora: ^8.1.0
+  ora: ^8.1.1
   pinia: 2.2.2
   pinia-plugin-persistedstate: ^4.1.2
   pkg-types: ^1.2.1
@@ -125,7 +126,7 @@ catalog:
   postcss-antd-fixes: ^0.2.0
   postcss-html: ^1.7.0
   postcss-import: ^16.1.0
-  postcss-preset-env: ^10.0.8
+  postcss-preset-env: ^10.0.9
   postcss-scss: ^4.0.9
   prettier: ^3.3.3
   prettier-plugin-tailwindcss: ^0.6.8
@@ -134,7 +135,7 @@ catalog:
   radix-vue: ^1.9.8
   resolve.exports: ^2.0.2
   rimraf: ^6.0.1
-  rollup: ^4.24.2
+  rollup: ^4.24.3
   rollup-plugin-visualizer: ^5.12.0
   sass: 1.79.5
   sortablejs: ^1.15.3
@@ -163,16 +164,16 @@ catalog:
   vite-plugin-lazy-import: ^1.0.7
   vite-plugin-lib-inject-css: ^2.1.1
   vite-plugin-pwa: ^0.20.5
-  vite-plugin-vue-devtools: ^7.5.4
-  vitepress: ^1.4.1
+  vite-plugin-vue-devtools: ^7.6.2
+  vitepress: ^1.4.3
   vitepress-plugin-group-icons: ^1.3.0
   vitest: ^2.1.4
   vue: ^3.5.12
   vue-eslint-parser: ^9.4.3
   vue-i18n: ^10.0.4
   vue-router: ^4.4.5
-  vue-tsc: ^2.1.8
-  vxe-pc-ui: ^4.2.33
+  vue-tsc: ^2.1.10
+  vxe-pc-ui: ^4.2.37
   vxe-table: ^4.7.97
   watermark-js-plus: ^1.5.7
   zod: ^3.23.8