From 4de5be49a7d128118def405c5ce24771526cc188 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 一月 2021 21:34:55 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 7f58d49..133767b 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -76,10 +76,6 @@
let _opentype = card.OpenType // 鎵撳紑鏂瑰紡
let _intertype = card.intertype || 'system' // 鎺ュ彛绫诲瀷
let _funcType = card.funcType || 'print' // 鍔熻兘鎸夐挳榛樿绫诲瀷
-
- if (card.execMode) { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
- _opentype = 'funcbutton'
- }
let _options = this.getOptions(_opentype, _intertype, _funcType, card.pageTemplate)
@@ -141,10 +137,11 @@
}
} else if (_opentype === 'funcbutton') {
if (_funcType === 'print') {
+ _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (_intertype === 'outer') {
- _options.push('execMode', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'execSuccess', 'execError')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
- _options.push('execMode', 'intertype', 'innerFunc', 'Ot', 'execSuccess', 'execError')
+ _options.push('innerFunc')
}
}
} else if (_opentype !== 'popview' && _opentype !== 'tab') {
@@ -589,10 +586,6 @@
}
values.Ot = 'notRequired'
- } else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
- if (values.funcType === 'print') {
- values.OpenType = values.execMode
- }
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
if ((values.Ot === 'requiredOnce' || this.props.card.Ot === 'requiredOnce') && this.props.card.Ot !== values.Ot) {
values.verify.uniques = []
--
Gitblit v1.8.0