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/comtableconfig/actionform/index.jsx | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/templates/comtableconfig/actionform/index.jsx b/src/templates/comtableconfig/actionform/index.jsx index a40a22c..158d78d 100644 --- a/src/templates/comtableconfig/actionform/index.jsx +++ b/src/templates/comtableconfig/actionform/index.jsx @@ -108,9 +108,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') { @@ -131,7 +131,7 @@ } else if (item.key === 'Ot') { if (_opentype === 'innerpage' || _position === 'grid') { item.options = this.state.reqOptionSgl - } else if (['outerpage', 'blank', 'tab', 'popview'].includes(_opentype)) { + } else if (['outerpage', 'blank', 'tab', 'popview', 'excelIn'].includes(_opentype)) { item.options = this.state.reqOptions } else { item.options = this.state.reqOptionsMutil @@ -198,9 +198,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') { @@ -226,6 +226,9 @@ } else if (['outerpage', 'blank', 'tab', 'popview'].includes(value)) { item.options = this.state.reqOptions _fieldval.Ot = 'requiredSgl' + } else if (value === 'excelIn') { + item.options = this.state.reqOptions + _fieldval.Ot = 'notRequired' } else { item.options = this.state.reqOptionsMutil } @@ -306,9 +309,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') { @@ -512,7 +515,6 @@ if (values.OpenType === 'excelIn') { values.position = 'toolbar' - values.Ot = 'notRequired' } else if (values.OpenType === 'excelOut') { values.position = 'toolbar' values.Ot = 'notRequired' -- Gitblit v1.8.0