From 31871ca836e6fcbea9b1c54e2ec15f49667bf093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 十二月 2022 14:14:04 +0800
Subject: [PATCH] 2022-12-23
---
src/tabviews/custom/components/chart/custom-chart/index.jsx | 103 +++++++++++++++++----------------------------------
1 files changed, 34 insertions(+), 69 deletions(-)
diff --git a/src/tabviews/custom/components/chart/custom-chart/index.jsx b/src/tabviews/custom/components/chart/custom-chart/index.jsx
index 310c1ea..a3f4b6d 100644
--- a/src/tabviews/custom/components/chart/custom-chart/index.jsx
+++ b/src/tabviews/custom/components/chart/custom-chart/index.jsx
@@ -5,18 +5,17 @@
import DataSet from '@antv/data-set'
import * as echarts from 'echarts'
import { Spin, Empty, notification } from 'antd'
-import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.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 CustomChart extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
@@ -34,10 +33,22 @@
}
UNSAFE_componentWillMount () {
- const { config, data, initdata, BID } = this.props
+ const { config, data, initdata } = this.props
let _config = fromJS(config).toJS()
let _data = null
let _sync = config.setting.sync === 'true'
+
+ let BID = ''
+ let BData = ''
+
+ if (_config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(_config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(_config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
if (config.setting.sync === 'true' && data) {
_data = data[config.dataName] || []
@@ -47,7 +58,8 @@
_sync = false
}
- _config.style.height = config.plot.height || 400
+ _config.plot.height = Utils.getHeight(_config.plot.height)
+ _config.style.height = 'auto'
this.setState({
config: _config,
@@ -84,7 +96,7 @@
this.setState({sync: false, data: _data, empty: _data.length === 0}, () => {
this.handleData()
})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -96,18 +108,25 @@
}
componentDidMount () {
+ const { config } = 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)
+ })
+ }
}
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
componentWillUnmount () {
- clearTimeout(this.timer)
this.setState = () => {
return
}
@@ -115,64 +134,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 = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
-
- let timer = _change[config.timer]
-
- if (!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) {
- let repeats = config.timerRepeats || 0
- 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()
}
/**
@@ -219,7 +182,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, search } = this.state
@@ -235,7 +198,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
@@ -301,9 +264,9 @@
})
} else {
this.setState({
- loading: false,
- timer: null
+ loading: false
})
+ this.timer && this.timer.stop()
notification.error({
top: 92,
message: result.message,
@@ -385,7 +348,9 @@
</div> : null
}
<NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
- <div className={'canvas' + (empty ? ' empty' : '')} ref={ref => this.wrap = ref}></div>
+ <div className="canvas-wrap" style={{height: (config.plot.height + 30) + 'px'}}>
+ <div className={'canvas' + (empty ? ' empty' : '')} style={{height: config.plot.height + 'px'}} ref={ref => this.wrap = ref}></div>
+ </div>
{empty ? <Empty description={false}/> : null}
</div>
)
--
Gitblit v1.8.0