From a9ac16fecc0cf9bc66dfaefe4e9b35fa3c722812 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 16:58:43 +0800
Subject: [PATCH] 2020-11-10
---
src/tabviews/custom/components/card/prop-card/index.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 765774e..7073848 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -40,7 +40,10 @@
_sync = _config.setting.sync === 'true'
if (_config.setting.sync === 'true' && data) {
- _data = data[_config.dataName] || []
+ _data = data[_config.dataName]
+ if (_data && Array.isArray(_data)) {
+ _data = _data[0]
+ }
_sync = false
}
} else {
@@ -104,9 +107,12 @@
const { sync, config } = this.state
if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
+ let _data = {}
if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
+ _data = nextProps.data[config.dataName]
+ if (_data && Array.isArray(_data)) {
+ _data = _data[0]
+ }
}
this.setState({sync: false, loading: false, data: _data})
@@ -144,7 +150,7 @@
if (config.wrap.datatype === 'static') {
this.setState({
loading: false,
- data: []
+ data: {}
})
return
} else {
@@ -160,7 +166,7 @@
if (result.status) {
this.setState({
activeKey: '',
- data: result.data,
+ data: result.data && result.data[0] ? result.data[0] : {},
loading: false
})
} else {
@@ -214,7 +220,7 @@
{data ? <div className="card-row-list">
{config.subcards.map((item, index) => (
<Col className={activeKey === index ? 'active' : ''} key={index} span={item.setting.width || 6} onClick={() => {this.changeCard(index, item)}}>
- <CardItem BID={BID} card={item} cards={config} data={data[0] || {}} updateStatus={this.updateStatus}/>
+ <CardItem BID={BID} card={item} cards={config} data={data} updateStatus={this.updateStatus}/>
</Col>
))}
</div> : null}
--
Gitblit v1.8.0