From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
index 3997baa..1fac697 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -24,7 +24,6 @@
class EdiTableColumn extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
visible: PropTypes.bool,
column: PropTypes.object,
columns: PropTypes.array,
@@ -86,9 +85,7 @@
editColumn = (column) => {
let fields = fromJS(this.props.fields).toJS().map(item => {
- if (item.label.toLowerCase() !== item.field.toLowerCase()) {
- item.text = item.label + '锛�' + item.field + '锛�'
- }
+ item.text = `${item.field}锛�${item.label}锛塦
return item
})
@@ -227,7 +224,6 @@
}
getFields() {
- const { dict } = this.props
const { getFieldDecorator } = this.props.form
const { formlist, transfield } = this.state
const fields = []
@@ -246,7 +242,7 @@
if (item.type === 'text') {
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' },
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' },
{
max: formRule.input.max,
message: formRule.input.message
@@ -256,7 +252,7 @@
content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
} else if (item.type === 'number') {
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
initVal = item.initVal
@@ -267,7 +263,7 @@
}
} else if (item.type === 'select') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <Select
showSearch
@@ -284,7 +280,7 @@
</Select>
} else if (item.type === 'radio') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
initVal = item.initVal
@@ -306,13 +302,13 @@
span = 24
className = 'text-area'
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
content = <TextArea rows={item.rows || 2}/>
} else if (item.type === 'codemirror') {
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
span = 24
className = 'text-area'
--
Gitblit v1.8.0