From b12a52a3a96ce221c7b3ff049e3f92317fac9854 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Thu, 31 Jul 2025 17:37:14 +0800
Subject: [PATCH] fix: fixed #1277

- update `vxe-table` to `^4.14.4`
- update `vxe-pc-ui` to `^4.7.12`
- rewrite the `commitProxy` `initial` args
---
 .../packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts | 2 +-
 .../@abp/ui/src/components/vxe-table/use-vxe-grid.vue         | 2 +-
 .../packages/effects/plugins/src/vxe-table/use-vxe-grid.vue   | 2 +-
 apps/vben5/pnpm-workspace.yaml                                | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts b/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts
index a309f5ac4..b15435ed1 100644
--- a/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts
+++ b/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts
@@ -24,8 +24,8 @@ export function useVbenVxeGrid(options: VxeGridProps) {
       return () => h(VxeGrid, { ...props, ...attrs, api: extendedApi }, slots);
     },
     {
-      inheritAttrs: false,
       name: 'VbenVxeGrid',
+      inheritAttrs: false,
     },
   );
   // Add reactivity support
diff --git a/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.vue b/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.vue
index 6eaa3fa39..4b27cbf2d 100644
--- a/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.vue
+++ b/apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.vue
@@ -249,7 +249,7 @@ async function init() {
   const enableProxyConfig = options.value.proxyConfig?.enabled;
   if (enableProxyConfig && autoLoad) {
     props.api.grid.commitProxy?.(
-      '_init',
+      'initial',
       formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
     );
     // props.api.reload(formApi.form?.values ?? {});
diff --git a/apps/vben5/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/apps/vben5/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
index f3eb6735a..9844c409d 100644
--- a/apps/vben5/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
+++ b/apps/vben5/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -300,7 +300,7 @@ async function init() {
   const enableProxyConfig = options.value.proxyConfig?.enabled;
   if (enableProxyConfig && autoLoad) {
     props.api.grid.commitProxy?.(
-      '_init',
+      'initial',
       formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
     );
     // props.api.reload(formApi.form?.values ?? {});
diff --git a/apps/vben5/pnpm-workspace.yaml b/apps/vben5/pnpm-workspace.yaml
index 4acb3954f..8b73f18f2 100644
--- a/apps/vben5/pnpm-workspace.yaml
+++ b/apps/vben5/pnpm-workspace.yaml
@@ -205,8 +205,8 @@ catalog:
   vue-simple-uploader: ^1.0.3
   vue-tippy: ^6.7.0
   vue-tsc: 2.2.10
-  vxe-pc-ui: ^4.5.35
-  vxe-table: ^4.13.16
+  vxe-pc-ui: ^4.7.12
+  vxe-table: ^4.14.4
   watermark-js-plus: ^1.6.0
   zod: ^3.24.3
   zod-defaults: ^0.1.3