From 3c26f581cd77bed95cc56464f8424993f3c6b13a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 六月 2021 18:45:44 +0800
Subject: [PATCH] 2021-06-28
---
src/tabviews/custom/index.jsx | 45 ++++++++++++++++++---------------------------
1 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 3fb37a5..e2d8388 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -191,9 +191,7 @@
})
}
- let isEmpty = mainSearch.filter(item => item.required && (!item.value || item.value.length === 0)).length > 0
-
- config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs, isEmpty)
+ config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs)
this.setState({
BID: BID,
@@ -715,7 +713,7 @@
}
// 鏍煎紡鍖栭粯璁よ缃�
- formatSetting = (components, params, mainSearch, inherit, regs, isEmpty) => {
+ formatSetting = (components, params, mainSearch, inherit, regs) => {
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
@@ -790,31 +788,24 @@
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
if (component.floor === 1 && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
- if (isEmpty && component.setting.useMSearch) {
+ let searchlist = []
+ if (component.search && component.search.length > 0) {
+ searchlist = Utils.initMainSearch(component.search)
+ }
+ if (component.setting.useMSearch) {
+ let keys = searchlist.map(item => item.key)
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key)) {
+ searchlist.push(item)
+ }
+ })
+ }
+
+ if (searchlist.filter(item => item.required && item.value === '').length > 0) {
component.setting.sync = 'false'
component.setting.onload = 'false'
} else {
- let searchlist = []
- if (component.search && component.search.length > 0) {
- searchlist = Utils.initMainSearch(component.search)
- }
-
- let _empty = searchlist.filter(item => item.required && (!item.value || item.value.length === 0)).length > 0
-
- if (_empty) {
- component.setting.sync = 'false'
- component.setting.onload = 'false'
- } else {
- if (component.setting.useMSearch) {
- let keys = searchlist.map(item => item.key)
- mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searchlist.push(item)
- }
- })
- }
- params.push(this.getDefaultParam(component, searchlist))
- }
+ params.push(this.getDefaultParam(component, searchlist))
}
} else if (component.floor === 1) {
component.setting.sync = 'false'
@@ -1083,7 +1074,7 @@
} else if (item.type === 'search') {
return (
<Col span={item.width} key={item.uuid}>
- <MainSearch config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} refreshdata={this.resetSearch} />
+ <MainSearch config={item} BID={BID} menuType={menuType} refreshdata={this.resetSearch} />
</Col>
)
} else if (item.type === 'tabs') {
--
Gitblit v1.8.0