fix: vxeGrid init without search form (#5342)

* 修复vxeGrid在未使用表单的情况下，自动加载数据失效的问题。 * 暂时将vxeGrid版本锁定在4.10.0，新版本尺寸计算尚有问题
vbenjs · Jan 10, 2025 · 7606b86 · 7606b86
1 parent e10cbe2
commit 7606b86
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/packages/@core/ui-kit/form-ui/src/form-api.ts b/packages/@core/ui-kit/form-ui/src/form-api.ts
@@ -95,7 +95,7 @@ export class FormApi {
 
   async getValues() {
     const form = await this.getForm();
-    return this.handleRangeTimeValue(form.values);
+    return form.values ? this.handleRangeTimeValue(form.values) : {};
   }
 
   async isFieldValid(fieldName: string) {

diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -248,7 +248,10 @@ async function init() {
   const autoLoad = defaultGridOptions.proxyConfig?.autoLoad;
   const enableProxyConfig = options.value.proxyConfig?.enabled;
   if (enableProxyConfig && autoLoad) {
-    props.api.grid.commitProxy?.('_init', (await formApi.getValues()) ?? {});
+    props.api.grid.commitProxy?.(
+      '_init',
+      formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
+    );
     // props.api.reload(formApi.form?.values ?? {});
   }
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -177,7 +177,7 @@ catalog:
   vue-router: ^4.5.0
   vue-tsc: 2.1.10
   vxe-pc-ui: ^4.3.67
-  vxe-table: ^4.10.5
+  vxe-table: 4.10.0
   watermark-js-plus: ^1.5.7
   zod: ^3.24.1
   zod-defaults: ^0.1.3