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/tree/antd-tree/index.jsx | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index a8f6605..688fe7a 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -34,6 +34,8 @@
selected: false // 閫変腑棣栬
}
+ loaded = false
+
UNSAFE_componentWillMount () {
const { config, data, initdata } = this.props
let _config = fromJS(config).toJS()
@@ -52,15 +54,17 @@
BID = BData.$BID || ''
}
- 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
}
_config.wrap.contentHeight = config.wrap.title || config.wrap.searchable === 'true' ? 'calc(100% - 45px)' : '100%'
+
+ this.loaded = _data !== null
this.setState({
selected: _config.wrap.selected === 'true',
@@ -92,6 +96,8 @@
_data = nextProps.data[config.dataName] || []
}
+ this.loaded = true
+
this.setState({sync: false, data: _data}, () => {
this.handleData()
})
@@ -107,7 +113,7 @@
}
componentDidMount () {
- const { config, sync } = this.state
+ const { config } = this.state
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
@@ -119,9 +125,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
this.setState({data: res}, () => {
this.handleData()
@@ -175,6 +181,7 @@
}, () => {
this.handleData()
})
+ this.loaded = true
return
}
@@ -196,6 +203,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ this.loaded = true
if (config.$cache) {
Api.writeCacheConfig(config.uuid, result.data || '')
}
--
Gitblit v1.8.0