From 6afdec0062dacbded57e166230eb22cc55ced0c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 五月 2021 14:30:21 +0800
Subject: [PATCH] 2021-05-08
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 124 +++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 42 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 2aefd5c..f6a6609 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -14,20 +14,19 @@
static propTpyes = {
type: PropTypes.string, // 鎼滅储鏉′欢娣诲姞銆佹樉绀哄垪娣诲姞
config: PropTypes.object, // 瀹瑰櫒Id
- tableFields: PropTypes.string, // 宸查�夎〃瀛楁闆�
updatefield: PropTypes.func
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
fields: [], // 瀛楁闆�
tableVisible: false, // 妯℃�佹鎺у埗
}
queryField = () => {
- const { type, config, tableFields } = this.props
+ const { type, config } = this.props
// 鍒ゆ柇鏄惁宸查�夋嫨琛ㄥ悕
- if (!tableFields || tableFields.length === 0) {
+ if (!window.GLOB.tableFields || window.GLOB.tableFields.length === 0) {
notification.warning({
top: 92,
message: '璇烽�夋嫨琛ㄥ悕锛�',
@@ -38,33 +37,40 @@
// 琛ㄥ瓧娈甸泦杞负map鏁版嵁
let columns = new Map()
- tableFields.forEach(table => {
+ window.GLOB.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 (item.field && 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') {
+ config.fields.forEach(item => {
+ if (item.field && columns.has(item.field.toLowerCase())) {
+ let _datatype = columns.get(item.field.toLowerCase()).datatype
+ columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
}
})
}
@@ -91,14 +97,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)
@@ -116,7 +122,7 @@
item.initval = ''
items.push(item)
}
- columnsMap.delete(item.field)
+ columnsMap.delete(item.field.toLowerCase())
} else if (!item.origin) {
items.push(item)
}
@@ -153,15 +159,16 @@
items.push(newcard)
}
})
+ config.search = items
} else if (type === 'columns') {
config.columns.forEach(item => {
- if (columnsMap.has(item.field)) {
- let cell = columnsMap.get(item.field)
+ if (item.field && 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)
}
@@ -191,15 +198,16 @@
items.push(newcard)
}
})
+ 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)
}
@@ -219,24 +227,57 @@
items.push(newcard)
}
})
+ } else if (type === 'form') {
+ config.fields.forEach(item => {
+ if (item.field && columnsMap.has(item.field.toLowerCase())) {
+ let cell = columnsMap.get(item.field.toLowerCase())
+
+ if (cell.selected && cell.type === item.type) { // 鏁版嵁閫夋嫨鐘舵�佸強绫诲瀷鏈慨鏀规椂锛岀洿鎺ユ坊鍔�
+ items.push(item)
+ } else if (cell.selected) { // 鏁版嵁绫诲瀷淇敼鏃讹紝閲嶇疆绫诲瀷鍙婂垵濮嬪��
+ item.type = cell.type
+ item.initval = ''
+ items.push(item)
+ }
+ columnsMap.delete(item.field.toLowerCase())
+ } else if (!item.origin) { // 杩囨护绀轰緥椤�
+ items.push(item)
+ }
+ })
+
+ let _columns = [...columnsMap.values()]
+ let lastItem = config.fields[config.fields.length - 1]
+ let span = lastItem ? lastItem.span || 12 : 12
+
+ _columns.forEach(item => { // 寰幆娣诲姞鏂板瀛楁
+ if (item.selected) {
+ let newcard = {
+ uuid: Utils.getuuid(),
+ label: item.label,
+ field: item.field,
+ initval: '',
+ type: item.type,
+ resourceType: '0',
+ setAll: 'false',
+ span: span,
+ labelwidth: 33.3,
+ options: [],
+ dataSource: '',
+ decimal: item.decimal,
+ orderType: 'asc',
+ readonly: 'false',
+ required: 'true'
+ }
+
+ items.push(newcard)
+ }
+ })
+
+ config.fields = items
}
- let _config = null
-
- if (type === 'search') {
- _config = {...this.props.config, search: items}
-
- this.props.updatefield(_config)
-
- notification.success({
- top: 92,
- message: '鎿嶄綔鎴愬姛',
- duration: 2
- })
- } else if (type === 'columns') {
- _config = {...this.props.config, columns: items}
-
- this.props.updatefield(_config)
+ if (type === 'search' || type === 'columns' || type === 'form') {
+ this.props.updatefield(config)
notification.success({
top: 92,
@@ -281,7 +322,6 @@
visible={this.state.tableVisible}
width={'65vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
cancelText={dict['model.close']}
onOk={this.addFieldSubmit}
onCancel={() => { // 鍙栨秷娣诲姞
--
Gitblit v1.8.0