From 0594fe8d97286a535177f8ba05972d0305fc7dee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 二月 2020 14:15:58 +0800
Subject: [PATCH] 2020-02-17

---
 src/templates/subtableconfig/actionform/index.jsx |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/templates/subtableconfig/actionform/index.jsx b/src/templates/subtableconfig/actionform/index.jsx
index c9bd789..f4eabb0 100644
--- a/src/templates/subtableconfig/actionform/index.jsx
+++ b/src/templates/subtableconfig/actionform/index.jsx
@@ -24,6 +24,13 @@
       value: 'requiredSgl',
       text: this.props.dict['header.form.requiredSgl']
     }],
+    reqOptions: [{
+      value: 'notRequired',
+      text: this.props.dict['header.form.notRequired']
+    }, {
+      value: 'requiredSgl',
+      text: this.props.dict['header.form.requiredSgl']
+    }],
     reqOptionsMutil: [{
       value: 'notRequired',
       text: this.props.dict['header.form.notRequired']
@@ -95,9 +102,9 @@
       }
     } else if (_opentype === 'excelIn') {
       if (_intertype === 'outer') {
-        _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'execSuccess', 'execError']
+        _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
       } else {
-        _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError']
+        _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
       }
     } else {
       if (_intertype === 'outer') {
@@ -116,7 +123,11 @@
         } else if (item.key === 'icon') {
           item.options = btnIcons
         } else if (item.key === 'Ot') {
-          item.options = this.state.reqOptionsMutil
+          if (_opentype === 'excelIn') {
+            item.options = this.state.reqOptions
+          } else {
+            item.options = this.state.reqOptionsMutil
+          }
         } else if (item.key === 'sqlType') {
           if (['prompt', 'exec'].includes(_opentype)) {
             item.options = this.state.deleteOptions
@@ -191,9 +202,9 @@
         }
       } else if (value === 'excelIn') {
         if (this.state.interType === 'outer') {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'execSuccess', 'execError']
+          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
         } else {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError']
+          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
         }
       } else {
         if (this.state.interType === 'inner') {
@@ -216,6 +227,9 @@
             if (this.state.position === 'grid') {
               item.options = this.state.reqOptionSgl
               item.initVal = 'requiredSgl'
+            } else if (value === 'excelIn') {
+              item.options = this.state.reqOptions
+              item.initVal = 'notRequired'
             } else {
               item.options = this.state.reqOptionsMutil
             }
@@ -232,7 +246,7 @@
           return item
         })
       }, () => {
-        if (['excelIn', 'excelOut'].includes(value)) return
+        if (['excelOut'].includes(value)) return
 
         this.setState({
           formlist: this.state.formlist.map(item => {
@@ -317,9 +331,9 @@
         }
       } else if (openType === 'excelIn') {
         if (value === 'outer') {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'execSuccess', 'execError']
+          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
         } else {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError']
+          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
         }
       } else {
         if (value === 'inner') {
@@ -513,7 +527,9 @@
           values.uuid = this.props.card.uuid
           values.verify = this.props.card.verify || null
 
-          if (values.OpenType === 'excelIn' || values.OpenType === 'excelOut') {
+          if (values.OpenType === 'excelIn') {
+            values.position = 'toolbar'
+          } else if (values.OpenType === 'excelOut') {
             values.position = 'toolbar'
             values.Ot = 'notRequired'
           } else if (values.OpenType === 'popview' && !values.linkTab) { // 娌℃湁鍏宠仈鏍囩锛堟柊寤烘椂锛夛紝鍒涘缓鏂版爣绛綢d

--
Gitblit v1.8.0