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

---
 src/components/formFields/common.tsx          |  3 +-
 src/components/formFields/form/index.tsx      |  2 +
 src/components/formFields/group/index.tsx     |  1 +
 .../formFields/importSubform/index.tsx        |  2 +-
 src/components/formFields/object/index.tsx    | 85 ++++++++++---------
 src/components/formFields/tabs/index.tsx      |  2 +
 src/steps/form/index.tsx                      |  1 +
 7 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/components/formFields/common.tsx b/src/components/formFields/common.tsx
index 80fb4ca..3986e75 100644
--- a/src/components/formFields/common.tsx
+++ b/src/components/formFields/common.tsx
@@ -33,6 +33,7 @@ export interface FieldConfig {
   display?: 'none'
   defaultValue?: ParamConfig,
   condition?: ConditionConfig
+  extra?: string
 }
 
 /**
@@ -177,7 +178,7 @@ export class Field<C extends FieldConfig, E, T, S = {}> extends React.Component<
 
 export class FieldError {
   message: string
-  constructor(message: string) {
+  constructor (message: string) {
     this.message = message
   }
 }
diff --git a/src/components/formFields/form/index.tsx b/src/components/formFields/form/index.tsx
index 1e871bd..b9a1638 100644
--- a/src/components/formFields/form/index.tsx
+++ b/src/components/formFields/form/index.tsx
@@ -47,6 +47,7 @@ export interface IFormFieldItemField {
   status: 'normal' | 'error' | 'loading'
   description?: string
   message?: string
+  extra?: string
   layout: 'horizontal' | 'vertical' | 'inline'
   fieldType: string
   children: React.ReactNode
@@ -509,6 +510,7 @@ export default class FormField extends Field<FormFieldConfig, IFormField, Array<
                               label: formFieldConfig.label,
                               status,
                               message: ((this.state.formDataList[index] || [])[fieldIndex] || {}).message || '',
+                              extra: formFieldConfig.extra,
                               required: getBoolean(formFieldConfig.required),
                               layout: formLayout,
                               fieldType: formFieldConfig.type,
diff --git a/src/components/formFields/group/index.tsx b/src/components/formFields/group/index.tsx
index 7c036bc..cc119ca 100644
--- a/src/components/formFields/group/index.tsx
+++ b/src/components/formFields/group/index.tsx
@@ -313,6 +313,7 @@ export default class GroupField extends Field<GroupFieldConfig, IGroupField, any
               label: formFieldConfig.label,
               status,
               message: (this.state.formData[formFieldIndex] || {}).message || '',
+              extra: formFieldConfig.extra,
               required: getBoolean(formFieldConfig.required),
               layout: formLayout,
               visitable: display,
diff --git a/src/components/formFields/importSubform/index.tsx b/src/components/formFields/importSubform/index.tsx
index 5a297c7..cd0b535 100644
--- a/src/components/formFields/importSubform/index.tsx
+++ b/src/components/formFields/importSubform/index.tsx
@@ -397,7 +397,7 @@ export default class ImportSubformField extends Field<ImportSubformFieldConfig,
                 label: formFieldConfig.label,
                 status,
                 message: (this.state.formData[formFieldIndex] || {}).message || '',
-                extra: (formFieldConfig as any).extra || null,
+                extra: formFieldConfig.extra,
                 required: getBoolean(formFieldConfig.required),
                 layout: formLayout,
                 visitable: display,
diff --git a/src/components/formFields/object/index.tsx b/src/components/formFields/object/index.tsx
index 574313f..e6aa8bf 100644
--- a/src/components/formFields/object/index.tsx
+++ b/src/components/formFields/object/index.tsx
@@ -1,9 +1,9 @@
-import { Field, FieldConfig, FieldConfigs, FieldError, FieldProps, IField } from "../common";
+import { Field, FieldConfig, FieldConfigs, FieldError, FieldProps, IField } from '../common'
 import getALLComponents from '../'
-import React from "react";
-import ConditionHelper from "../../../util/condition";
-import { cloneDeep } from "lodash";
-import { getValue, setValue } from "../../../util/value";
+import React from 'react'
+import ConditionHelper from '../../../util/condition'
+import { cloneDeep } from 'lodash'
+import { getValue, setValue } from '../../../util/value'
 
 export interface ObjectFieldConfig extends FieldConfig {
   type: 'object'
@@ -18,7 +18,6 @@ export interface IObjectField {
   children: React.ReactNode[]
 }
 
-
 export interface IObjectFieldItem {
   key: string
   removeText: string
@@ -33,6 +32,7 @@ export interface IObjectFieldItemField {
   status: 'normal' | 'error' | 'loading'
   description?: string
   message?: string
+  extra?: string
   layout: 'horizontal' | 'vertical' | 'inline'
   visitable: boolean
   fieldType: string
@@ -68,7 +68,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
   }
 
   get = async () => {
-    let data: any = {};
+    const data: any = {}
 
     const keys = Object.keys(this.props.value)
     for (const key of keys) {
@@ -140,7 +140,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
     }
     if (this.formFieldsMountedList[key][formFieldIndex]) {
       return true
-    }    
+    }
     this.formFieldsMountedList[key][formFieldIndex] = true
 
     if (this.formFieldsList[key] && this.formFieldsList[key][formFieldIndex]) {
@@ -157,7 +157,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
         if (source !== value) {
           this.props.onValueSet(formFieldConfig.field === '' ? key : `${key}.${formFieldConfig.field}`, value, true)
         }
-        
+
         if (value !== undefined) {
           const validation = await formField.validate(value)
           if (validation === true) {
@@ -182,7 +182,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
   handleInsert = async () => {
     const keys = Object.keys(this.props.value || {})
     let i = 1
-    while(keys.includes(`item_${i}`)) {
+    while (keys.includes(`item_${i}`)) {
       i++
     }
 
@@ -214,10 +214,10 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
   handleChangeKey = async (prev: string, next: string) => {
     this.formFieldsList[next] = this.formFieldsList[prev]
     delete this.formFieldsList[prev]
-    
+
     this.formFieldsMountedList[next] = this.formFieldsMountedList[prev]
     delete this.formFieldsMountedList[prev]
-    
+
     await this.setState(({ formDataList }) => {
       formDataList[next] = formDataList[prev]
       delete formDataList[prev]
@@ -262,7 +262,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
     if (formFieldConfig) {
       const fullPath = formFieldConfig.field === '' || path === '' ? `${formFieldConfig.field}${path}` : `${formFieldConfig.field}.${path}`
       await this.props.onValueSet(fullPath === '' ? key : `${key}.${fullPath}`, value, true)
-      
+
       const formDataList = cloneDeep(this.state.formDataList)
       if (validation === true) {
         formDataList[key][formFieldIndex] = { status: 'normal' }
@@ -281,7 +281,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
     if (formFieldConfig) {
       const fullPath = formFieldConfig.field === '' || path === '' ? `${formFieldConfig.field}${path}` : `${formFieldConfig.field}.${path}`
       await this.props.onValueUnset(fullPath === '' ? key : `${key}.${fullPath}`, true)
-      
+
       const formDataList = cloneDeep(this.state.formDataList)
       if (validation === true) {
         formDataList[key][formFieldIndex] = { status: 'normal' }
@@ -300,7 +300,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
     if (formFieldConfig) {
       const fullPath = formFieldConfig.field === '' || path === '' ? `${formFieldConfig.field}${path}` : `${formFieldConfig.field}.${path}`
       await this.props.onValueListAppend(fullPath === '' ? key : `${key}.${fullPath}`, value, true)
-      
+
       const formDataList = cloneDeep(this.state.formDataList)
       if (validation === true) {
         formDataList[key][formFieldIndex] = { status: 'normal' }
@@ -319,7 +319,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
     if (formFieldConfig) {
       const fullPath = formFieldConfig.field === '' || path === '' ? `${formFieldConfig.field}${path}` : `${formFieldConfig.field}.${path}`
       await this.props.onValueListSplice(fullPath === '' ? key : `${key}.${fullPath}`, _index, count, true)
-      
+
       const formDataList = cloneDeep(this.state.formDataList)
       if (validation === true) {
         formDataList[key][formFieldIndex] = { status: 'normal' }
@@ -338,7 +338,7 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
     if (formFieldConfig) {
       const fullPath = formFieldConfig.field === '' || path === '' ? `${formFieldConfig.field}${path}` : `${formFieldConfig.field}.${path}`
       await this.props.onValueListSort(fullPath === '' ? key : `${key}.${fullPath}`, _index, sortType, true)
-      
+
       const formDataList = cloneDeep(this.state.formDataList)
       if (validation === true) {
         formDataList[key][formFieldIndex] = { status: 'normal' }
@@ -354,8 +354,8 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
 
   /**
    * 用于展示子表单组件
-   * @param _props 
-   * @returns 
+   * @param _props
+   * @returns
    */
   renderComponent = (_props: IObjectField) => {
     return <React.Fragment>
@@ -365,25 +365,25 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
 
   /**
    * 用于展示子表单组件中的每一个子项
-   * @param props 
-   * @returns 
+   * @param props
+   * @returns
    */
    renderItemComponent = (props: IObjectFieldItem) => {
-    return <React.Fragment>
+     return <React.Fragment>
       您当前使用的UI版本没有实现FormField组件的renderItemComponent方法。
     </React.Fragment>
-  }
+   }
 
-  /**
+   /**
    * 用于展示子表单组件中的每一子项中的每一个子表单项组件
-   * @param props 
-   * @returns 
+   * @param props
+   * @returns
    */
    renderItemFieldComponent = (props: IObjectFieldItemField) => {
-    return <React.Fragment>
+     return <React.Fragment>
       您当前使用的UI版本没有实现FormField组件的renderItemFieldComponent方法。
     </React.Fragment>
-  }
+   }
 
   render = () => {
     const {
@@ -429,9 +429,9 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
                           hidden = true
                           display = false
                         }
-                        
+
                         const FormField = this.getALLComponents(formFieldConfig.type) || Field
-  
+
                         let status = ((this.state.formDataList[key] || [])[formFieldIndex] || {}).status || 'normal'
 
                         if (['group', 'import_subform', 'object', 'tabs', 'form'].some((type) => type === formFieldConfig.type)) {
@@ -441,15 +441,16 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
                         // 渲染表单项容器
                         if (hidden) {
                           return (
-                              this.renderItemFieldComponent({
-                                index: formFieldIndex,
-                                label: formFieldConfig.label,
-                                status,
-                                message: ((this.state.formDataList[key] || [])[formFieldIndex] || {}).message || '',
-                                layout: this.props.formLayout,
-                                visitable: display,
-                                fieldType: formFieldConfig.type,
-                                children: (
+                            this.renderItemFieldComponent({
+                              index: formFieldIndex,
+                              label: formFieldConfig.label,
+                              status,
+                              message: ((this.state.formDataList[key] || [])[formFieldIndex] || {}).message || '',
+                              extra: formFieldConfig.extra,
+                              layout: this.props.formLayout,
+                              visitable: display,
+                              fieldType: formFieldConfig.type,
+                              children: (
                                   <FormField
                                     key={formFieldIndex}
                                     ref={(formField: Field<FieldConfigs, any, any> | null) => {
@@ -475,8 +476,8 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
                                     baseRoute={this.props.baseRoute}
                                     loadDomain={async (domain: string) => this.props.loadDomain(domain)}
                                   />
-                                )
-                              })
+                              )
+                            })
                           )
                         } else {
                           return <React.Fragment key={formFieldIndex} />
@@ -492,4 +493,4 @@ export default class ObjectField<S> extends Field<ObjectFieldConfig, IObjectFiel
       </React.Fragment>
     )
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/formFields/tabs/index.tsx b/src/components/formFields/tabs/index.tsx
index e639223..ca49b5f 100644
--- a/src/components/formFields/tabs/index.tsx
+++ b/src/components/formFields/tabs/index.tsx
@@ -46,6 +46,7 @@ export interface ITabsFieldItemField {
   status: 'normal' | 'error' | 'loading'
   description?: string
   message?: string
+  extra?: string
   layout: 'horizontal' | 'vertical' | 'inline'
   fieldType: string
   children: React.ReactNode
@@ -410,6 +411,7 @@ export default class TabsField<S> extends Field<TabsFieldConfig, ITabsField, { [
                                 status,
                                 message: ((this.state.formDataList[index] || [])[formFieldIndex] || {}).message || '',
                                 required: getBoolean(formFieldConfig.required),
+                                extra: formFieldConfig.extra,
                                 layout: this.props.formLayout,
                                 fieldType: formFieldConfig.type,
                                 children: (
diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx
index d7a2b7c..6bbbdb7 100644
--- a/src/steps/form/index.tsx
+++ b/src/steps/form/index.tsx
@@ -675,6 +675,7 @@ export default class FormStep extends Step<FormConfig, FormState> {
                 label: formFieldConfig.label,
                 status,
                 message: formData[formFieldIndex]?.message || '',
+                extra: formFieldConfig.extra,
                 required: getBoolean(formFieldConfig.required),
                 layout,
                 visitable: display,
-- 
Gitee