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/components/group/normal-group/index.jsx | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/custom/components/group/normal-group/index.jsx b/src/tabviews/custom/components/group/normal-group/index.jsx
index 5c42318..d90aa38 100644
--- a/src/tabviews/custom/components/group/normal-group/index.jsx
+++ b/src/tabviews/custom/components/group/normal-group/index.jsx
@@ -48,7 +48,6 @@
// 鑾峰彇涓绘悳绱㈡潯浠�
let _mainSearch = mainSearch ? fromJS(mainSearch).toJS() : []
- let isEmpty = _mainSearch.filter(item => item.required && (!item.value || item.value.length === 0)).length > 0
let params = []
config.components.forEach(item => {
if (item.type === 'tabs') return
@@ -57,31 +56,24 @@
if (!item.format) return
if (item.dataName && (!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true' && item.setting.sync === 'true') {
- if (isEmpty && item.setting.useMSearch) {
+ let searchlist = []
+ if (item.search && item.search.length > 0) {
+ searchlist = Utils.initMainSearch(item.search)
+ }
+ if (item.setting.useMSearch) {
+ let keys = searchlist.map(item => item.key)
+ _mainSearch.forEach(item => {
+ if (!keys.includes(item.key)) {
+ searchlist.push(item)
+ }
+ })
+ }
+
+ if (searchlist.filter(cell => cell.required && cell.value === '').length > 0) {
item.setting.sync = 'false'
item.setting.onload = 'false'
} else {
- let searchlist = []
- if (item.search && item.search.length > 0) {
- searchlist = Utils.initMainSearch(item.search)
- }
-
- let _empty = searchlist.filter(cell => cell.required && (!cell.value || cell.value.length === 0)).length > 0
-
- if (_empty) {
- item.setting.sync = 'false'
- item.setting.onload = 'false'
- } else {
- if (item.setting.useMSearch) {
- let keys = searchlist.map(item => item.key)
- _mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searchlist.push(item)
- }
- })
- }
- params.push(this.getDefaultParam(item, searchlist))
- }
+ params.push(this.getDefaultParam(item, searchlist))
}
} else {
item.setting.sync = 'false'
--
Gitblit v1.8.0