From 2031a460f6c0827fe80f8c625dd98333d1631d2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 五月 2020 22:10:48 +0800
Subject: [PATCH] 2020-05-08
---
src/templates/sharecomponent/searchcomponent/index.jsx | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 81d0380..df45ed6 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -126,7 +126,27 @@
_searchlist = _searchlist.map(item => { // 鏁版嵁鏇存柊鍙婇噸澶嶆娴�
if (item.uuid !== res.uuid && res.field && item.field) {
- if (item.field === res.field) {
+ let itemFields = []
+ if (item.type === 'text') {
+ itemFields = item.field.split(',')
+ } else if (item.type === 'group') {
+ itemFields = [item.field, item.datefield]
+ } else {
+ itemFields = [item.field]
+ }
+
+ let resFields = []
+ if (res.type === 'text') {
+ resFields = res.field.split(',')
+ } else if (res.type === 'group') {
+ resFields = [res.field, res.datefield]
+ } else {
+ resFields = [res.field]
+ }
+
+ let setFields = Array.from(new Set([...itemFields, ...resFields]))
+
+ if (setFields.length < itemFields.length + resFields.length && (res.type !== 'date' || item.type !== 'date')) {
fieldrepet = true
} else if (item.label === res.label) {
labelrepet = true
@@ -264,7 +284,7 @@
<Modal
title={dict['model.searchCriteria'] + '-' + (card && card.copyType === 'search' ? dict['model.copy'] : dict['model.edit'])}
visible={visible}
- width={750}
+ width={850}
maskClosable={false}
onOk={this.handleSubmit}
confirmLoading={sqlVerifing}
--
Gitblit v1.8.0