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

This commit is contained in:
Vben 2021-04-24 18:27:48 +08:00
parent ca717602a6
commit 16ecf71850
2 changed files with 5 additions and 3 deletions

View File

@ -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);

View File

@ -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,
};
}