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/exceloutbutton/index.jsx | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 6cc49b6..ac49651 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -107,9 +107,9 @@
})
} else {
MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
- // if (window.GLOB.systemType === 'production') {
- // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
- // }
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+ }
}
}
@@ -934,6 +934,10 @@
_setting.laypage = pagination
_setting.arr_field = _setting.all_field || _setting.arr_field
+ if (setting.sub_field || setting.laypage !== pagination) {
+ _setting.uuid = btn.uuid
+ }
+
delete _setting.sub_field
}
@@ -986,7 +990,7 @@
}
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
return
}
@@ -1015,7 +1019,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
}
if (btn.switchTab && btn.switchTab.length > 0) {
@@ -1077,7 +1081,7 @@
tabId = btn.refreshTab[btn.refreshTab.length - 1]
}
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
return
}
@@ -1102,7 +1106,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
}
}
--
Gitblit v1.8.0