From 729fb5e7f41f45c6962993d86c3a4eb81c2c784b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:06 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/utils.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index cb79b71..c679a71 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -37,10 +37,6 @@
if (setting.interType === 'system' && setting.execute !== 'false') {
_dataresource = setting.dataresource || ''
}
-
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
// if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
// window.GLOB.funcs.forEach(item => {
@@ -110,8 +106,19 @@
})
}
+ 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'
+ }
+
// 姝ｅ垯鏇挎崲
- let custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)
let _regoptions = getSearchRegs(searches)
let _search = joinMainSearchkey(searches)
--
Gitblit v1.8.0