fix(antd/next): fix FormItem.label can not shown in void field

alibaba · Dec 8, 2021 · f2bd220 · f2bd220
1 parent 011d0ed
commit f2bd220
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/antd/src/form-item/index.tsx b/packages/antd/src/form-item/index.tsx
@@ -364,6 +364,8 @@ export const FormItem: ComposeFormItem = connect(
   mapProps((props, field) => {
     if (isVoidField(field))
       return {
+        label: field.title || props.label,
+        asterisk: props.asterisk,
         extra: props.extra || field.description,
       }
     if (!field) return props
@@ -396,7 +398,7 @@ export const FormItem: ComposeFormItem = connect(
       return false
     }
     return {
-      label: field.title,
+      label: field.title || props.label,
       feedbackStatus: takeFeedbackStatus(),
       feedbackText: takeMessage(),
       asterisk: takeAsterisk(),

diff --git a/packages/next/src/form-item/index.tsx b/packages/next/src/form-item/index.tsx
@@ -367,6 +367,8 @@ export const FormItem: ComposeFormItem = connect(
   mapProps((props, field) => {
     if (isVoidField(field))
       return {
+        label: field.title || props.label,
+        asterisk: props.asterisk,
         extra: props.extra || field.description,
       }
     if (!field) return props
@@ -399,7 +401,7 @@ export const FormItem: ComposeFormItem = connect(
       return false
     }
     return {
-      label: field.title,
+      label: field.title || props.label,
       feedbackStatus: takeFeedbackStatus(),
       feedbackText: takeMessage(),
       asterisk: takeAsterisk(),