From ee50d5424a093209d1c5c549f4578107893b22f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十一月 2020 18:40:54 +0800
Subject: [PATCH] 2020-11-05
---
src/tabviews/custom/components/card/data-card/index.jsx | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 0efdbeb..92ad980 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -28,15 +28,25 @@
pageIndex: 1,
activeKey: '', // 閫変腑鍗�
loading: false, // 鏁版嵁鍔犺浇鐘舵��
+ sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
card: null, // 鍗＄墖璁剧疆
data: null, // 鏁版嵁
total: null
}
UNSAFE_componentWillMount () {
+ const { data } = this.props
let _config = fromJS(this.props.config).toJS()
let _card = _config.subcards[0]
let _cols = new Map()
+
+ let _data = null
+ let _sync = _config.setting.sync === 'true'
+
+ if (_config.setting.sync === 'true' && data) {
+ _data = data[_config.dataName] || []
+ _sync = false
+ }
_config.columns.forEach(item => {
_cols.set(item.field, item)
@@ -56,11 +66,19 @@
})
this.setState({
+ sync: _sync,
+ data: _data,
config: _config,
card: _card,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- this.loadData()
+ if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ this.loadData()
+ } else if (_sync && !_data) {
+ this.setState({
+ loading: true
+ })
+ }
})
}
@@ -70,6 +88,25 @@
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ UNSAFE_componentWillReceiveProps (nextProps) {
+ const { sync, config } = this.state
+
+ if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
+ let _data = []
+ if (nextProps.data && nextProps.data[config.dataName]) {
+ _data = nextProps.data[config.dataName] || []
+ }
+
+ this.setState({sync: false, loading: false, data: _data})
+ } else if (!is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ if (config.setting.syncRefresh === 'true') {
+ this.setState({}, () => {
+ this.loadData()
+ })
+ }
+ }
}
componentWillUnmount () {
@@ -94,10 +131,15 @@
async loadData () {
const { mainSearch, BID, menuType, dataManager } = this.props
const { config, arr_field, pageIndex } = this.state
-
+
let searches = []
if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- searches = [...mainSearch, ...searches]
+ let keys = searches.map(item => item.key)
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key)) {
+ searches.push(item)
+ }
+ })
}
this.setState({
--
Gitblit v1.8.0