From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/chart/custom-chart/index.jsx | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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..3223266 100644
--- a/src/tabviews/custom/components/chart/custom-chart/index.jsx
+++ b/src/tabviews/custom/components/chart/custom-chart/index.jsx
@@ -16,7 +16,6 @@
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] || []
@@ -122,11 +133,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ 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',
@@ -148,7 +168,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
@@ -219,7 +238,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, search } = this.state
@@ -235,7 +254,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
--
Gitblit v1.8.0