소스 검색

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

Vben 4 년 전
부모
커밋
16ecf71850
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 2
      src/components/Table/src/BasicTable.vue
  2. 4 1
      src/components/Table/src/hooks/useTableForm.ts

+ 1 - 2
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);

+ 4 - 1
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,
       };
     }