From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/tabviews/custom/components/tree/antd-tree/index.jsx | 119 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 42 deletions(-)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 9c9b744..721d876 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -53,18 +53,22 @@
BID = BData.$BID || ''
}
- if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
- _data = window.GLOB.SyncData.get(_config.dataName) || []
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
- if (_config.$cache) {
- Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ _config.setting.sync = 'false'
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
}
-
- _config.setting.sync = 'false'
-
- this.loaded = true
-
- window.GLOB.SyncData.delete(_config.dataName)
}
_config.wrap.contentHeight = config.wrap.title || config.wrap.searchable === 'true' ? 'calc(100% - 45px)' : '100%'
@@ -73,16 +77,7 @@
selected: _config.wrap.selected === 'true',
config: _config,
data: _data,
- BID: BID || '',
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, config.setting.delay || 0)
- } else if (config.setting.sync === 'true' && _data) {
- this.handleData()
- }
+ BID: BID || ''
})
}
@@ -109,19 +104,11 @@
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
- this.loadData(true)
+ this.loadData('timer')
})
}
- if (config.$cache && !this.loaded) {
- Api.getLCacheConfig(config.uuid).then(res => {
- if (!res || this.loaded) return
-
- this.setState({data: res}, () => {
- this.handleData()
- })
- })
- }
+ this.initExec()
}
/**
@@ -141,15 +128,65 @@
this.timer && this.timer.stop()
}
+ initExec = () => {
+ const { config, BID } = this.state
+
+ if (config.$cache) {
+ if (config.$time) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ this.setState({data: res.data}, () => {
+ this.handleData()
+ })
+ })
+ } else {
+ this.handleData()
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ this.setState({data: res.data}, () => {
+ this.handleData()
+ })
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ this.handleData()
+ }
+ }
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ this.handleData()
+ }
+ }
+
transferSyncData = (syncId) => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$syncId !== syncId) return
let _data = window.GLOB.SyncData.get(config.dataName) || []
if (config.$cache) {
- Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
}
this.loaded = true
@@ -196,7 +233,7 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { arr_field, config } = this.state
+ const { config } = this.state
if (config.uuid !== menuId) return
@@ -206,10 +243,8 @@
}
callback({
- arr_field: arr_field,
orderBy: config.setting.order || '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
@@ -234,8 +269,8 @@
/**
* @description 鏁版嵁鍔犺浇
*/
- async loadData (hastimer) {
- const { config, arr_field, BID } = this.state
+ async loadData (type) {
+ const { config, BID } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -256,20 +291,20 @@
return
}
- if (!hastimer) {
+ if (type !== 'timer') {
this.setState({
loading: true
})
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
this.loaded = true
- if (config.$cache && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
this.setState({
--
Gitblit v1.8.0