From bfd351eb32b6ff30cb4cc6269ef420932fb36acd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 一月 2025 16:30:19 +0800
Subject: [PATCH] 2025-01-09
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 13 +++++++++++++
src/tabviews/zshare/actionList/normalbutton/index.jsx | 39 +++++++++++++++++++++------------------
2 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 30cd614..6b1a7e1 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1283,6 +1283,19 @@
delete values.extraParam
}
+ if (values.refreshTab && values.refreshTab.length && ['pop', 'prompt', 'exec'].includes(values.OpenType) && window.GLOB.customMenu) {
+ let id = values.refreshTab[values.refreshTab.length - 1]
+ if (id === window.GLOB.customMenu.uuid) {
+ if (values.execSuccess !== 'never' || (values.syncComponent && values.syncComponent.length)) {
+ notification.warning({
+ top: 92,
+ message: '鎸夐挳鍒锋柊鑿滃崟涓哄綋鍓嶈彍鍗曟椂锛屾垚鍔熷悗鐨勭粍浠跺埛鏂帮紙鎴栧叧闂爣绛撅級灏嗗け鏁�!',
+ duration: 5
+ })
+ }
+ }
+ }
+
resolve(values)
} else {
reject(err)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index ed3d7a8..9470a83 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2961,6 +2961,7 @@
}
let tabId = ''
+ let menu = null
if (btn.refreshTab && btn.refreshTab.length > 0) {
tabId = btn.refreshTab[btn.refreshTab.length - 1]
}
@@ -2969,8 +2970,26 @@
this.clearBackSqlCache()
}
+ if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0 && sign !== '@no_target_menu@') {
+ let menuId = btn.openmenu.slice(-1)[0]
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId), param: { $BID: id }}
+ } else if (btn.MenuID) {
+ menu = {
+ MenuID: btn.MenuID,
+ MenuName: btn.MenuName,
+ type: btn.tabType,
+ param: { $BID: id }
+ }
+ }
+ }
+
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
MKEmitter.emit('reloadMenuView', tabId)
+
+ if (menu) {
+ MKEmitter.emit('modifyTabs', menu, true)
+ }
return
}
@@ -3026,24 +3045,8 @@
node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
- if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0 && sign !== '@no_target_menu@') {
- let menuId = btn.openmenu.slice(-1)[0]
- let menu = null
-
- if (window.GLOB.mkThdMenus.has(menuId)) {
- menu = {...window.GLOB.mkThdMenus.get(menuId), param: { $BID: id }}
- } else if (btn.MenuID) {
- menu = {
- MenuID: btn.MenuID,
- MenuName: btn.MenuName,
- type: btn.tabType,
- param: { $BID: id }
- }
- }
-
- if (menu) {
- MKEmitter.emit('modifyTabs', menu, true)
- }
+ if (menu) {
+ MKEmitter.emit('modifyTabs', menu, true)
}
if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
--
Gitblit v1.8.0