From 97e18fa9b628357fa43013cfefc96eec078de25e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 16 一月 2023 15:58:12 +0800
Subject: [PATCH] 2023-01-16
---
src/tabviews/custom/components/card/data-card/index.jsx | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 59573bf..7a4dd46 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -46,6 +46,8 @@
supComs: null
}
+ loaded = false
+
UNSAFE_componentWillMount () {
const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
@@ -102,10 +104,10 @@
let _data = null
let _sync = _config.setting.sync === 'true'
- if (_config.setting.sync === 'true' && data) {
+ if (_sync && data) {
_data = data[_config.dataName] || []
_sync = false
- } else if (_config.setting.sync === 'true' && initdata) {
+ } else if (_sync && initdata) {
_data = initdata || []
_sync = false
}
@@ -173,6 +175,8 @@
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale}`
+ this.loaded = _data !== null
+
this.setState({
supComs,
selected,
@@ -196,7 +200,7 @@
}
componentDidMount () {
- const { config, sync } = this.state
+ const { config } = this.state
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
@@ -215,10 +219,9 @@
})
}
- if (config.$cache && (config.setting.sync !== 'true' || sync)) {
+ if (config.$cache && !this.loaded) {
Api.getLCacheConfig(config.uuid).then(res => {
- if (!res) return
-
+ if (!res || this.loaded) return
let _data = res.map((item, index) => {
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
@@ -274,6 +277,8 @@
}
}
}
+
+ this.loaded = true
this.setState({sync: false, data: _data})
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -548,6 +553,8 @@
const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+ this.loaded = true
+
this.setState({
activeKey: '',
selectKeys: [],
@@ -605,6 +612,7 @@
start = config.setting.pageSize * (pageIndex - 1) + 1
}
+ this.loaded = true
if (config.$cache && pageIndex === 1) {
Api.writeCacheConfig(config.uuid, result.data || '')
}
--
Gitblit v1.8.0