Merge branch 'cherry-pick-af81160a' into 'v2-220618'

src/pages/memberManage/components/ListWrap/index.tsx

@@ -61,7 +61,8 @@ const ListWrap: React.FC<ListType> = (props) => {
     currentListData.length && currentListData.forEach(item => {
       let obj = {}
       item.map(val => {
-        return obj[val.fieldName] = val.fieldValue
+        obj[val.fieldName] = val.fieldValue
+        obj.key = val.fieldOrder
       })
       sumData.push(obj)
     })
@@ -71,7 +72,7 @@ const ListWrap: React.FC<ListType> = (props) => {
   }, [currentListData])
   
   return (
-    <Table columns={tableCoumns} pagination={false} dataSource={tableData} style={{width: '95%'}} />
+    <Table rowKey='key' columns={tableCoumns} pagination={false} dataSource={tableData} style={{width: '95%'}} />
   )
 }
 

src/pages/memberManage/memberMaintain/components/MemberForm/index.tsx

@@ -85,9 +85,10 @@ const MemberForm: React.FC<MemberFormProps> = ({
         ...rest
       }: any = infoRes.data;
       // 注册资料处理
-      const detail = {}, list = []
+      const detail = {}
       for (let i = 0; i < groups.length; i++) {
-        const item = groups[i];
+        const item = groups[i]
+        
         if (item.elements) {
           for (let j = 0; j < item.elements.length; j++) {
             const ele = item.elements[j];
@@ -95,14 +96,13 @@ const MemberForm: React.FC<MemberFormProps> = ({
               detail[ele.fieldName] = ele.fieldValue;
             }
             if (ele.fieldType === 'list') {
-              ele.registers && ele.registers.forEach(element => {
-                let obj = {}
-                element.map(val => {
+              detail[ele.fieldName] = ele.registers?.map(element => {
+                let obj = {};
+                element.forEach(val => {
                   obj[val.fieldName] = val.fieldValue;
-                })
-                list.push(obj)
-              })
-              detail[ele.fieldName] = list
+                });
+                return obj;
+              });
             }
           }
         }