fix(useFormModal): onOk logic

buqiyuan · Jun 6, 2023 · a0510f7 · a0510f7 · vercel · Jun 6, 2023
1 parent 4d7d9fc
commit a0510f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/core/schema-form/src/hooks/useFormEvents.ts b/src/components/core/schema-form/src/hooks/useFormEvents.ts
@@ -237,7 +237,7 @@ export function useFormEvents(formActionContext: UseFormActionContext) {
     await schemaFormRef.value?.scrollToField(name, options);
   }
 
-  async function handleSubmit(e?: Event): Promise<void> {
+  async function handleSubmit(e?: Event) {
     e && e.preventDefault();
     const { submitFunc } = unref(getFormProps);
     if (submitFunc && isFunction(submitFunc)) {
@@ -250,6 +250,7 @@ export function useFormEvents(formActionContext: UseFormActionContext) {
       const values = await validate();
       const res = handleFormValues(values);
       emit('submit', res);
+      return res;
     } catch (error: any) {
       return Promise.reject(error);
     }

diff --git a/src/hooks/useModal/useFormModal.tsx b/src/hooks/useModal/useFormModal.tsx
@@ -24,7 +24,8 @@ export function useFormModal<T = any>() {
     const onOk = async () => {
       // const values = (formRef?.formModel || {}) as any;
       try {
-        await formRef.value?.submit();
+        const values = await formRef.value?.submit();
+        await onSubmit(values);
       } catch (error) {
         modalProps?.onFail?.({} as any);
         return Promise.reject(error);
@@ -43,7 +44,7 @@ export function useFormModal<T = any>() {
       onCancel,
       onOk,
       content: () => {
-        const _formProps = Object.assign({}, { showActionButtonGroup: false, onSubmit }, formProps);
+        const _formProps = Object.assign({}, { showActionButtonGroup: false }, formProps);
 
         return <SchemaForm ref={formRef} {..._formProps}></SchemaForm>;
       },