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/card/balcony/index.jsx | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index 43ec2d1..8429861 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -15,7 +15,6 @@
class BalconyComponent extends Component {
static propTpyes = {
- BID: PropTypes.any,
data: PropTypes.array,
config: PropTypes.object,
}
@@ -34,13 +33,25 @@
}
UNSAFE_componentWillMount () {
- const { data, BID, initdata } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
let _data = { $$empty: true }
let _sync = false
+
+ 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 && _config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype !== 'static') {
_sync = _config.setting.sync === 'true'
if (_sync && data) {
@@ -164,11 +175,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',
@@ -190,7 +210,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
@@ -282,12 +301,12 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { config } = this.state
if (config.uuid !== menuId) return
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: '',
orderBy: '',
search: [],
@@ -375,6 +394,8 @@
render() {
const { config, loading, data, show, syncConfig, syncData, checked } = this.state
+ if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+
return (
<div className={'custom-balcony-box' + (!show ? ' hidden' : '')} style={config.style}>
{loading ?
--
Gitblit v1.8.0