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/prop-card/index.jsx | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index b3ff9a4..d43b9d6 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -23,14 +23,29 @@
state = {
config: null, // 鍥捐〃閰嶇疆淇℃伅
- loading: true, // 鏁版嵁鍔犺浇鐘舵��
+ loading: false, // 鏁版嵁鍔犺浇鐘舵��
activeKey: '', // 閫変腑鏁版嵁
+ sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: null, // 鏁版嵁
}
UNSAFE_componentWillMount () {
+ const { data } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
+
+ let _data = null
+ let _sync = false
+ if (_config.setting && _config.wrap.datatype !== 'static') {
+ _sync = _config.setting.sync === 'true'
+
+ if (_config.setting.sync === 'true' && data) {
+ _data = data[_config.dataName] || []
+ _sync = false
+ }
+ } else {
+ _data = []
+ }
_config.columns.forEach(item => {
_cols.set(item.field, item)
@@ -52,10 +67,18 @@
})
this.setState({
+ sync: _sync,
+ data: _data,
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- this.loadData()
+ if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ this.loadData()
+ } else if (_sync && !_data) {
+ this.setState({
+ loading: true
+ })
+ }
})
}
@@ -74,6 +97,30 @@
MKEmitter.removeListener('syncRefreshComponentId', this.reload)
}
+ /**
+ * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
+ */
+ 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}, () => {
+ this.handleData()
+ })
+ } else if (!is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ if (config.wrap.datatype !== 'static' && config.setting.syncRefresh === 'true') {
+ this.setState({}, () => {
+ this.loadData()
+ })
+ }
+ }
+ }
+
reload = (syncId) => {
const { config } = this.state
@@ -85,10 +132,15 @@
async loadData () {
const { mainSearch, BID, menuType, dataManager } = this.props
const { config, arr_field } = 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)
+ }
+ })
}
if (config.wrap.datatype === 'static') {
--
Gitblit v1.8.0