From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index e2bcad1..6c4548b 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1124,6 +1124,12 @@
 
       if (btn.intertype === 'system') {
         params = this.getSystemParam(data, formdata)
+        if (btn.returnValue === 'true') {
+          params = params.map(item => {
+            item.script_type = 'Y'
+            return item
+          })
+        }
       } else {
         params = this.getInnerParam(data, formdata)
       }
@@ -1295,7 +1301,7 @@
       return
     }
 
-    Api.genericInterface(param).then(res => {
+    Api.genericInterface(param, btn.$innerScript, 'inner').then(res => {
       record.mk_api_key = res.mk_api_key || ''
 
       if (res.status) {
@@ -1535,7 +1541,7 @@
       param.menuname = param.menuname + '(鍥炶皟)'
     }
 
-    Api.genericInterface(param).then(res => {
+    Api.genericInterface(param, btn.$callbackScript, 'callback').then(res => {
       if (res.status) {
         this.triggerNote(res, param.ID) // 娑堟伅
 
@@ -1892,7 +1898,7 @@
       return
     }
 
-    Api.genericInterface(param).then(res => {
+    Api.genericInterface(param, btn.$innerScript, 'inner').then(res => {
       if (res.status) {
         if ((res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) && params.length === 0) {
           this.execSuccess(res)
@@ -1990,7 +1996,7 @@
       }
     }
 
-    Api.genericInterface(result).then(res => {
+    Api.genericInterface(result, btn.$outerScript, 'outer').then(res => {
       if (!res) return // LoginError鏃朵腑鏂姹�
       if (ver_token && res.ErrCode === 'token_error') {
         res.ErrCode = 'E'
@@ -2053,11 +2059,14 @@
         func: btn.callbackFunc
       }
 
-      // special 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
-      if (window.GLOB.mkHS && param.func === 's_sDataDictb_TBBack' && param.LTextOut) {
-        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-        param.secretkey = Utils.encrypt(param.LTextOut, param.timestamp)
-        param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+      if (window.GLOB.mkHS) {
+        if (btn.callbackFunc === 's_sVersion_Local_add' && window.GLOB.forcedUpdate) { // special 浼犺緭鍙锋坊鍔犲洖璋冨鐞�
+          param.local_userid = sessionStorage.getItem('LocalUserID') || ''
+        } else if (btn.callbackFunc === 's_sDataDictb_TBBack' && param.LTextOut) { // special 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
+          param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+          param.secretkey = Utils.encrypt(param.LTextOut, param.timestamp)
+          param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+        }
       }
     } else {
       if (result.status) {
@@ -2079,7 +2088,7 @@
       param.menuname = param.menuname + '(鍥炶皟)'
     }
 
-    Api.genericInterface(param).then(res => {
+    Api.genericInterface(param, btn.$callbackScript, 'callback').then(res => {
       if (res.status) {
         this.triggerNote(res, param.ID) // 娑堟伅
 
@@ -2223,7 +2232,19 @@
     const { autoMatic } = this.state
 
     if (btn.resetForms) {
-      MKEmitter.emit('resetForms', btn.uuid)
+      let data = {}
+
+      Object.keys(res).forEach(key => {
+        data[key.toLowerCase()] = res[key]
+      })
+
+      delete data.errcode
+      delete data.errmesg
+      delete data.message
+      delete data.status
+
+      MKEmitter.emit('resetForms', btn.uuid, data)
+      MKEmitter.emit('refreshByButtonResult', btn.$menuId, 'resetData', btn, null, null, data)
     }
 
     if (this.preCallback) {
@@ -2323,6 +2344,10 @@
       tabId = btn.refreshTab[btn.refreshTab.length - 1]
     }
 
+    if (btn.formCache === 'clear') { // 娓呴櫎琛ㄥ崟缂撳瓨
+      window.GLOB.CacheMap = new Map()
+    }
+
     if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
       MKEmitter.emit('reloadMenuView', tabId, 'table')
       return
@@ -2354,7 +2379,14 @@
       } else if (/\$focus/.test(btn.syncComponentId)) {
         MKEmitter.emit('reloadData', btn.syncComponentId.split('$')[0], btn.syncComponentId.split('$')[1])
       } else {
-        MKEmitter.emit('reloadData', btn.syncComponentId)
+        if (btn.syncDelay) {
+          this.delayTimer && clearTimeout(this.delayTimer)
+          this.delayTimer = setTimeout(() => {
+            MKEmitter.emit('reloadData', btn.syncComponentId)
+          }, btn.syncDelay)
+        } else {
+          MKEmitter.emit('reloadData', btn.syncComponentId)
+        }
       }
     }
 

--
Gitblit v1.8.0