From 94f09287d3424f96a6d60ac67b9bf4ac58455e25 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 07 八月 2022 10:32:09 +0800
Subject: [PATCH] 2022-08-07

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 37d57c9..53d9a8b 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -673,11 +673,9 @@
           param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
         }
 
-        if (param.func === 'sPC_TableData_InUpDe') {
-          param.menuname = btn.logLabel
-          if (window.GLOB.probation) {
-            param.s_debug_type = 'Y'
-          }
+        param.menuname = btn.logLabel
+        if (window.GLOB.probation) {
+          param.s_debug_type = 'Y'
         }
 
         return param
@@ -1071,7 +1069,11 @@
       let _params = [] // 璇锋眰鍙傛暟鏁扮粍
 
       if (btn.procMode === 'system') {
-        _params = this.getSystemParam(data, formdata, btn.callbackType === 'script')
+        _params = this.getSystemParam(data, formdata, true)
+        _params = _params.map(item => {
+          item.script_type = 'Y'
+          return item
+        })
       } else {
         _params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
       }
@@ -1088,7 +1090,7 @@
       let params = []
 
       if (btn.procMode === 'system') {
-        params = this.getSystemParam(data, formdata, btn.callbackType === 'script')
+        params = this.getSystemParam(data, formdata, true)
         params = params.map(item => {
           item.script_type = 'Y'
           return item
@@ -1230,8 +1232,8 @@
       param = this.getCallBackSql(result, record)
     } else if (btn.callbackType === 'func') {
       param = {
-        func: btn.callbackFunc,
-        ...result
+        ...result,
+        func: btn.callbackFunc
       }
       if (result.$ErrCode === 'E') {
         delete param.$ErrCode
@@ -1628,9 +1630,9 @@
       delete result.status
 
       param = {
-        func: btn.callbackFunc,
         ...outParam,
-        ...result
+        ...result,
+        func: btn.callbackFunc
       }
 
       // 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉

--
Gitblit v1.8.0