From a8e94242166881639cecf3809e45ca527233ebd7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 23 三月 2021 16:42:20 +0800
Subject: [PATCH] 2021-03-23
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 130 +++++++++++++------------------------------
1 files changed, 39 insertions(+), 91 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 43bb69b..4edb4e3 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -67,23 +67,12 @@
}
})
} else if (type === 'form') {
- if (config.groups.length > 1) {
- config.groups.forEach(group => {
- group.sublist.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})
- }
- })
- })
- } else {
- 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})
- }
- })
- }
+ 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})
+ }
+ })
}
// 鏄剧ず瀛楁闆嗗脊绐�
@@ -239,32 +228,30 @@
}
})
} else if (type === 'form') {
- if (config.groups.length > 1) {
- config.groups.forEach(group => {
- let _items = []
- group.sublist.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)
- }
- })
- group.sublist = _items
- })
-
- let _columns = [...columnsMap.values()]
-
- let _additems = _columns.map(item => { // 寰幆娣诲姞鏂板瀛楁
- return {
+ 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
+
+ _columns.forEach(item => { // 寰幆娣诲姞鏂板瀛楁
+ if (item.selected) {
+ let newcard = {
uuid: Utils.getuuid(),
label: item.label,
field: item.field,
@@ -272,59 +259,21 @@
type: item.type,
resourceType: '0',
setAll: 'false',
+ span: span,
+ labelwidth: 33.3,
options: [],
dataSource: '',
- orderType: 'asc',
decimal: item.decimal,
+ orderType: 'asc',
readonly: 'false',
required: 'true'
}
- })
- config.groups[config.groups.length - 1].sublist = [...config.groups.slice(-1)[0].sublist, ..._additems]
- } else {
- 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()]
-
- _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',
- options: [],
- dataSource: '',
- decimal: item.decimal,
- orderType: 'asc',
- readonly: 'false',
- required: 'true'
- }
-
- items.push(newcard)
- }
- })
-
- config.fields = items
- }
+
+ items.push(newcard)
+ }
+ })
+
+ config.fields = items
}
if (type === 'search' || type === 'columns' || type === 'form') {
@@ -373,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