From b3e3c463d176a1ec9ab16adea08bcbe6536ec52a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 21 五月 2025 15:45:26 +0800
Subject: [PATCH] 2025-05-21
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 2a87051..053530d 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -102,7 +102,7 @@
if (setting.supModule && !BID) {
notification.warning({
top: 92,
- message: dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
} else {
@@ -381,7 +381,6 @@
if (btn.dataM === 'true') {
param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
}
-
} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
@@ -863,7 +862,10 @@
let _setting = {}
let _orderBy = orderBy || ''
+
if (btn.verify.dataType === 'custom') {
+ _setting.uuid = btn.uuid
+ _setting.interType = 'system'
_setting.arr_field = []
btn.verify.columns.forEach(col => {
@@ -878,10 +880,6 @@
if (!_setting.execute) {
_setting.dataresource = ''
- }
-
- if (/\s/.test(_setting.dataresource)) {
- _setting.dataresource = '(' + _setting.dataresource + ') tb'
}
let _customScript = ''
@@ -920,7 +918,17 @@
_setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
_setting.laypage = pagination
- _setting.custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_setting.dataresource + _setting.customScript)
+ _setting.custompage = false
+
+ if (/order\s+by\s+sort_id\s*$/i.test(_setting.dataresource)) {
+ _setting.custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(_setting.dataresource + _setting.customScript)) {
+ _setting.custompage = true
+ }
+
+ if (/\s/.test(_setting.dataresource)) {
+ _setting.dataresource = '(' + _setting.dataresource + ') tb'
+ }
_setting.queryType = btn.verify.queryType
_setting.$name = btn.logLabel
@@ -932,6 +940,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
}
@@ -941,17 +953,9 @@
primaryId = primaryId ? 'excel:' + primaryId : ''
}
- let param = UtilsDM.getDefaultQueryParam(_setting, search, _orderBy, pageIndex, pageSize, primaryId, BID)
+ let param = UtilsDM.getQueryDataParams(_setting, search, _orderBy, pageIndex, pageSize, BID, primaryId)
- param.DateCount = ''
-
- // 鏁版嵁绠＄悊鏉冮檺
- if (sessionStorage.getItem('dataM') === 'true') {
- param.dataM = 'Y'
- }
- if (BID) {
- param.BID = BID
- }
+ delete param.DateCount
return param
}
@@ -992,7 +996,7 @@
}
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
return
}
@@ -1021,7 +1025,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
}
if (btn.switchTab && btn.switchTab.length > 0) {
@@ -1083,7 +1087,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
}
@@ -1108,7 +1112,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId)
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
}
}
--
Gitblit v1.8.0