From f2f71e66950e934e3c64d46213484e0368229297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Tue, 22 Jun 2021 18:02:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=8D=E5=AD=90=E6=B7=B1=E5=BA=A6?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-react/public/seed/form-tabs/index.jsx     | 7 ++-----
 web-react/public/seed/form-tabs/tab/index.jsx | 7 ++-----
 web-react/public/seed/form/index.jsx          | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/web-react/public/seed/form-tabs/index.jsx b/web-react/public/seed/form-tabs/index.jsx
index f9314cb..470a4a0 100644
--- a/web-react/public/seed/form-tabs/index.jsx
+++ b/web-react/public/seed/form-tabs/index.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { Button, Tabs } from 'antd'
 import { ComponentDynamic, Container } from 'components'
-import { isEqual } from 'lodash'
+import { isEqual, merge } from 'lodash'
 
 const tabs = [
     {
@@ -57,10 +57,7 @@ export default class index extends Component {
         for (const child of this.children) {
             try {
                 const data = await child.getData()
-                this.formData = {
-                    ...this.formData,
-                    ...data,
-                }
+                merge(this.formData, data)
             } catch (e) {
                 return e
             }
diff --git a/web-react/public/seed/form-tabs/tab/index.jsx b/web-react/public/seed/form-tabs/tab/index.jsx
index f2cd600..3d2912d 100644
--- a/web-react/public/seed/form-tabs/tab/index.jsx
+++ b/web-react/public/seed/form-tabs/tab/index.jsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import ReactDOM from 'react-dom'
 import { Anchor, Card, Col, Divider, Row, Spin } from 'antd'
 import { AntIcon, ComponentDynamic, Container } from 'components'
-import { isEqual } from 'lodash'
+import { isEqual, merge } from 'lodash'
 
 const parts = [
     {
@@ -52,10 +52,7 @@ export default class index extends Component {
     async getData() {
         for (const child of this.children) {
             const data = await child.getData()
-            this.formData = {
-                ...this.formData,
-                ...data,
-            }
+            merge(this.formData, data)
         }
         return this.formData
     }
diff --git a/web-react/public/seed/form/index.jsx b/web-react/public/seed/form/index.jsx
index df294ba..780eb81 100644
--- a/web-react/public/seed/form/index.jsx
+++ b/web-react/public/seed/form/index.jsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import ReactDOM from 'react-dom'
 import { Anchor, Button, Card, Col, Divider, Row, Spin } from 'antd'
 import { AntIcon, ComponentDynamic, Container } from 'components'
-import { isEqual } from 'lodash'
+import { isEqual, merge } from 'lodash'
 
 const parts = [
     {
@@ -61,10 +61,7 @@ export default class index extends Component {
         for (const child of this.children) {
             try {
                 const data = await child.getData()
-                this.formData = {
-                    ...this.formData,
-                    ...data,
-                }
+                merge(this.formData, data)
             } catch (e) {
                 return e
             }