fix(core): fix the effects of IFormProps losing generic type (#1418)

alibaba · May 13, 2021 · ee8d118 · ee8d118
1 parent e79d0a3
commit ee8d118
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/core/src/shared/externals.ts b/packages/core/src/shared/externals.ts
@@ -31,7 +31,7 @@ import {
   isVoidFieldState,
 } from './checkers'
 
-const createForm = <T extends Record<any, any> = any>(
+const createForm = <T extends object = any>(
   options?: IFormProps<T>
 ) => {
   return new Form(options)

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -213,7 +213,7 @@ export type IFormState<T extends Record<any, any> = any> = Partial<
 
 export type IFormGraph = Record<string, IGeneralFieldState | IFormState>
 
-export interface IFormProps<T = any> {
+export interface IFormProps<T extends object = any> {
   values?: Partial<T>
   initialValues?: Partial<T>
   pattern?: FormPatternTypes
@@ -224,7 +224,7 @@ export interface IFormProps<T = any> {
   disabled?: boolean
   readOnly?: boolean
   readPretty?: boolean
-  effects?: (form: Form) => void
+  effects?: (form: Form<T>) => void
   validateFirst?: boolean
 }
 

diff --git a/packages/react/src/hooks/useForm.ts b/packages/react/src/hooks/useForm.ts
@@ -2,7 +2,7 @@ import { Form } from '@formily/core/esm/models'
 import { useContext } from 'react'
 import { FormContext } from '../shared'
 
-export const useForm = <T extends Record<any, any>>(): Form<T> => {
+export const useForm = <T extends object = any>(): Form<T> => {
   const form = useContext(FormContext)
   if (!form) {
     throw new Error('Can not found form instance from context.')