From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21

---
 src/menu/components/table/edit-table/columns/editColumn/index.jsx |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 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 1af68b0..102006c 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,
@@ -64,9 +63,9 @@
         _options.push('editType')
 
         if (this.column.editType === 'switch') {
-          _options.push('enter', 'footEnter', 'openVal', 'closeVal', 'openText', 'closeText')
+          _options.push('enter', 'openVal', 'closeVal', 'openText', 'closeText', 'editField')
         } else if (this.column.editType === 'select') {
-          _options.push('required', 'enter', 'footEnter', 'resourceType', 'linkSubField', 'editField')
+          _options.push('required', 'enter', 'resourceType', 'linkSubField', 'editField', 'dropdown')
 
           if (this.column.resourceType === '0') {
             _options.push('options')
@@ -74,10 +73,10 @@
             _options.push('dataSource', 'valueField', 'valueText', 'orderBy', 'orderType', 'disableField', 'database')
           }
         } else {
-          _options.push('required', 'enter', 'footEnter')
+          _options.push('required', 'enter')
         }
       } else if (this.column.type === 'number') {
-        _options.push('max', 'min', 'enter', 'footEnter')
+        _options.push('max', 'min', 'enter')
       }
     }
 
@@ -85,7 +84,14 @@
   }
 
   editColumn = (column) => {
-    let formlist = getColumnForm(column, this.props.fields, this.props.columns)
+    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, this.props.columns)
 
     this.column = fromJS(column).toJS()
     this.column.editType = this.column.editType || 'text'
@@ -132,7 +138,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 +226,6 @@
   }
 
   getFields() {
-    const { dict } = this.props 
     const { getFieldDecorator } = this.props.form
     const { formlist, transfield } = this.state
     const fields = []
@@ -239,7 +244,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 +254,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 +265,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 +275,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 +304,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