From 8a0b3081ecacbb844ea639ccc53ffd2c151cec1e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 三月 2021 02:13:53 +0800
Subject: [PATCH] 2021-03-28

---
 src/menu/components/table/normal-table/columns/editColumn/index.jsx |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 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 4d355d9..09fa91d 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -54,9 +54,9 @@
     let formlist = getColumnForm(column, menulist, this.props.fields)
     let _options = fromJS(columnTypeOptions[column.type]).toJS()
     if (column.type === 'text' || column.type === 'number') {
-      if (column.perspective !== 'linkurl') {
-        _options.push('linkmenu')
-      } else {
+      if (column.perspective === 'linkmenu') {
+        _options.push('linkmenu', 'linkfields')
+      } else if (column.perspective === 'linkurl') {
         _options.push('linkurl')
       }
     }
@@ -85,10 +85,6 @@
     if (key === 'type') {
       let _options = fromJS(columnTypeOptions[value]).toJS()
 
-      if (value === 'text' || value === 'number') {
-        _options.push('linkmenu')
-      }
-
       this.setState({
         type: value,
         formlist: this.state.formlist.map(item => {
@@ -100,7 +96,7 @@
         if (value === 'link' || value === 'textarea' || value === 'picture') {
           this.props.form.setFieldsValue({IsSort: 'false'})
         } else if (value === 'text' || value === 'number') {
-          this.props.form.setFieldsValue({perspective: 'linkmenu'})
+          this.props.form.setFieldsValue({perspective: ''})
         } else if (value === 'action' || value === 'colspan') {
           this.props.form.setFieldsValue({Align: 'center'})
         }
@@ -123,9 +119,9 @@
     if (key === 'perspective') {
       let _options = fromJS(columnTypeOptions[this.state.type]).toJS()
 
-      if (value !== 'linkurl') {
-        _options.push('linkmenu')
-      } else {
+      if (value === 'linkmenu') {
+        _options.push('linkmenu', 'linkfields')
+      } else if (value === 'linkurl') {
         _options.push('linkurl')
       }
 
@@ -273,7 +269,7 @@
                   filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                 >
                   {item.options.map((option, i) =>
-                    <Select.Option id={i} key={i} value={option.value}>{option.text}</Select.Option>
+                    <Select.Option id={i} key={i} value={option.value || option.field}>{option.text || option.label}</Select.Option>
                   )}
                 </Select>
               )}
@@ -285,7 +281,13 @@
           <Col span={12} key={index}>
             <Form.Item label={item.label}>
               {getFieldDecorator(item.key, {
-                initialValue: item.initVal || []
+                initialValue: item.initVal || [],
+                rules: [
+                  {
+                    required: !!item.required,
+                    message: this.props.dict['form.required.select'] + item.label + '!'
+                  }
+                ]
               })(
                 <Cascader
                   options={item.options}

--
Gitblit v1.8.0