From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/tabviews/custom/components/card/prop-card/index.jsx | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index aac9321..592322d 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -135,9 +135,15 @@
}
if (_config.wrap.datatype === 'dynamic' && this.loaded) {
- this.autoExec()
+ if (_config.wrap.goback === 'true' && _data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', _config.$pageId)
+ } else {
+ this.autoExec()
+ }
}
- if (!_config.wrap.cardType && _data.$$uuid) {
+ if (_data.$$uuid) {
setTimeout(() => {
this.transferLine()
}, 200)
@@ -213,12 +219,18 @@
this.loaded = true
this.setState({sync: false, data: _data}, () => {
- if (selected !== 'false') {
- this.checkTopLine()
- } else if (!config.wrap.cardType && _data.$$uuid) {
- this.transferLine()
+ if (config.wrap.goback === 'true' && _data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', config.$pageId)
+ } else {
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else if (_data.$$uuid) {
+ this.transferLine()
+ }
+ this.autoExec()
}
- this.autoExec()
})
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
@@ -240,10 +252,17 @@
this.loaded = true
this.setState({data: _data}, () => {
- if (selected !== 'false') {
- this.checkTopLine()
+ if (config.wrap.goback === 'true' && _data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', config.$pageId)
} else {
- this.transferLine()
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else {
+ this.transferLine()
+ }
+ this.autoExec()
}
})
}
@@ -421,9 +440,9 @@
}
})
- if (config.timer && config.clearField) {
+ if (config.timer && config.clearField && result.data && result.data[0]) {
let vals = (config.clearValue || '').split(',')
- if (vals.includes(_data[config.clearField])) {
+ if (vals.includes(result.data[0][config.clearField])) {
this.timer && this.timer.stop()
}
}
--
Gitblit v1.8.0