From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 17:00:59 +0800
Subject: [PATCH] 2023-07-21
---
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 58 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index 3d69559..c8cec13 100644
--- a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
@@ -53,9 +53,7 @@
class DashboardChart extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -63,19 +61,17 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
chartId: Utils.getuuid(), // 鍥捐〃Id
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
chart: null
}
data = {}
+ loaded = false
UNSAFE_componentWillMount () {
- const { config, data, initdata } = this.props
+ const { config } = this.props
+
let _config = fromJS(config).toJS()
-
- let _sync = _config.setting.sync === 'true'
-
let BID = ''
let BData = ''
@@ -88,12 +84,18 @@
BID = BData.$BID || ''
}
- if (_sync && data) {
- this.data = data[config.dataName] || []
- _sync = false
- } else if (_sync && initdata) {
- this.data = initdata || []
- _sync = false
+ if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
+ this.data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS())
+ }
+
+ _config.setting.sync = 'false'
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
}
if (_config.subtype !== 'ratioboard') {
@@ -115,8 +117,7 @@
config: _config,
BID: BID || '',
arr_field: _config.columns.map(col => col.field).join(','),
- plot: _config.plot,
- sync: _sync
+ plot: _config.plot
}, () => {
if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
setTimeout(() => {
@@ -125,40 +126,8 @@
}
})
- if (config.setting.sync === 'true' && !_sync) {
+ if (config.setting.sync === 'true' && this.loaded) {
this.handleData()
- }
- }
-
- /**
- * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config } = this.state
-
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = null
-
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName]
- if (config.subtype !== 'ratioboard') {
- if (Array.isArray(_data)) {
- _data = _data[0] || {}
- }
- _data.value = _data[config.plot.valueField] || 0
- }
- }
-
- if (_data && !is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
-
- this.setState({sync: false})
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
}
}
@@ -167,11 +136,19 @@
}
componentDidMount () {
- const { config, sync } = this.state
+ const { config } = this.state
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
+
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
@@ -179,15 +156,15 @@
})
}
- 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 = null
if (config.subtype === 'ratioboard') {
_data = res
} else {
- _data = res[0]
+ _data = res[0] || {}
_data.value = _data[config.plot.valueField] || 0
}
@@ -207,9 +184,51 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
this.timer && this.timer.stop()
+ }
+
+ transferSyncData = (syncId) => {
+ const { config } = 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())
+ }
+
+ if (config.subtype !== 'ratioboard') {
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {}
+ }
+ _data.value = _data[config.plot.valueField] || 0
+ }
+
+ if (!is(fromJS(this.data), fromJS(_data))) {
+ this.data = _data
+ this.handleData()
+ }
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({}, () => {
+ this.loadData()
+ })
}
reloadData = (menuId) => {
@@ -243,7 +262,6 @@
}
async loadData (hastimer) {
- const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -258,13 +276,17 @@
this.data = _data
this.handleData()
}
+
+ this.loaded = true
return
}
- let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
@@ -280,9 +302,11 @@
let result = await Api.genericInterface(param)
if (result.status) {
if (config.$cache && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || '')
+ Api.writeCacheConfig(config.uuid, result.data || [])
}
+ this.loaded = true
+
let _data = null
if (config.subtype === 'ratioboard') {
_data = result.data || []
--
Gitblit v1.8.0