From 55071f5a06673369ceba07e36cd7f85e584c3eac Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十二月 2019 10:55:49 +0800
Subject: [PATCH] 2019-12-23

---
 src/templates/subtableconfig/actionform/index.jsx |   44 +++++++-------------------------------------
 1 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/src/templates/subtableconfig/actionform/index.jsx b/src/templates/subtableconfig/actionform/index.jsx
index c892e70..a027cb6 100644
--- a/src/templates/subtableconfig/actionform/index.jsx
+++ b/src/templates/subtableconfig/actionform/index.jsx
@@ -22,13 +22,6 @@
       MenuID: 'requiredSgl',
       text: this.props.dict['header.form.requiredSgl']
     }],
-    reqOptions: [{
-      MenuID: 'notRequired',
-      text: this.props.dict['header.form.notRequired']
-    }, {
-      MenuID: 'requiredSgl',
-      text: this.props.dict['header.form.requiredSgl']
-    }],
     reqOptionsMutil: [{
       MenuID: 'notRequired',
       text: this.props.dict['header.form.notRequired']
@@ -70,13 +63,7 @@
     let _intertype = this.props.formlist.filter(form => form.key === 'intertype')[0].initVal
     let _position = this.props.formlist.filter(form => form.key === 'position')[0].initVal
     let _options = null
-    if (_opentype === 'innerpage') { // 鏂伴〉闈紙鍐呴儴锛夛紝鍙�夋ā鏉�
-      _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
-    } else if (_opentype === 'outerpage') { // 鏂伴〉闈紙澶栭儴锛夛紝闇�瑕侀〉闈㈠湴鍧�
-      _options = ['label', 'Ot', 'OpenType', 'url', 'icon', 'class', 'position']
-    } else if (_opentype === 'blank' || _opentype === 'tab' || _opentype === 'popview') {
-      _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position']
-    } else if (_opentype === 'excelIn' || _opentype === 'excelOut') {
+    if (_opentype === 'excelIn' || _opentype === 'excelOut') {
       if (_intertype === 'outer') {
         _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'execSuccess', 'execError', 'method']
       } else {
@@ -99,13 +86,7 @@
         } else if (item.key === 'icon') {
           item.options = btnIcons
         } else if (item.key === 'Ot') {
-          if (_opentype === 'innerpage' || _position === 'grid') {
-            item.options = this.state.reqOptionSgl
-          } else if (['outerpage', 'blank', 'tab', 'popview'].includes(_opentype)) {
-            item.options = this.state.reqOptions
-          } else {
-            item.options = this.state.reqOptionsMutil
-          }
+          item.options = this.state.reqOptionsMutil
         } else if (item.key === 'sqlType') {
           if (['prompt', 'exec'].includes(_opentype)) {
             item.options = this.state.deleteOptions
@@ -123,13 +104,7 @@
   openTypeChange = (key, value) => {
     if (key === 'OpenType') {
       let _options = null
-      if (value === 'innerpage') {
-        _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
-      } else if (value === 'outerpage') {
-        _options = ['label', 'Ot', 'OpenType', 'url', 'icon', 'class', 'position']
-      } else if (value === 'blank' || value === 'tab' || value === 'popview') {
-        _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position']
-      } else if (value === 'excelIn' || value === 'excelOut') {
+      if (value === 'excelIn' || value === 'excelOut') {
         if (this.state.interType === 'outer') {
           _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'execSuccess', 'execError', 'method']
         } else {
@@ -152,11 +127,8 @@
             }
           }
           if (item.key === 'Ot') {
-            if (value === 'innerpage' || this.state.position === 'grid') {
+            if (this.state.position === 'grid') {
               item.options = this.state.reqOptionSgl
-              item.initVal = 'requiredSgl'
-            } else if (['outerpage', 'blank', 'tab', 'popview'].includes(value)) {
-              item.options = this.state.reqOptions
               item.initVal = 'requiredSgl'
             } else {
               item.options = this.state.reqOptionsMutil
@@ -192,16 +164,14 @@
         position: value,
         formlist: this.state.formlist.map(item => {
           if (item.key === 'Ot') {
-            if (this.state.openType === 'innerpage' || value === 'grid') {
+            if (value === 'grid') {
               item.options = this.state.reqOptionSgl
-              item.initVal = 'requiredSgl'
-              item.hidden = true
-            } else if (['outerpage', 'blank', 'tab', 'pop', 'popview'].includes(this.state.openType)) {
-              item.options = this.state.reqOptions
               item.initVal = 'requiredSgl'
               item.hidden = true
             } else {
               item.options = this.state.reqOptionsMutil
+              item.initVal = 'requiredSgl'
+              item.hidden = true
             }
           }
           return item

--
Gitblit v1.8.0