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/tabviews/basetable/index.jsx | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 17ca612..05e30ac 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -692,9 +692,6 @@
if (!component.setting.execute) {
component.setting.dataresource = ''
}
- if (/\s/.test(component.setting.dataresource)) {
- component.setting.dataresource = '(' + component.setting.dataresource + ') tb'
- }
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
component.setting.dataresource = component.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
@@ -714,8 +711,17 @@
component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
component.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
+ component.setting.custompage = false
- component.setting.custompage = /@pageSize@|@orderBy@|@mk_total/i.test(component.setting.dataresource + component.setting.customScript)
+ if (/order\s+by\s+sort_id\s*$/i.test(component.setting.dataresource)) {
+ component.setting.custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(component.setting.dataresource + component.setting.customScript)) {
+ component.setting.custompage = true
+ }
+
+ if (/\s/.test(component.setting.dataresource)) {
+ component.setting.dataresource = '(' + component.setting.dataresource + ') tb'
+ }
if (!component.setting.execute || component.setting.custompage) {
component.forbidLine = true
--
Gitblit v1.8.0