chore(antd/next): replace useForm to useParentForm in Form component

alibaba · Feb 15, 2022 · 43a3d6b · 43a3d6b
1 parent feba637
commit 43a3d6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/antd/src/form/index.tsx b/packages/antd/src/form/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
-import { Form as FormType, IFormFeedback } from '@formily/core'
+import { Form as FormType, ObjectField, IFormFeedback } from '@formily/core'
 import {
-  useForm,
+  useParentForm,
   FormProvider,
   ExpressionScope,
   JSXComponent,
@@ -24,8 +24,8 @@ export const Form: React.FC<FormProps> = ({
   previewTextPlaceholder,
   ...props
 }) => {
-  const top = useForm()
-  const renderContent = (form: FormType) => (
+  const top = useParentForm()
+  const renderContent = (form: FormType | ObjectField) => (
     <ExpressionScope value={{ $$form: form }}>
       <PreviewText.Placeholder value={previewTextPlaceholder}>
         <FormLayout {...props}>

diff --git a/packages/next/src/form/index.tsx b/packages/next/src/form/index.tsx
@@ -3,14 +3,15 @@ import {
   FormProvider,
   ExpressionScope,
   JSXComponent,
-  useForm,
+  useParentForm,
 } from '@formily/react'
 import { FormLayout, IFormLayoutProps } from '../form-layout'
 import { ConfigProvider } from '@alifd/next'
 import {
   getValidateLocaleIOSCode,
   setValidateLanguage,
   Form as FormType,
+  ObjectField,
   IFormFeedback,
 } from '@formily/core'
 import { PreviewText } from '../preview-text'
@@ -30,15 +31,15 @@ export const Form: React.FC<FormProps> = ({
   previewTextPlaceholder,
   ...props
 }) => {
-  const top = useForm()
+  const top = useParentForm()
   const lang =
     (ConfigProvider as any).getContext()?.locale?.momentLocale ?? 'zh-CN'
   useMemo(() => {
     const validateLanguage = getValidateLocaleIOSCode(lang)
     setValidateLanguage(validateLanguage)
   }, [lang])
 
-  const renderContent = (form: FormType) => (
+  const renderContent = (form: FormType | ObjectField) => (
     <ExpressionScope value={{ $$form: form }}>
       <PreviewText.Placeholder value={previewTextPlaceholder}>
         <FormLayout {...props}>