From 84804b405cb88f659d055b16eb3bd00b813ccb4a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 十二月 2020 10:58:38 +0800
Subject: [PATCH] 2020-12-10
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 941ae06..a3e69bd 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -40,48 +40,48 @@
let columns = new Map()
tableFields.forEach(table => {
table.columns.forEach(column => {
- columns.set(column.field, column)
+ columns.set(column.field.toLowerCase(), column)
})
})
if (type === 'search') {
// 娣诲姞鎼滅储鏉′欢锛屽瓧娈甸泦涓瓨鍦ㄦ悳绱㈡潯浠跺瓧娈碉紝浣跨敤鎼滅储鏉′欢瀵硅薄鏇挎崲瀛楁闆嗭紝璁剧疆鏁版嵁绫诲瀷
config.search.forEach(item => {
- if (columns.has(item.field)) {
- let _datatype = columns.get(item.field).datatype
- columns.set(item.field, {...item, selected: true, datatype: _datatype})
+ if (columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
})
} else if (type === 'columns') {
// 娣诲姞鏄剧ず鍒楋紝瀛楁闆嗕腑瀛樺湪鏄剧ず鍒楀瓧娈碉紝浣跨敤鏄剧ず鍒楀璞℃浛鎹㈠瓧娈甸泦锛岃缃暟鎹被鍨�
config.columns.forEach(item => {
- if (columns.has(item.field)) {
- let _datatype = columns.get(item.field).datatype
- columns.set(item.field, {...item, selected: true, datatype: _datatype})
+ if (columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
})
} else if (type === 'fields') {
config.columns.forEach(item => {
- if (columns.has(item.field)) {
- let _datatype = columns.get(item.field).datatype
- columns.set(item.field, {...item, selected: true, datatype: _datatype})
+ if (columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
})
} else if (type === 'form') {
if (config.groups.length > 1) {
config.groups.forEach(group => {
group.sublist.forEach(item => {
- if (columns.has(item.field)) {
- let _datatype = columns.get(item.field).datatype
- columns.set(item.field, {...item, selected: true, datatype: _datatype})
+ if (columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
})
})
} else {
config.fields.forEach(item => {
- if (columns.has(item.field)) {
- let _datatype = columns.get(item.field).datatype
- columns.set(item.field, {...item, selected: true, datatype: _datatype})
+ if (columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
})
}
@@ -109,14 +109,14 @@
let cards = this.refs.searchcard.state.selectCards
let columnsMap = new Map()
cards.forEach(card => {
- columnsMap.set(card.field, card)
+ columnsMap.set(card.field.toLowerCase(), card)
})
let items = []
if (type === 'search') {
config.search.forEach(item => {
- if (columnsMap.has(item.field)) {
- let cell = columnsMap.get(item.field)
+ if (columnsMap.has(item.field.toLowerCase())) {
+ let cell = columnsMap.get(item.field.toLowerCase())
if (cell.selected && cell.type === item.type) { // 鏁版嵁鏈慨鏀�
items.push(item)
@@ -134,7 +134,7 @@
item.initval = ''
items.push(item)
}
- columnsMap.delete(item.field)
+ columnsMap.delete(item.field.toLowerCase())
} else if (!item.origin) {
items.push(item)
}
@@ -174,13 +174,13 @@
config.search = items
} else if (type === 'columns') {
config.columns.forEach(item => {
- if (columnsMap.has(item.field)) {
- let cell = columnsMap.get(item.field)
+ if (columnsMap.has(item.field.toLowerCase())) {
+ let cell = columnsMap.get(item.field.toLowerCase())
if (cell.selected) {
items.push(item)
}
- columnsMap.delete(item.field)
+ columnsMap.delete(item.field.toLowerCase())
} else if (!item.origin) {
items.push(item)
}
@@ -213,13 +213,13 @@
config.columns = items
} else if (type === 'fields') {
config.columns.forEach(item => {
- if (columnsMap.has(item.field)) {
- let cell = columnsMap.get(item.field)
+ if (columnsMap.has(item.field.toLowerCase())) {
+ let cell = columnsMap.get(item.field.toLowerCase())
if (cell.selected) {
items.push(item)
}
- columnsMap.delete(item.field)
+ columnsMap.delete(item.field.toLowerCase())
} else {
items.push(item)
}
@@ -243,8 +243,8 @@
if (config.groups.length > 1) {
config.groups.forEach(group => {
group.sublist.forEach(item => {
- if (columnsMap.has(item.field)) {
- let cell = columnsMap.get(item.field)
+ if (columnsMap.has(item.field.toLowerCase())) {
+ let cell = columnsMap.get(item.field.toLowerCase())
if (cell.selected && cell.type === item.type) { // 鏁版嵁閫夋嫨鐘舵�佸強绫诲瀷鏈慨鏀规椂锛岀洿鎺ユ坊鍔�
items.push(item)
@@ -253,7 +253,7 @@
item.initval = ''
items.push(item)
}
- columnsMap.delete(item.field)
+ columnsMap.delete(item.field.toLowerCase())
} else if (!item.origin) { // 杩囨护绀轰緥椤�
items.push(item)
}
@@ -283,8 +283,8 @@
config.groups[config.groups.length - 1].sublist = [...config.groups.slice(-1)[0].sublist, ..._additems]
} else {
config.fields.forEach(item => {
- if (columnsMap.has(item.field)) {
- let cell = columnsMap.get(item.field)
+ if (columnsMap.has(item.field.toLowerCase())) {
+ let cell = columnsMap.get(item.field.toLowerCase())
if (cell.selected && cell.type === item.type) { // 鏁版嵁閫夋嫨鐘舵�佸強绫诲瀷鏈慨鏀规椂锛岀洿鎺ユ坊鍔�
items.push(item)
@@ -293,7 +293,7 @@
item.initval = ''
items.push(item)
}
- columnsMap.delete(item.field)
+ columnsMap.delete(item.field.toLowerCase())
} else if (!item.origin) { // 杩囨护绀轰緥椤�
items.push(item)
}
--
Gitblit v1.8.0