From 0c1a33a33b45fc3265cb7fef20beb48407cd6c98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 八月 2023 14:54:06 +0800
Subject: [PATCH] 2023-08-24
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 30bcbf7..3dfd201 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -818,6 +818,10 @@
_setting.dataresource = ''
}
+ if (/\s/.test(_setting.dataresource)) {
+ _setting.dataresource = '(' + _setting.dataresource + ') tb'
+ }
+
let _customScript = ''
let _tailScript = ''
btn.verify.scripts && btn.verify.scripts.forEach(script => {
@@ -847,10 +851,7 @@
_setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
_setting.laypage = pagination
-
- if (_setting.laypage) {
- _setting.custompage = /@pageSize@/i.test(_setting.dataresource + _setting.customScript)
- }
+ _setting.custompage = /@pageSize@|@orderBy@/i.test(_setting.dataresource + _setting.customScript)
_setting.queryType = btn.verify.queryType
_setting.$name = btn.logLabel
--
Gitblit v1.8.0