From 072de941dc14eca12ffa90f2630bbbaeca542f98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 四月 2025 17:19:50 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/templates/sharecomponent/actioncomponent/verifyprint/utils.jsx | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/utils.jsx
index c414f14..719ba0e 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/utils.jsx
@@ -33,20 +33,35 @@
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
-
- _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
- _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
- _tailScript = _tailScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- _tailScript = _tailScript.replace(/@\$|\$@/ig, '')
- // 澶栬仈鏁版嵁搴撴浛鎹�
- if (window.GLOB.externalDatabase !== null) {
- _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
- _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
- _tailScript = _tailScript.replace(/@db@/ig, window.GLOB.externalDatabase)
- }
+ let custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)
+
+ // 姝ｅ垯鏇挎崲
+ let regoptions = [{
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: setting.order || ''
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: 10
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: 1
+ }, {
+ reg: /@datam@/ig,
+ value: `''`
+ }, {
+ reg: /@typename@/ig,
+ value: `'debug'`
+ }, {
+ reg: /@\$|\$@/ig,
+ value: ''
+ }]
+
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
+ _customScript = _customScript.replace(item.reg, item.value)
+ _tailScript = _tailScript.replace(item.reg, item.value)
+ })
let arr_field = columns.map(col => col.field)
arr_field = arr_field.join(',')
@@ -57,10 +72,10 @@
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
if (_dataresource) {
- if (setting.order) {
- _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource}) tmptable order by tmptable.rows`
- } else {
+ if (custompage || !setting.order) {
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource}`
+ } else {
+ _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource}) tmptable order by tmptable.rows`
}
}
--
Gitblit v1.8.0