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/templates/sharecomponent/columncomponent/columnform/index.jsx |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/templates/sharecomponent/columncomponent/columnform/index.jsx b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
index a955bd2..dc17190 100644
--- a/src/templates/sharecomponent/columncomponent/columnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
@@ -34,9 +34,9 @@
 
     let _options = JSON.parse(JSON.stringify(columnTypeOptions[card.type]))
     if (card.type === 'text' || card.type === 'number') {
-      if (card.perspective !== 'linkurl') {
-        _options.push('linkmenu')
-      } else {
+      if (card.perspective === 'linkmenu') {
+        _options.push('linkmenu', 'linkfields')
+      } else if (card.perspective === 'linkurl') {
         _options.push('linkurl')
       }
     }
@@ -74,9 +74,9 @@
       let _options = JSON.parse(JSON.stringify(columnTypeOptions[value]))
 
       if (card.type === 'text' || card.type === 'number') {
-        if (card.perspective !== 'linkurl') {
-          _options.push('linkmenu')
-        } else {
+        if (card.perspective === 'linkmenu') {
+          _options.push('linkmenu', 'linkfields')
+        } else if (card.perspective === 'linkurl') {
           _options.push('linkurl')
         }
       }
@@ -107,10 +107,9 @@
   changeRadio = (key, value) => {
     if (key === 'perspective') {
       let _options = JSON.parse(JSON.stringify(columnTypeOptions[this.state.type]))
-
-      if (value !== 'linkurl') {
-        _options.push('linkmenu')
-      } else {
+      if (value === 'linkmenu') {
+        _options.push('linkmenu', 'linkfields')
+      } else if (value === 'linkurl') {
         _options.push('linkurl')
       }
 
@@ -283,7 +282,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={this.state.menulist}

--
Gitblit v1.8.0