From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/prop-card/index.jsx | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 7bce4be..14185b5 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -116,6 +116,10 @@
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale || ''} ${_config.wrap.layout || 'grid'}-layout float-${_config.wrap.cardFloat || 'left'}`
+ if (_config.wrap.display === 'hidden') {
+ _config.style.display = 'none'
+ }
+
this.setState({
selected,
sync: _sync,
@@ -141,6 +145,9 @@
}, 200)
}
+ if (_config.wrap.datatype === 'dynamic') {
+ this.autoExec()
+ }
if (!_config.wrap.cardType && _data.$$uuid) {
setTimeout(() => {
this.transferLine()
@@ -209,6 +216,7 @@
} else if (!config.wrap.cardType && _data.$$uuid) {
this.transferLine()
}
+ this.autoExec()
})
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
@@ -235,6 +243,16 @@
}
})
}
+ }
+
+ autoExec = () => {
+ const { config, data } = this.state
+
+ if (!config.wrap.autoExec || data.$$empty) return
+
+ setTimeout(() => {
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [data])
+ }, 200)
}
checkTopLine = () => {
@@ -384,6 +402,7 @@
} else {
this.transferLine()
}
+ this.autoExec()
})
if (config.timer && config.clearField) {
--
Gitblit v1.8.0