From 43805c29aa81334ee6f15a2314338da05bc30361 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index ac49651..36aa1b9 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -882,10 +882,6 @@
_setting.dataresource = ''
}
- if (/\s/.test(_setting.dataresource)) {
- _setting.dataresource = '(' + _setting.dataresource + ') tb'
- }
-
let _customScript = ''
let _tailScript = ''
btn.verify.scripts && btn.verify.scripts.forEach(script => {
@@ -922,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
--
Gitblit v1.8.0