ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 种子深度合并

Browse Source
This commit is contained in:
自带大佬气场
2021-06-22 18:02:37 +08:00
parent 79c14e5248
commit f2f71e6695
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web-react/public/seed/form-tabs/index.jsx
View File

@@ -1,7 +1,7 @@
import React, { Component } from 'react' import React, { Component } from 'react'
import { Button, Tabs } from 'antd' import { Button, Tabs } from 'antd'
import { ComponentDynamic, Container } from 'components' import { ComponentDynamic, Container } from 'components'
import { isEqual } from 'lodash' import { isEqual, merge } from 'lodash'
const tabs = [ const tabs = [
{ {
@@ -57,10 +57,7 @@ export default class index extends Component {
for (const child of this.children) { for (const child of this.children) {
try { try {
const data = await child.getData() const data = await child.getData()
this.formData = { merge(this.formData, data)
...this.formData,
...data,
}
} catch (e) { } catch (e) {
return e return e
} }

7
web-react/public/seed/form-tabs/tab/index.jsx
View File

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import { Anchor, Card, Col, Divider, Row, Spin } from 'antd' import { Anchor, Card, Col, Divider, Row, Spin } from 'antd'
import { AntIcon, ComponentDynamic, Container } from 'components' import { AntIcon, ComponentDynamic, Container } from 'components'
import { isEqual } from 'lodash' import { isEqual, merge } from 'lodash'
const parts = [ const parts = [
{ {
@@ -52,10 +52,7 @@ export default class index extends Component {
async getData() { async getData() {
for (const child of this.children) { for (const child of this.children) {
const data = await child.getData() const data = await child.getData()
this.formData = { merge(this.formData, data)
...this.formData,
...data,
}
} }
return this.formData return this.formData
} }

7
web-react/public/seed/form/index.jsx
View File

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import { Anchor, Button, Card, Col, Divider, Row, Spin } from 'antd' import { Anchor, Button, Card, Col, Divider, Row, Spin } from 'antd'
import { AntIcon, ComponentDynamic, Container } from 'components' import { AntIcon, ComponentDynamic, Container } from 'components'
import { isEqual } from 'lodash' import { isEqual, merge } from 'lodash'
const parts = [ const parts = [
{ {
@@ -61,10 +61,7 @@ export default class index extends Component {
for (const child of this.children) { for (const child of this.children) {
try { try {
const data = await child.getData() const data = await child.getData()
this.formData = { merge(this.formData, data)
...this.formData,
...data,
}
} catch (e) { } catch (e) {
return e return e
} }