From b48528b1a1a88e289fc0b7ad52f2da213a3f9dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:34:38 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/debug/index.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index ac2ec2e..dfd426f 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -2513,14 +2513,20 @@
_search = ''
}
+ let custompage = false
+
+ if (/order\s+by\s+sort_id\s*$/i.test(_dataresource)) {
+ custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)) {
+ custompage = true
+ }
+
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
item.setting.dataresource = _dataresource
item.setting.customScript = _customScript
-
- let custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)
if (_dataresource) {
if (custompage) {
--
Gitblit v1.8.0