From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 2e2b905..8964a75 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -16,7 +16,7 @@
const cardTypeOptions = {
sequence: ['eleType', 'width'],
text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle', 'copyable'],
- number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
+ number: ['eleType', 'datatype', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue', 'posterType'],
icon: ['eleType', 'icon', 'datatype', 'width'],
@@ -66,7 +66,7 @@
item.options = []
config.columns.forEach(col => {
let label = col.label
- if (label !== col.field) {
+ if (label.toLowerCase() !== col.field.toLowerCase()) {
label = col.field + ' ' + col.label
}
if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
@@ -112,7 +112,7 @@
if (datatype === 'dynamic') {
_options.push('field')
if (eleType === 'number') {
- _options.push('decimal')
+ _options.push('decimal', 'format')
}
} else if (eleType === 'picture' || eleType === 'video') {
_options.push('url')
@@ -175,7 +175,7 @@
item.options = []
config.columns.forEach(col => {
let label = col.label
- if (label !== col.field) {
+ if (label.toLowerCase() !== col.field.toLowerCase()) {
label = col.field + ' ' + col.label
}
@@ -229,8 +229,6 @@
}, () => {
if (value === 'slider') {
this.props.form.setFieldsValue({width: 24, color: '#1890ff'})
- } else if (value === 'splitline') {
- this.props.form.setFieldsValue({width: 24, color: '#e8e8e8'})
} else if (value === 'qrcode') {
this.props.form.setFieldsValue({color: '#000000'})
} else if (value === 'text' || value === 'number') {
--
Gitblit v1.8.0