From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 06 十二月 2022 16:09:04 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/menu/components/card/cardcellcomponent/elementform/index.jsx | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx index b720973..93e0b43 100644 --- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx +++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx @@ -64,10 +64,7 @@ if (item.key === 'field' || item.key === 'linkurl' || item.key === 'bgImage' || item.key === 'posterField') { item.options = [] config.columns.forEach(col => { - let label = col.label - if (label.toLowerCase() !== col.field.toLowerCase()) { - label = col.field + ' ' + col.label - } + let label = `${col.field}锛�${col.label}锛塦 if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) { item.options.push({ value: col.field, @@ -173,10 +170,7 @@ if (item.key === 'field') { item.options = [] config.columns.forEach(col => { - let label = col.label - if (label.toLowerCase() !== col.field.toLowerCase()) { - label = col.field + ' ' + col.label - } + let label = `${col.field}锛�${col.label}锛塦 if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) { item.options.push({ -- Gitblit v1.8.0