From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09

---
 src/menu/components/table/edit-table/columns/editColumn/index.jsx |   25 ++++++++++++++-----------
 1 files changed, 14 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 ca299fb..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,
@@ -85,7 +84,12 @@
   }
 
   editColumn = (column) => {
-    let formlist = getColumnForm(column, this.props.fields, this.props.columns)
+    let fields = fromJS(this.props.fields).toJS().map(item => {
+      item.text = `${item.field}锛�${item.label}锛塦
+      return item
+    })
+
+    let formlist = getColumnForm(column, fields, this.props.columns)
 
     this.column = fromJS(column).toJS()
     this.column.editType = this.column.editType || 'text'
@@ -132,7 +136,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)) {
@@ -220,7 +224,6 @@
   }
 
   getFields() {
-    const { dict } = this.props 
     const { getFieldDecorator } = this.props.form
     const { formlist, transfield } = this.state
     const fields = []
@@ -239,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
@@ -249,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
 
@@ -260,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
@@ -270,14 +273,14 @@
           getPopupContainer={() => document.getElementById('edit-table-column-winter')}
         >
           {item.options.map((option, i) =>
-            <Select.Option key={i} datatype={option.datatype || ''} value={(option.value || option.field || option.MenuID)}>
+            <Select.Option key={i} datatype={option.datatype || ''} label={option.label || ''} value={(option.value || option.field || option.MenuID)}>
               {(option.text || option.label || option.MenuName)}
             </Select.Option>
           )}
         </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
 
@@ -299,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