From 6b202fcb9446a289d64dd1a36e881b688c9bb72b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 七月 2023 19:25:19 +0800
Subject: [PATCH] 2023-07-28
---
src/utils/utils-datamanage.js | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index d3609d7..f3ed7f4 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -189,7 +189,6 @@
}
let _search = ''
- let cus_page = /@pageSize@/i.test(_dataresource + _customScript)
if (_dataresource) {
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
@@ -228,15 +227,15 @@
}
if (_dataresource && setting.laypage && orderBy && !id) {
- if (cus_page) {
+ if (setting.custompage) {
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 {
- DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
+ if (setting.sub_field) {
+ DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
+ } else {
+ DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
+ }
}
} else if (_dataresource && orderBy) {
LText = `/*system_query*/select ${arrFields} from (select ${arrFields} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
--
Gitblit v1.8.0