From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/tabviews/custom/components/carousel/prop-card/index.jsx | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index d519d08..392ac7a 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -27,7 +27,8 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
- data: {} // 鏁版嵁
+ data: {}, // 鏁版嵁
+ BData: null
}
UNSAFE_componentWillMount () {
@@ -133,12 +134,10 @@
}
this.setState({sync: false, data: _data})
- } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (config.wrap.datatype !== 'static' && 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()
+ })
}
}
@@ -167,12 +166,12 @@
}
}
- resetParentParam = (MenuID, id) => {
+ resetParentParam = (MenuID, id, data) => {
const { config } = this.state
if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
if (id !== this.state.BID) {
- this.setState({ BID: id }, () => {
+ this.setState({ BID: id, BData: data }, () => {
this.loadData()
})
}
@@ -188,30 +187,25 @@
async loadData () {
const { mainSearch, menuType } = this.props
- const { config, arr_field, BID } = this.state
+ const { config, arr_field, BID, BData } = this.state
if (config.wrap.datatype === 'static') {
this.setState({
- data: {$$BID: BID || ''},
- loading: false
+ data: {$$BID: BID || '', $$BData: BData}
})
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
- data: {$$BID: BID || ''},
- loading: false
+ data: {$$BID: BID || '', $$BData: BData}
})
return
}
- let searches = []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key)
- mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searches.push(item)
- }
- })
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+
+ let requireFields = searches.filter(item => item.required && item.value === '')
+ if (requireFields.length > 0) {
+ return
}
this.setState({
@@ -225,6 +219,7 @@
if (result.status) {
let _data = result.data && result.data[0] ? result.data[0] : {}
_data.$$BID = BID || ''
+ _data.$$BData = BData || ''
this.setState({
data: _data,
@@ -270,7 +265,7 @@
newtab.param.$BID = item.setting.primaryId
}
- if (['linkage_navigation', 'linkage'].includes(window.GLOB.navBar)) {
+ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
this.props.modifyTabview([newtab])
} else {
let tabs = this.props.tabviews.filter((tab, i) => {
--
Gitblit v1.8.0