From 2a3cc4e6cecfc6dab8b60adf93f7fde898ddc939 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 七月 2023 16:36:23 +0800
Subject: [PATCH] 2023-07-25
---
src/tabviews/custom/components/chart/antv-pie/index.jsx | 398 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 219 insertions(+), 179 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index f7fde28..a8756ad 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -2,9 +2,8 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
-import { connect } from 'react-redux'
import DataSet, { DataView } from '@antv/data-set'
-import { Spin, Empty, notification } from 'antd'
+import { Spin, Empty, notification, Modal } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -13,14 +12,13 @@
import { chartColors } from '@/utils/option.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
+import TimerTask from '@/utils/timer-task.js'
import NormalHeader from '@/tabviews/custom/components/share/normalheader'
import './index.scss'
class PieChart extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -30,20 +28,18 @@
loading: false, // 鏁版嵁鍔犺浇鐘舵��
chartId: Utils.getuuid(), // 鍥捐〃Id
title: '', // 缁勪欢鏍囬
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
- data: null, // 鏁版嵁
search: null, // 鎼滅储鏉′欢
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 = ''
@@ -56,15 +52,13 @@
BID = BData.$BID || ''
}
- if (config.setting.sync === 'true' && data) {
- _data = data[config.dataName] || []
- _sync = false
- } else if (config.setting.sync === 'true' && initdata) {
- _data = initdata || []
- _sync = false
- }
+ _config.plot.height = Utils.getHeight(_config.plot.height)
+ _config.style.height = 'auto'
+ _config.style.minHeight = _config.plot.height + 30
- _config.style.height = config.plot.height || 400
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
let decimal = 0
_config.columns.forEach(col => {
@@ -75,46 +69,32 @@
_config.plot.$decimal = decimal
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
+
+ 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)
+ }
+ }
+
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,
- search: Utils.initMainSearch(config.search)
- }, () => {
- 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()
- }
+ search: _config.$searches
})
- }
-
- /**
- * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config } = this.state
-
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
- }
-
- this.setState({sync: false, data: _data}, () => {
- this.handleData()
- })
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
- }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -122,87 +102,123 @@
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- this.handleTimer()
+
+ 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()
}
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
componentWillUnmount () {
- clearTimeout(this.timer)
this.setState = () => {
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()
}
- handleTimer = () => {
+ initExec = () => {
const { config } = this.state
- if (!config.timer) return
+ if (config.$cache) {
+ if (config.$time) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ if (!res && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+
+ if (!res || this.loaded) return
- const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
-
- let timer = _change[config.timer]
- let repeats = config.timerRepeats || 0
-
- if (!timer) return
-
- if (repeats > 0 && repeats <=3) {
- this.setState({timer, repeats})
- this.timer = setTimeout(() => {
- this.timerTask(repeats)
- }, timer)
- return
- }
-
- let _param = {
- func: 's_get_timers_role',
- LText: `select '${window.GLOB.appkey || ''}','${config.uuid}'`,
- timer_type: config.timer,
- component_id: config.uuid
- }
+ this.data = res
+ this.handleData()
+ })
+ } else {
+ this.handleData()
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0).then(res => {
+ if (!res || this.loaded) return
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
+ this.data = res
+ this.handleData()
+ })
+ }
- Api.getSystemConfig(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- return
- } else if (result.run_type) {
- this.setState({timer, repeats})
- this.timer = setTimeout(() => {
- this.timerTask(repeats)
- }, timer)
+ 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()
+ }
}
- timerTask = (times) => {
- const { timer, repeats } = this.state
- if (!timer) return
-
- this.loadData(true)
+ transferSyncData = (syncId) => {
+ const { config } = this.state
- if (repeats) {
- times = times - 1
- if (times <= 0) {
- clearTimeout(this.timer)
- return
- }
+ if (config.$syncId !== syncId) return
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
}
- this.timer = setTimeout(() => {
- this.timerTask(times)
- }, timer)
+
+ 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) => {
@@ -225,12 +241,18 @@
}
handleData = () => {
- const { plot, chartId } = this.state
-
- let _element = document.getElementById(chartId)
+ let _element = document.getElementById(this.state.chartId)
if (_element) {
_element.innerHTML = ''
}
+
+ setTimeout(() => {
+ this.viewrender()
+ }, 100)
+ }
+
+ viewrender = () => {
+ const { plot } = this.state
if (plot.shape === 'nest') {
this.nestrender()
@@ -240,30 +262,29 @@
}
async loadData (hastimer) {
- const { mainSearch } = this.props
const { config, arr_field, search, BID } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
- this.setState({
- data: []
- }, () => {
+ if (!is(fromJS(this.data), fromJS([]))) {
+ this.data = []
this.handleData()
- })
+ }
+ this.loaded = true
return
}
let searches = fromJS(search).toJS()
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key)
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
- 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
}
@@ -278,29 +299,57 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let reset = true
+ if (config.$cache && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || [])
+ }
+ this.loaded = true
- if (hastimer && is(fromJS(result.data), fromJS(this.state.data))) {
- reset = false
+ this.setState({
+ loading: false
+ })
+
+ if (!is(fromJS(this.data), fromJS(result.data || []))) {
+ this.data = result.data || []
+ this.handleData()
}
- this.setState({
- data: result.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,
- timer: null
+ loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+ this.timer && this.timer.stop()
+
+ if (!result.message) return
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else if (result.ErrCode !== '-2') {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -311,15 +360,15 @@
* 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
*/
getdata = () => {
- const { data, plot } = this.state
+ const { plot } = this.state
- if (!data) {
+ if (this.data.length === 0) {
this.setState({empty: true})
return []
}
let _data = []
- let _cdata = fromJS(data).toJS()
+ let _cdata = fromJS(this.data).toJS()
if (plot.repeat === 'average') {
let _mdata = new Map()
@@ -404,15 +453,15 @@
}
getnestdata = () => {
- const { data, plot } = this.state
+ const { plot } = this.state
- if (!data) {
+ if (this.data.length === 0) {
this.setState({empty: true})
return []
}
let _data = []
- let _cdata = fromJS(data).toJS()
+ let _cdata = fromJS(this.data).toJS()
if (plot.repeat === 'average') {
let _mdata = new Map()
@@ -428,14 +477,15 @@
return
}
- let sign = item[plot.type] + item[plot.Xaxis]
+ item.$type = item[plot.type]
+ let sign = item.$type + item[plot.Xaxis]
if (!_mdata.has(sign)) {
let _sort = sort
- if (map.has(item.type)) {
- _sort = map.get(item.type)
+ if (map.has(item.$type)) {
+ _sort = map.get(item.$type)
} else {
- map.set(item.type, _sort)
+ map.set(item.$type, _sort)
sort++
}
@@ -471,14 +521,15 @@
return
}
- let sign = item[plot.type] + item[plot.Xaxis]
+ item.$type = item[plot.type]
+ let sign = item.$type + item[plot.Xaxis]
if (!_mdata.has(sign)) {
let _sort = sort
- if (map.has(item.type)) {
- _sort = map.get(item.type)
+ if (map.has(item.$type)) {
+ _sort = map.get(item.$type)
} else {
- map.set(item.type, _sort)
+ map.set(item.$type, _sort)
sort++
}
@@ -513,11 +564,13 @@
}
}
+ item.$type = item[plot.type]
+
let _sort = sort
- if (map.has(item.type)) {
- _sort = map.get(item.type)
+ if (map.has(item.$type)) {
+ _sort = map.get(item.$type)
} else {
- map.set(item.type, _sort)
+ map.set(item.$type, _sort)
sort++
}
@@ -585,7 +638,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: plot.height,
padding: 0,
})
@@ -781,7 +834,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30
+ height: plot.height
})
if (plot.shape !== 'nightingale' && plot.show !== 'value') {
@@ -979,9 +1032,10 @@
if (plot.linkmenu && plot.linkmenu.length > 0) {
let menu_id = plot.linkmenu.slice(-1)[0]
- let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
-
+
chart.on('element:dblclick', (ev) => {
+ let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+
if (!menu) {
notification.warning({
top: 92,
@@ -1005,11 +1059,7 @@
}
}
- if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
- MKEmitter.emit('modifyTabs', newtab, 'replace')
- } else {
- MKEmitter.emit('modifyTabs', newtab, 'plus', true)
- }
+ MKEmitter.emit('modifyTabs', newtab, true)
} catch (e) {
console.warn('鑿滃崟鎵撳紑澶辫触锛�')
}
@@ -1088,7 +1138,7 @@
</div> : null
}
<NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
- <div className="canvas-wrap" ref={ref => this.wrap = ref}>
+ <div className="canvas-wrap">
{config.plot.download === 'enable' && this.state.chart && !empty ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
<div className={'canvas' + (empty ? ' empty' : '')} id={this.state.chartId}></div>
</div>
@@ -1098,14 +1148,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- permMenus: state.permMenus,
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PieChart)
\ No newline at end of file
+export default PieChart
\ No newline at end of file
--
Gitblit v1.8.0