From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 1e55d87..c5ebebb 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -169,7 +169,7 @@
       }
     } else if (_opentype === 'funcbutton') {
       if (_funcType === 'print') {
-        _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
+        _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex', 'controlField', 'controlVal')
         if (_intertype === 'outer') {
           _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
         } else if (_intertype === 'inner') {
@@ -177,6 +177,8 @@
         }
       } else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
         _options.push('execSuccess', 'execError')
+      } else if (_funcType === 'closetab') {
+        _options.push('refreshTab')
       }
     } else if (_opentype !== 'popview' && _opentype !== 'tab') {
       if (_intertype === 'custom') {
@@ -196,14 +198,8 @@
       }
     }
 
-    if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
-      if (this.state.appType === 'mob') {
-        if (_opentype !== 'funcbutton') {
-          _options.push('controlField', 'controlVal')
-        }
-      } else {
-        _options.push('controlField', 'controlVal')
-      }
+    if (_Ot !== 'notRequired' && _opentype !== 'excelOut' && _opentype !== 'funcbutton') {
+      _options.push('controlField', 'controlVal')
     }
     if (_Ot === 'requiredSgl' && ['pop', 'prompt', 'exec'].includes(_opentype)) {
       _options.push('swipe')
@@ -219,7 +215,7 @@
       try {
         let _form = document.getElementById('label')
         _form && _form.select()
-      } catch {
+      } catch (e) {
         console.warn('琛ㄥ崟focus澶辫触锛�')
       }
     }

--
Gitblit v1.8.0