From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 2a624a8..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'
@@ -2082,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) // 娑堟伅
@@ -2226,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) {
@@ -2326,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
@@ -2357,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