From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 09 五月 2023 14:48:10 +0800 Subject: [PATCH] 2023-05-09 --- src/templates/sharecomponent/fieldscomponent/index.jsx | 68 +++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 25 deletions(-) diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx index 53642ec..c493ccd 100644 --- a/src/templates/sharecomponent/fieldscomponent/index.jsx +++ b/src/templates/sharecomponent/fieldscomponent/index.jsx @@ -106,13 +106,13 @@ selectCards.forEach(item => { let _match = '' let initval = '' - if (item.type === 'select') { + let _type = item.type + if (item.type === 'date') { + _type = 'daterange' + } else if (item.type === 'select') { _match = '=' - } else if (item.type === 'daterange') { - initval = '[30, 0]' - _match = 'between' } else { - item.type = 'text' + _type = 'text' _match = 'like' } @@ -121,7 +121,7 @@ label: item.label, field: item.field, initval: initval, - type: item.type, + type: _type, resourceType: '0', options: [], orderType: 'asc', @@ -140,7 +140,7 @@ label: item.label, field: item.field, Hide: 'false', - IsSort: item.type === 'picture' ? 'false' : 'true', + IsSort: 'true', type: item.type, Width: item.type === 'number' ? 80 : 120 } @@ -166,16 +166,18 @@ field: item.field, datatype: _t } - items.push(newcard) + items.unshift(newcard) keys.push(item.field.toLowerCase()) }) this.props.updatefield(items) } else if (type === 'form') { - let lastItem = config.fields[config.fields.length - 1] + let firstItem = config.fields[0] let span = this.state.appType === 'mob' ? 24 : 12 - if (lastItem && lastItem.span) { - span = lastItem.span + let labelwidth = 33.3 + if (firstItem && firstItem.span) { + span = firstItem.span + labelwidth = firstItem.labelwidth || 33.3 } selectCards.forEach(item => { // 寰幆娣诲姞鏂板瀛楁 let newcard = { @@ -186,7 +188,7 @@ type: item.type, resourceType: '0', span: span, - labelwidth: 33.3, + labelwidth: labelwidth, options: [], dataSource: '', decimal: item.decimal, @@ -195,20 +197,29 @@ required: 'true' } - if (item.type === 'text' && item.length >= 256) { + if (/^icon|images?$/ig.test(item.field)) { + newcard.type = 'fileupload' + newcard.fileType = 'picture-card' + newcard.fieldlength = item.length || 512 + newcard.maxSize = 1 + newcard.maxfile = 1 + } else if (item.type === 'text' && item.length >= 256) { newcard.type = 'textarea' + newcard.required = 'false' newcard.fieldlength = item.length - if (lastItem && lastItem.type === newcard.type) { - newcard.span = lastItem.span - newcard.labelwidth = lastItem.labelwidth - } else if (lastItem) { - newcard.span = 24 - if (lastItem.span === 12) { - newcard.labelwidth = 16.2 - } else if (lastItem.span === 8) { - newcard.labelwidth = 10.5 - } else if (lastItem.span === 8) { - newcard.labelwidth = 7.7 + if (firstItem) { + if (firstItem.type === newcard.type) { + newcard.span = firstItem.span + newcard.labelwidth = firstItem.labelwidth + } else { + newcard.span = 24 + if (firstItem.span === 12) { + newcard.labelwidth = 16.2 + } else if (firstItem.span === 8) { + newcard.labelwidth = 10.5 + } else if (firstItem.span === 6) { + newcard.labelwidth = 7.7 + } } } else { newcard.span = 24 @@ -261,9 +272,16 @@ const { type } = this.props const { fields } = this.state + let label = '鎵归噺娣诲姞' + if (type === 'search') { + label = '娣诲姞鎼滅储' + } else if (type === 'columns') { + label = '娣诲姞鏄剧ず鍒�' + } + return ( <div className="quickly-add"> - <Button type="primary" block onClick={this.queryField}>鎵归噺娣诲姞</Button> + <Button type="primary" block onClick={this.queryField}>{label}</Button> {/* 鏍规嵁瀛楁鍚嶆坊鍔犳樉绀哄垪鍙婃悳绱㈡潯浠� */} <Modal wrapClassName="model-table-fieldmanage-modal" -- Gitblit v1.8.0