From ad328dea146ab06dcaadb69d6cefb5ce658d659f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 二月 2022 17:39:44 +0800
Subject: [PATCH] 2022-02-07
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 4d259c2..94e19cd 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -62,15 +62,19 @@
if (item.key === 'field' || item.key === 'linkurl') {
item.options = []
config.columns.forEach(col => {
+ let label = col.label
+ if (label !== col.field) {
+ label = col.field + ' ' + col.label
+ }
if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
} else if (/^(Nvarchar|date)/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
}
})
@@ -154,15 +158,20 @@
if (item.key === 'field') {
item.options = []
config.columns.forEach(col => {
+ let label = col.label
+ if (label !== col.field) {
+ label = col.field + ' ' + col.label
+ }
+
if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
} else if (/^(Nvarchar|date)/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
}
})
--
Gitblit v1.8.0