fix(table): submitButtonOptions not work,fix #531

vbenjs · Apr 24, 2021 · 16ecf71 · 16ecf71
1 parent ca71760
commit 16ecf71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
@@ -4,7 +4,6 @@
       submitOnReset
       v-bind="getFormProps"
       v-if="getBindValues.useSearchForm"
-      :submitButtonOptions="{ loading: getLoading }"
       :tableAction="tableAction"
       @register="registerForm"
       @submit="handleSearchInfoChange"
@@ -182,7 +181,7 @@
         replaceFormSlotKey,
         getFormSlotKeys,
         handleSearchInfoChange,
-      } = useTableForm(getProps, slots, fetch);
+      } = useTableForm(getProps, slots, fetch, getLoading);
 
       const getBindValues = computed(() => {
         const dataSource = unref(getDataSourceRef);

diff --git a/src/components/Table/src/hooks/useTableForm.ts b/src/components/Table/src/hooks/useTableForm.ts
@@ -6,14 +6,17 @@ import { isFunction } from '/@/utils/is';
 export function useTableForm(
   propsRef: ComputedRef<BasicTableProps>,
   slots: Slots,
-  fetch: (opt?: FetchParams | undefined) => Promise<void>
+  fetch: (opt?: FetchParams | undefined) => Promise<void>,
+  getLoading: ComputedRef<boolean | undefined>
 ) {
   const getFormProps = computed(
     (): Partial<FormProps> => {
       const { formConfig } = unref(propsRef);
+      const { submitButtonOptions } = formConfig || {};
       return {
         showAdvancedButton: true,
         ...formConfig,
+        submitButtonOptions: { loading: unref(getLoading), ...submitButtonOptions },
         compact: true,
       };
     }