From fe5dc955911feb6c376298e618de673da166fcab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 17 十一月 2021 20:05:30 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 3636575..2bc9602 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -182,7 +182,7 @@
}
} else if (_opentype === 'funcbutton') {
if (_funcType === 'print') {
- _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex', 'controlField', 'controlVal')
+ _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
if (_intertype === 'outer') {
_options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
@@ -215,7 +215,7 @@
}
}
- if (_Ot !== 'notRequired' && _opentype !== 'excelOut' && _opentype !== 'funcbutton') {
+ if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
_options.push('controlField', 'controlVal')
}
if (_Ot === 'requiredSgl' && ['pop', 'prompt', 'exec'].includes(_opentype)) {
--
Gitblit v1.8.0