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 }