Fix form (#488)

alibaba · Dec 10, 2019 · a9f9edb · a9f9edb
1 parent e0e76c1
commit a9f9edb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/packages/antd/src/components/Button.tsx b/packages/antd/src/components/Button.tsx
@@ -47,6 +47,7 @@ export const Submit = ({ showLoading, onSubmit, ...props }: ISubmitProps) => {
         return (
           <Button
             type="primary"
+            htmlType="submit"
             onClick={() => form.submit(onSubmit)}
             disabled={showLoading ? state.submitting : undefined}
             {...props}

diff --git a/packages/next/src/components/Button.tsx b/packages/next/src/components/Button.tsx
@@ -62,6 +62,7 @@ export const Submit = ({ showLoading, onSubmit, ...props }: ISubmitProps) => {
         return (
           <Button
             type="primary"
+            htmlType="submit"
             onClick={async() => {
               try {
                 await form.submit(onSubmit)

diff --git a/packages/react-schema-renderer/src/hooks/useSchemaForm.ts b/packages/react-schema-renderer/src/hooks/useSchemaForm.ts
@@ -41,10 +41,21 @@ const useInternalSchemaForm = (props: ISchemaFormProps) => {
   const { implementActions } = useEva({
     actions
   })
+  const formSchema = useMemo(() => {
+    const result = new Schema(schema)
+    implementActions({
+      getSchema: deprecate(() => result, 'Please use the getFormSchema.'),
+      getFormSchema: () => result
+    })
+    return result
+  }, [schema])
   const registry = getRegistry()
   return {
     form: useForm(props),
-    formComponentProps,
+    formComponentProps:{
+      ...formComponentProps,
+      ...formSchema.getExtendsComponentProps()
+    },
     fields: lowercaseKeys({
       ...registry.fields,
       ...fields
@@ -57,14 +68,7 @@ const useInternalSchemaForm = (props: ISchemaFormProps) => {
     formItemComponent: formItemComponent
       ? formItemComponent
       : registry.formItemComponent,
-    schema: useMemo(() => {
-      const result = new Schema(schema)
-      implementActions({
-        getSchema: deprecate(() => result, 'Please use the getFormSchema.'),
-        getFormSchema: () => result
-      })
-      return result
-    }, [schema]),
+    schema: formSchema,
     children
   }
 }