From da34633b25d16359cd91a656acad5e811f9972b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 三月 2023 18:09:54 +0800
Subject: [PATCH] 2023-03-14
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 53642ec..0aa6042 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -108,9 +108,6 @@
let initval = ''
if (item.type === 'select') {
_match = '='
- } else if (item.type === 'daterange') {
- initval = '[30, 0]'
- _match = 'between'
} else {
item.type = 'text'
_match = 'like'
@@ -140,7 +137,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
}
@@ -172,10 +169,12 @@
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 +185,7 @@
type: item.type,
resourceType: '0',
span: span,
- labelwidth: 33.3,
+ labelwidth: labelwidth,
options: [],
dataSource: '',
decimal: item.decimal,
@@ -197,18 +196,21 @@
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
--
Gitblit v1.8.0