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/templates/sharecomponent/actioncomponent/actionform/index.jsx | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index d934b69..6516f5f 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -83,9 +83,7 @@
let _tabTemplate = card.tabTemplate // 鎸夐挳涓烘爣绛鹃〉鏃讹紝鏍囩绫诲瀷锛氫笁绾ц彍鍗曟垨琛ㄥ崟鏍囩椤�
let _pageTemplate = card.pageTemplate // 鏂伴〉闈㈢被鍨�
- if (card.execMode) { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
- _opentype = 'funcbutton'
- } else if (_opentype === 'outerpage') {
+ if (_opentype === 'outerpage') {
card.pageTemplate = 'custom'
_opentype = 'innerpage'
} else if (_opentype === 'blank') {
@@ -182,12 +180,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')
- } else if (_intertype === 'system') {
- _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
+ _options.push('innerFunc')
}
}
} else if (_opentype !== 'popview') { // 鎵撳紑鏂瑰紡涓嶆槸寮圭獥椤甸潰鏃�
@@ -663,9 +660,6 @@
values.createTab = true // 鐢ㄤ簬鏍囪鎸夐挳澶嶅埗鏃讹紝鏄惁澶嶅埗鍘熸湁鏍囩
} else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
values.position = 'toolbar'
- if (values.funcType === 'print') {
- values.OpenType = values.execMode
- }
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
if (values.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(this.props.card.Ot)) {
values.verify.uniques = []
--
Gitblit v1.8.0