From 26bda142b0e94c07d8c349f075b5f884fe86e838 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/balcony/index.jsx | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index dde04a1..bf037dd 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -31,6 +31,8 @@
checked: false
}
+ loaded = false
+
UNSAFE_componentWillMount () {
const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
@@ -59,16 +61,21 @@
_data = _data[0] || {$$empty: true}
}
_sync = false
+ this.loaded = true
} else if (_sync && initdata) {
_data = initdata
if (Array.isArray(_data)) {
_data = _data[0] || {$$empty: true}
}
_sync = false
+ this.loaded = true
}
} else if (_config.wrap.datatype === 'public' && window.GLOB.CacheData.get(_config.wrap.publicId)) {
_data = window.GLOB.CacheData.get(_config.wrap.publicId)
_data = fromJS(_data).toJS()
+ this.loaded = true
+ } else if (_config.wrap.datatype === 'static') {
+ this.loaded = true
}
_data.$$BID = BID || ''
@@ -143,6 +150,17 @@
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {this.loadData(true)})
}
+
+ if (config.$cache && !this.loaded) {
+ Api.getLCacheConfig(config.uuid).then(res => {
+ if (!res || this.loaded) return
+
+ let _data = res[0]
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ this.setState({data: _data})
+ })
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -182,6 +200,8 @@
_data.$$BData = BData || ''
_data.$$uuid = _data[config.setting.primaryKey] || ''
+ this.loaded = true
+
this.setState({sync: false, data: _data})
}
}
@@ -195,6 +215,8 @@
_data.$$BID = BID || ''
_data.$$BData = BData || ''
_data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ this.loaded = true
this.setState({data: _data})
}
@@ -303,6 +325,7 @@
this.setState({
data: {$$BID: BID || '', $$BData: BData, $$empty: true},
})
+ this.loaded = true
return
}
@@ -321,6 +344,11 @@
if (result.status) {
let _data = {}
+ this.loaded = true
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, result.data || '')
+ }
+
if (!result.data || !result.data[0]) {
_data.$$empty = true
} else {
--
Gitblit v1.8.0