From dc258e4600bea2fba1e25054d163a2f4b1326a85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:23:38 +0800
Subject: [PATCH] 2023-08-08
---
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 340 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 222 insertions(+), 118 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index d7a1c32..d60f344 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,20 +61,17 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
chartId: Utils.getuuid(), // 鍥捐〃Id
- title: '', // 缁勪欢鏍囬
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
- data: {}, // 鏁版嵁
chart: null
}
+ data = {}
+ loaded = false
+
UNSAFE_componentWillMount () {
- const { config, data, initdata } = this.props
+ const { config } = this.props
+
let _config = fromJS(config).toJS()
-
- let _data = null
- let _sync = _config.setting.sync === 'true'
-
let BID = ''
let BData = ''
@@ -89,77 +84,45 @@
BID = BData.$BID || ''
}
- if (_sync && data) {
- _data = data[config.dataName] || []
- _sync = false
- } else if (_sync && initdata) {
- _data = initdata || []
- _sync = false
- }
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
- if (_config.subtype === 'ratioboard') {
- _data = _data || []
- } else {
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
- } else {
- _data = {}
+ if (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)
}
}
- _config.style.height = config.plot.height || 400
+ if (_config.subtype !== 'ratioboard') {
+ if (Array.isArray(this.data)) {
+ this.data = this.data[0] || {}
+ }
+ this.data.value = this.data[config.plot.valueField] || 0
+ }
+
+ _config.plot.height = Utils.getHeight(_config.plot.height)
+ _config.style.height = 'auto'
+ _config.style.minHeight = _config.plot.height + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
this.setState({
config: _config,
- data: _data,
BID: BID || '',
arr_field: _config.columns.map(col => col.field).join(','),
- plot: _config.plot,
- sync: _sync,
- title: config.plot.title
- }, () => {
- if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- } else if (config.setting.sync === 'true') {
- this.handleData()
- }
+ plot: _config.plot
})
- }
-
- /**
- * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config } = this.state
-
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = null
-
- if (config.subtype === 'ratioboard') {
- _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
- }
- } else {
- _data = {}
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || {}
- }
- if (_data.hasOwnProperty(config.plot.valueField)) {
- _data.value = _data[config.plot.valueField]
- }
- }
-
- this.setState({sync: false, data: _data}, () => {
- this.handleData()
- })
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
- }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -172,12 +135,22 @@
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, () => {
this.loadData(true)
})
}
+
+ this.initExec()
}
/**
@@ -188,9 +161,113 @@
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()
+ }
+
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.$cache) {
+ if (config.$time) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ this.data = res.data
+
+ if (config.subtype !== 'ratioboard') {
+ if (Array.isArray(this.data)) {
+ this.data = this.data[0] || {}
+ }
+ this.data.value = this.data[config.plot.valueField] || 0
+ }
+
+ this.handleData()
+ })
+ } else {
+ this.handleData()
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0).then(res => {
+ if (!res.data || this.loaded) return
+
+ this.data = res.data
+
+ if (config.subtype !== 'ratioboard') {
+ if (Array.isArray(this.data)) {
+ this.data = this.data[0] || {}
+ }
+ this.data.value = this.data[config.plot.valueField] || 0
+ }
+
+ this.handleData()
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, 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
+
+ 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
+ }
+
+ 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) => {
@@ -217,26 +294,38 @@
if (_element) {
_element.innerHTML = ''
}
- this.viewrender()
+
+ setTimeout(() => {
+ this.viewrender()
+ }, 100)
}
async loadData (hastimer) {
- const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
- this.setState({
- data: {}
- }, () => {
+ let _data = null
+ if (config.subtype === 'ratioboard') {
+ _data = []
+ } else {
+ _data = {value: 0}
+ }
+
+ if (!is(fromJS(this.data), fromJS(_data))) {
+ 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
}
@@ -251,39 +340,60 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let data = null
- if (config.subtype === 'ratioboard') {
- data = result.data || []
- } else {
- data = {}
- if (result.data && result.data[0] && result.data[0].hasOwnProperty(config.plot.valueField)) {
- data.value = result.data[0][config.plot.valueField]
- }
+ if (config.$cache && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || [])
}
- let reset = true
- if (hastimer && is(fromJS(data), fromJS(this.state.data))) {
- reset = false
+ this.loaded = true
+
+ let _data = null
+ if (config.subtype === 'ratioboard') {
+ _data = result.data || []
+ } else {
+ _data = result.data && result.data[0] ? result.data && result.data[0] : {}
+ _data.value = _data.value[config.plot.valueField] || 0
+ }
+
+ if (!is(fromJS(this.data), fromJS(_data))) {
+ this.data = _data
+ this.handleData()
}
this.setState({
- data,
loading: false
- }, () => {
- if (!reset) return
- this.handleData()
})
+
+ if (config.timer && config.clearField && result.data && result.data[0]) {
+ let vals = (config.clearValue || '').split(',')
+ if (vals.includes(result.data[0][config.clearField])) {
+ this.timer && this.timer.stop()
+ }
+ }
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
+ if (!result.message) return
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
})
- } else {
+ } else if (result.ErrCode !== '-2') {
notification.error({
top: 92,
message: result.message,
@@ -303,7 +413,7 @@
}
getratiodata = () => {
- const { data, plot } = this.state
+ const { plot } = this.state
let colors = {}
if (plot.colors && plot.colors.length > 0) {
@@ -312,7 +422,7 @@
})
}
- return data.map(item => {
+ return this.data.map(item => {
let val = +item[plot.valueField]
let type = item[plot.labelField] || ''
if (isNaN(val)) {
@@ -334,7 +444,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: plot.height
})
chart.data(data)
@@ -422,28 +532,21 @@
* @description 浠〃鐩樻覆鏌�
*/
dashboardrender = () => {
- const { plot, chartId, data } = this.state
+ const { plot, chartId } = this.state
- let _data = fromJS(data).toJS()
+ let _data = fromJS(this.data).toJS()
+ _data.value = +_data.value
- if (_data.hasOwnProperty('value')) {
- if (_data.value === '' || _data.value === null) {
- delete _data.value
- } else {
- _data.value = +_data.value
-
- if (isNaN(_data.value)) {
- delete _data.value
- } else if (_data.value > plot.maxValue) {
- _data.value = plot.maxValue
- }
- }
+ if (isNaN(_data.value)) {
+ _data.value = 0
+ } else if (_data.value > plot.maxValue) {
+ _data.value = plot.maxValue
}
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: plot.height,
padding: [0, 0, 0, 0],
})
chart.data([_data])
@@ -555,8 +658,9 @@
})
}
- if (data.hasOwnProperty('value')) {
- let val = data.value
+ let val = +this.data.value
+
+ if (!isNaN(val)) {
if (plot.percent !== 'false' && plot.maxValue) {
val = +(val / plot.maxValue * 100).toFixed(2) + ' %'
}
@@ -627,7 +731,7 @@
</div> : null
}
<NormalHeader config={config} />
- <div className="canvas-wrap" ref={ref => this.wrap = ref}>
+ <div className="canvas-wrap">
{config.plot.download === 'enable' && this.state.chart ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
<div className="canvas" id={this.state.chartId}></div>
</div>
--
Gitblit v1.8.0