From 8e36e054aa177f110fd352d5d650851f2dfb6169 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 六月 2023 17:46:08 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/prop-card/index.jsx | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 651bd23..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()
}
})
}
--
Gitblit v1.8.0