From 88ca0a326f0101a7713404909041003a512bb7e2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 六月 2022 17:19:41 +0800
Subject: [PATCH] 2022-06-08
---
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index 7aa7940..5a41606 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -44,7 +44,14 @@
}
editColumn = (column) => {
- let formlist = getColumnForm(column, this.props.fields)
+ let fields = fromJS(this.props.fields).toJS().map(item => {
+ if (item.label.toLowerCase() !== item.field.toLowerCase()) {
+ item.text = item.label + '锛�' + item.field + '锛�'
+ }
+ return item
+ })
+
+ let formlist = getColumnForm(column, fields)
let _options = fromJS(columnTypeOptions[column.type]).toJS()
if (column.type === 'text' || column.type === 'number') {
if (column.perspective === 'linkmenu') {
@@ -96,7 +103,7 @@
}
})
} else if (key === 'field') {
- let values = {label: option.props.children}
+ let values = {label: option.props.label || option.props.children}
if (/Decimal|int/ig.test(option.props.datatype)) {
let decimal = 0
if (/Decimal/ig.test(option.props.datatype)) {
@@ -231,7 +238,7 @@
getPopupContainer={() => document.getElementById('columnwinter')}
>
{item.options.map((option, index) =>
- <Select.Option key={index} datatype={option.datatype || ''} value={(option.value || option.field || option.MenuID)}>
+ <Select.Option key={index} datatype={option.datatype || ''} label={option.label || ''} value={(option.value || option.field || option.MenuID)}>
{(option.text || option.label || option.MenuName)}
</Select.Option>
)}
--
Gitblit v1.8.0