Browse Source

fix: Failure to export

main
xingyu 2 years ago
parent
commit
1814ed00ef
  1. 4
      src/components/Excel/src/ExportExcelModal.vue
  2. 2
      src/components/Form/src/hooks/useForm.ts
  3. 2
      src/components/Form/src/types/form.ts

4
src/components/Excel/src/ExportExcelModal.vue

@ -46,11 +46,11 @@ const schemas: FormSchema[] = [
},
},
]
const [registerForm, { validateFields }] = useForm()
const [registerForm, { validate }] = useForm()
const [registerModal, { closeModal }] = useModalInner()
async function handleOk() {
const res = (await validateFields()) as ExportModalResult
const res = await validate<ExportModalResult>()
const { filename, bookType } = res
emit('success', {
filename: `${filename.split('.').shift()}.${bookType}`,

2
src/components/Form/src/hooks/useForm.ts

@ -101,7 +101,7 @@ export function useForm(props?: Props): UseFormReturnType {
return form.submit()
},
validate: async (nameList?: NamePath[] | false): Promise<Recordable> => {
validate: async <T = any>(nameList?: NamePath[] | false): Promise<T> => {
const form = await getForm()
return form.validate(nameList)
},

2
src/components/Form/src/types/form.ts

@ -35,7 +35,7 @@ export interface FormActionType {
removeSchemaByField: (field: string | string[]) => Promise<void>
appendSchemaByField: (schema: FormSchema | FormSchema[], prefixField: string | undefined, first?: boolean | undefined) => Promise<void>
validateFields: (nameList?: NamePath[]) => Promise<any>
validate: (nameList?: NamePath[] | false) => Promise<any>
validate: <T = any>(nameList?: NamePath[] | false) => Promise<T>
scrollToField: (name: NamePath, options?: ScrollOptions) => Promise<void>
}