From bfadd84fbc2b23c59695e5a94778ab7ac40fea03 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 26 六月 2021 22:54:17 +0800
Subject: [PATCH] 2021-06-26
---
src/tabviews/custom/components/carousel/data-card/index.jsx | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx
index b75e1dc..ce847cf 100644
--- a/src/tabviews/custom/components/carousel/data-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/data-card/index.jsx
@@ -117,12 +117,10 @@
})
this.setState({sync: false, data: _data})
- } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (config.setting.syncRefresh === 'true') {
- this.setState({}, () => {
- this.loadData()
- })
- }
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({}, () => {
+ this.loadData()
+ })
}
}
@@ -180,7 +178,7 @@
if (config.uuid !== menuId) return
- let searches = mainSearch ? fromJS(mainSearch).toJS() : []
+ let searches = config.setting.useMSearch && mainSearch ? fromJS(mainSearch).toJS() : []
MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
arr_field: arr_field,
@@ -202,7 +200,7 @@
return
}
- let searches = mainSearch ? fromJS(mainSearch).toJS() : []
+ let searches = config.setting.useMSearch && mainSearch ? fromJS(mainSearch).toJS() : []
this.setState({
loading: true
--
Gitblit v1.8.0