From 43008f1240d6568a3364721bb01fc7e31b33d147 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:39:51 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index e65fe19..df7f722 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -229,6 +229,8 @@
if (config.setting.onload === 'true') {
this.initExec()
}
+
+ this.autoExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -319,6 +321,25 @@
setTimeout(() => {
this.loadData()
}, config.setting.delay || 0)
+ }
+ }
+
+ autoExec = (times) => {
+ const { config } = this.state
+
+ if (!config.wrap.autoExec) return
+
+ let btn = document.getElementById('button' + config.wrap.autoExec)
+
+ this.autoTimer && clearTimeout(this.autoTimer)
+
+ if (btn) {
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [])
+ } else if (!times || times < 20) {
+ times = times ? times + 1 : 1
+ this.autoTimer = setTimeout(() => {
+ this.autoExec(times)
+ }, 1000)
}
}
@@ -1193,6 +1214,20 @@
subClass = opens.indexOf(item.key) > -1 ? 'mk-unfold' : 'mk-collapse'
unfold = opens.indexOf(item.key) > -1
}
+
+ if (!unfold && item.children.length > 5) {
+ return (
+ <Col key={index} span={card.setting.width} style={card.wStyle}>
+ <div className={className} style={wrapStyle}>
+ <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(item.key, subClass)} onClick={() => {this.changeCard(item.key, item, subClass)}}>
+ <span className="circle-select"></span>
+ {card.setting.controlIcon === 'left' ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null}
+ {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null}
+ </CardItem>
+ </div>
+ </Col>
+ )
+ }
}
return (
--
Gitblit v1.8.0