From c9fbe103dfee213433a4403871da72fdb5771e6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 七月 2023 17:33:45 +0800
Subject: [PATCH] 2023-07-27

---
 src/utils/utils-datamanage.js |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 8f58442..d3609d7 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -189,6 +189,7 @@
     }
 
     let _search = ''
+    let cus_page = /@pageSize@/i.test(_dataresource + _customScript)
     
     if (_dataresource) {
       if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
@@ -227,7 +228,11 @@
     }
 
     if (_dataresource && setting.laypage && orderBy && !id) {
-      LText = `/*system_query*/select top ${pageSize} ${arrFields} from (select ${arrFields} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
+      if (cus_page) {
+        LText = `/*system_query*/select ${arrFields} from ${_dataresource} ${_search} `
+      } else {
+        LText = `/*system_query*/select top ${pageSize} ${arrFields} from (select ${arrFields} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
+      }
       if (setting.sub_field) {
         DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
       } else {

--
Gitblit v1.8.0