From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 132 +++++++++++++++++++++++++++++++++-----------
1 files changed, 99 insertions(+), 33 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index a85684f..f038673 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1748,11 +1748,23 @@
record.mk_api_key = res.mk_api_key || ''
if (res.status) {
- if (res.mk_ex_invoke + '' === 'false' && params.length === 0) {
- this.execSuccess(res)
- _resolve()
- } else if (res.mk_ex_invoke + '' === 'false' && params.length > 0) {
- this.customLoopRequest(params, _resolve)
+ res.mk_ex_invoke = res.mk_ex_invoke + ''
+
+ if (res.mk_ex_invoke === 'false') {
+ if (params.length === 0) {
+ this.execSuccess(res)
+ _resolve()
+ } else {
+ this.customLoopRequest(params, _resolve)
+ }
+ } else if (res.mk_ex_invoke === 'true_inside') {
+ let data = res.mk_in_api && typeof(res.mk_in_api) === 'object' ? res.mk_in_api : {}
+
+ if (!data.hasOwnProperty('mk_api_key')) {
+ data.mk_api_key = record.mk_api_key
+ }
+
+ this.customCallbackRequest(params, data, record, _resolve)
} else {
if (res.mk_ex_data) { // 鏁版嵁鍒嗘壒鎵ц
if (Array.isArray(res.mk_ex_data) && res.mk_ex_data.length > 0) {
@@ -1809,6 +1821,7 @@
url = btn.interface
}
+ url = url.replace(/@mydomain@/ig, window.GLOB.location)
let param = {}
@@ -2463,7 +2476,7 @@
* @description 澶栭儴璇锋眰寰幆鎵ц
*/
outerLoopRequest = (params, _resolve) => {
- const { setting, btn } = this.props
+ const { setting, btn, BID } = this.props
let param = params.shift()
@@ -2492,11 +2505,29 @@
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)
- _resolve()
- } else if ((res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) && params.length > 0) {
- this.outerLoopRequest(params, _resolve)
+ res.mk_ex_invoke = res.mk_ex_invoke + ''
+
+ if (res.mk_ex_invoke === 'false') {
+ if (params.length === 0) {
+ this.execSuccess(res)
+ _resolve()
+ } else {
+ this.outerLoopRequest(params, _resolve)
+ }
+ } else if (res.mk_ex_invoke === 'true_inside') {
+ let data = res.mk_in_api && typeof(res.mk_in_api) === 'object' ? res.mk_in_api : {}
+
+ if (!data.hasOwnProperty('mk_api_key')) {
+ data.mk_api_key = res.mk_api_key || ''
+ }
+
+ // 浣跨敤澶勭悊鍚庣殑鏁版嵁璋冪敤澶栭儴鎺ュ彛
+ let keys = Object.keys(data) // 鎻愪氦澶栭儴鎺ュ彛鍓嶏紝娣诲姞BID
+ if (BID && keys.filter(key => key.toLowerCase() === 'bid').length === 0) {
+ data.BID = BID
+ }
+
+ this.outerCallbackRequest(params, data, record, {}, _resolve)
} else {
delete res.mk_ex_invoke
delete res.ErrCode
@@ -2506,8 +2537,8 @@
// 浣跨敤澶勭悊鍚庣殑鏁版嵁璋冪敤澶栭儴鎺ュ彛
let keys = Object.keys(res) // 鎻愪氦澶栭儴鎺ュ彛鍓嶏紝娣诲姞BID
- if (this.props.BID && keys.filter(key => key.toLowerCase() === 'bid').length === 0) {
- res.BID = this.props.BID
+ if (BID && keys.filter(key => key.toLowerCase() === 'bid').length === 0) {
+ res.BID = BID
}
if (res.mk_api_key) {
@@ -3040,15 +3071,30 @@
if (btn.syncComponentId) {
if (btn.syncComponentId === 'multiComponent') {
- btn.syncComponentIds.forEach((id, i) => {
- setTimeout(() => {
- if (/\$focus/.test(id)) {
- MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
- } else {
- MKEmitter.emit('reloadData', id)
- }
- }, 20 * i)
- })
+ if (btn.syncDelay) {
+ this.delayTimer && clearTimeout(this.delayTimer)
+ this.delayTimer = setTimeout(() => {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ if (/\$focus/.test(id)) {
+ MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', id)
+ }
+ }, 20 * i)
+ })
+ }, btn.syncDelay)
+ } else {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ if (/\$focus/.test(id)) {
+ MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', id)
+ }
+ }, 20 * i)
+ })
+ }
} else if (/\$focus/.test(btn.syncComponentId)) {
MKEmitter.emit('reloadData', btn.syncComponentId.split('$')[0], btn.syncComponentId.split('$')[1])
} else {
@@ -3811,15 +3857,30 @@
if (btn.syncComponentId) {
if (btn.syncComponentId === 'multiComponent') {
- btn.syncComponentIds.forEach((id, i) => {
- setTimeout(() => {
- if (/\$focus/.test(id)) {
- MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
- } else {
- MKEmitter.emit('reloadData', id)
- }
- }, 20 * i)
- })
+ if (btn.syncDelay) {
+ this.delayTimer && clearTimeout(this.delayTimer)
+ this.delayTimer = setTimeout(() => {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ if (/\$focus/.test(id)) {
+ MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', id)
+ }
+ }, 20 * i)
+ })
+ }, btn.syncDelay)
+ } else {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ if (/\$focus/.test(id)) {
+ MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', id)
+ }
+ }, 20 * i)
+ })
+ }
} else if (/\$focus/.test(btn.syncComponentId)) {
MKEmitter.emit('reloadData', btn.syncComponentId.split('$')[0], btn.syncComponentId.split('$')[1])
} else {
@@ -4130,8 +4191,13 @@
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
}
}
- if (_item.type === 'text' && /@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
- _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (BID || ''))
+ if (_item.type === 'text') {
+ if (/@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
+ _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (BID || ''))
+ }
+ if (/@currentYear@/ig.test(_item.value)) { // 绯荤粺鍙橀噺鏇挎崲
+ _item.value = _item.value.replace(/@currentYear@/ig, moment().format('YYYY'))
+ }
}
if (_item.type === 'text' && item.lenControl && item.lenControl !== 'limit') {
if (item.lenControl === 'left') {
--
Gitblit v1.8.0