From a02fc6a77fa1b35c6516b2d37108d80e260c6c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十一月 2024 22:05:08 +0800
Subject: [PATCH] 2024-11-07
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 52d7eb1..9db6d1e 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -146,9 +146,20 @@
if (type === 'search') {
// 娣诲姞鎼滅储鏉′欢锛屽瓧娈甸泦涓瓨鍦ㄦ悳绱㈡潯浠跺瓧娈碉紝浣跨敤鎼滅储鏉′欢瀵硅薄鏇挎崲瀛楁闆嗭紝璁剧疆鏁版嵁绫诲瀷
config.search.forEach(item => {
- if (item.field && columns.has(item.field.toLowerCase())) {
- let _datatype = columns.get(item.field.toLowerCase()).datatype
- columns.set(item.field.toLowerCase(), {...item, origin: true, datatype: _datatype})
+ if (item.field) {
+ if (/,/.test(item.field)) {
+ item.field.split(',').forEach(n => {
+ if (columns.has(n.toLowerCase())) {
+ let _datatype = columns.get(n.toLowerCase()).datatype
+ columns.set(n.toLowerCase(), {...item, field: n, origin: true, datatype: _datatype})
+ }
+ })
+ } else {
+ if (columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, origin: true, datatype: _datatype})
+ }
+ }
}
})
} else if (type === 'columns') {
@@ -193,13 +204,6 @@
let config = fromJS(this.props.config).toJS()
- // 鑾峰彇宸查�夊瓧娈甸泦鍚�
- let cards = selectCards
- let columnsMap = new Map()
- cards.forEach(card => {
- columnsMap.set(card.field.toLowerCase(), card)
- })
-
let items = []
let keys = []
if (type === 'search') {
@@ -240,7 +244,7 @@
label: item.label,
field: item.field,
Hide: 'false',
- IsSort: 'true',
+ IsSort: 'false',
type: item.type === 'number' ? 'number' : 'text',
Width: item.type === 'number' ? 80 : 120
}
--
Gitblit v1.8.0