From 19e156d67e400bff8883425f3511812bb4f9d193 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 七月 2023 12:46:00 +0800
Subject: [PATCH] 2023-07-10
---
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 217 ++++++++++++++++++++++++++----------------------------
1 files changed, 105 insertions(+), 112 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index f5b5693..1c96f7a 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
-import { Spin, Empty, notification } from 'antd'
+import { Spin, Empty, notification, Modal } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -11,6 +11,7 @@
import asyncBtnComponent from './asyncButtonComponent'
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'
@@ -32,15 +33,15 @@
chartId: Utils.getuuid(), // 鍥捐〃Id
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
- data: null, // 鏁版嵁
search: null, // 鎼滅储鏉′欢
chart: null
}
+ data = []
+
UNSAFE_componentWillMount () {
const { config, data, initdata } = this.props
let _config = fromJS(config).toJS()
- let _data = null
let _sync = config.setting.sync === 'true'
let BID = ''
@@ -55,21 +56,26 @@
BID = BData.$BID || ''
}
- if (config.setting.sync === 'true' && data) {
- _data = data[config.dataName] || []
+ if (_sync && data) {
+ this.data = data[config.dataName] || []
_sync = false
- } else if (config.setting.sync === 'true' && initdata) {
- _data = initdata || []
+ } else if (_sync && initdata) {
+ this.data = initdata || []
_sync = false
}
- _config.style.height = config.plot.height || 400
+ _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 || '',
- empty: !_data,
+ empty: this.data.length === 0,
arr_field: _config.columns.map(col => col.field).join(','),
plot: _config.plot,
sync: _sync,
@@ -79,10 +85,12 @@
setTimeout(() => {
this.loadData()
}, _config.setting.delay || 0)
- } else if (config.setting.sync === 'true' && _data) {
- this.handleData()
}
})
+
+ if (this.data.length > 0) {
+ this.handleData()
+ }
}
/**
@@ -97,10 +105,13 @@
_data = nextProps.data[config.dataName] || []
}
- this.setState({sync: false, data: _data, empty: !_data,}, () => {
+ if (!is(fromJS(this.data), fromJS(_data))) {
+ this.data = _data
this.handleData()
- })
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ }
+
+ this.setState({sync: false, empty: _data.length === 0})
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -112,18 +123,38 @@
}
componentDidMount () {
+ const { config, sync } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
- this.handleTimer()
+
+ if (config.timer) {
+ this.timer = new TimerTask()
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+ this.loadData(true)
+ })
+ }
+
+ if (config.$cache && (config.setting.sync !== 'true' || sync)) {
+ Api.getLCacheConfig(config.uuid).then(res => {
+ if (!res || this.data.length > 0) return
+
+ if (!is(fromJS(this.data), fromJS(res))) {
+ this.data = res
+ this.handleData()
+ }
+
+ this.setState({empty: false})
+ })
+ }
}
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
componentWillUnmount () {
- clearTimeout(this.timer)
this.setState = () => {
return
}
@@ -131,72 +162,8 @@
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
- }
- handleTimer = () => {
- const { config } = this.state
-
- if (!config.timer) 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
- }
-
- _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瀵嗛挜
-
- 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)
- }
- })
- }
-
- timerTask = (times) => {
- const { timer, repeats } = this.state
- if (!timer) return
-
- this.loadData(true)
-
- if (repeats) {
- times = times - 1
- if (times <= 0) {
- clearTimeout(this.timer)
- return
- }
- }
- this.timer = setTimeout(() => {
- this.timerTask(times)
- }, timer)
+ this.timer && this.timer.stop()
}
/**
@@ -214,10 +181,6 @@
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
this.loadData()
- }
-
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -275,12 +238,12 @@
const { config, arr_field, BID, search } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
- this.setState({
- data: [],
- empty: false,
- }, () => {
+ this.setState({ empty: true })
+
+ if (!is(fromJS(this.data), fromJS([]))) {
+ this.data = []
this.handleData()
- })
+ }
return
}
@@ -310,30 +273,57 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let reset = true
-
- if (hastimer && is(fromJS(result.data), fromJS(this.state.data))) {
- reset = false
+ if (config.$cache && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || '')
}
this.setState({
- data: result.data,
- empty: false,
+ empty: !result.data || result.data.length === 0,
loading: false
- }, () => {
- if (!reset) return
- this.handleData()
})
+
+ if (!is(fromJS(this.data), fromJS(result.data || []))) {
+ this.data = result.data || []
+ 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
+ })
+ }
}
}
@@ -345,21 +335,24 @@
if (_element) {
_element.innerHTML = ''
}
- this.scatterrender()
+
+ setTimeout(() => {
+ this.scatterrender()
+ }, 100)
}
/**
* @description 鏁ｇ偣鍥炬覆鏌�
*/
scatterrender = () => {
- const { plot, data, chartId } = this.state
+ const { plot, chartId } = this.state
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: plot.height
})
- chart.data(data);
+ chart.data(this.data);
chart.scale({
[plot.Xaxis]: { nice: true },
[plot.Yaxis]: { nice: true },
@@ -471,7 +464,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={'chart-action' + (config.plot.download === 'enable' ? ' downable' : '')}>
{config.action.map(item => {
--
Gitblit v1.8.0