From 77a262cb8676ad2921b65b4a2707634b0891c43b Mon Sep 17 00:00:00 2001
From: zjt <zhenjintao1@jd.com>
Date: Wed, 22 Dec 2021 19:52:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20importSubForm=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B9=E5=A2=9E=E5=8A=A0=E9=A2=9D=E5=A4=96=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formFields/importSubform/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/formFields/importSubform/index.tsx b/src/components/formFields/importSubform/index.tsx
index 52e606d..5c3e8db 100644
--- a/src/components/formFields/importSubform/index.tsx
+++ b/src/components/formFields/importSubform/index.tsx
@@ -33,6 +33,7 @@ export default class ImportSubformFieldComponent extends ImportSubformField {
       visitable,
       status,
       message,
+      extra,
       required,
       fieldType,
       children
@@ -49,6 +50,7 @@ export default class ImportSubformFieldComponent extends ImportSubformField {
 
     return (
       <Form.Item
+        extra={extra}
         key={key}
         required={required}
         label={label}
-- 
Gitee


From a27139475a0839e23fb7ca32bdc6151e05108362 Mon Sep 17 00:00:00 2001
From: zjt <zhenjintao1@jd.com>
Date: Thu, 23 Dec 2021 15:13:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA=E8=AF=B4=E6=98=8E=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formFields/form/index.tsx          | 2 ++
 src/components/formFields/group/index.tsx         | 2 ++
 src/components/formFields/importSubform/index.tsx | 2 +-
 src/components/formFields/tabs/index.tsx          | 2 ++
 src/steps/form/index.tsx                          | 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/formFields/form/index.tsx b/src/components/formFields/form/index.tsx
index 6a874e1..77d2fb1 100644
--- a/src/components/formFields/form/index.tsx
+++ b/src/components/formFields/form/index.tsx
@@ -16,6 +16,7 @@ export default class FormFieldComponent extends FormField {
       label,
       status,
       message,
+      extra,
       required,
       fieldType,
       layout,
@@ -23,6 +24,7 @@ export default class FormFieldComponent extends FormField {
     } = props
     return (
       <Form.Item
+        extra={extra ? extra.trim() : ''}
         required={required}
         label={label}
         validateStatus={ status === 'normal' ? undefined : status === 'error' ? 'error' : 'validating' }
diff --git a/src/components/formFields/group/index.tsx b/src/components/formFields/group/index.tsx
index 0293952..41246b3 100644
--- a/src/components/formFields/group/index.tsx
+++ b/src/components/formFields/group/index.tsx
@@ -31,6 +31,7 @@ export default class GroupFieldComponent extends GroupField {
       visitable,
       status,
       message,
+      extra,
       required,
       fieldType,
       children
@@ -38,6 +39,7 @@ export default class GroupFieldComponent extends GroupField {
 
     return (
       <Form.Item
+        extra={extra ? extra.trim() : ''}
         required={required}
         key={key}
         label={label}
diff --git a/src/components/formFields/importSubform/index.tsx b/src/components/formFields/importSubform/index.tsx
index d293274..8fcd521 100644
--- a/src/components/formFields/importSubform/index.tsx
+++ b/src/components/formFields/importSubform/index.tsx
@@ -50,7 +50,7 @@ export default class ImportSubformFieldComponent extends ImportSubformField {
 
     return (
       <Form.Item
-        extra={extra}
+        extra={extra ? extra.trim() : ''}
         key={key}
         required={required}
         label={label}
diff --git a/src/components/formFields/tabs/index.tsx b/src/components/formFields/tabs/index.tsx
index 717574e..99a684f 100644
--- a/src/components/formFields/tabs/index.tsx
+++ b/src/components/formFields/tabs/index.tsx
@@ -15,6 +15,7 @@ export default class TabsFieldComponent extends TabsField<{}> {
       label,
       status,
       message,
+      extra,
       required,
       fieldType,
       layout,
@@ -23,6 +24,7 @@ export default class TabsFieldComponent extends TabsField<{}> {
 
     return (
       <Form.Item
+        extra={extra ? extra.trim() : ''}
         required={required}
         label={label}
         validateStatus={ status === 'normal' ? undefined : status === 'error' ? 'error' : 'validating' }
diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx
index 486ff96..40f6dc6 100644
--- a/src/steps/form/index.tsx
+++ b/src/steps/form/index.tsx
@@ -91,6 +91,7 @@ export default class FormStepComponent extends FormStep {
       label,
       status,
       message,
+      extra,
       required,
       fieldType,
       children
@@ -98,6 +99,7 @@ export default class FormStepComponent extends FormStep {
 
     return (
       <Form.Item
+        extra={extra ? extra.trim() : ''}
         required={required}
         key={key}
         label={label}
-- 
Gitee