From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/utils.jsx | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 5c8bc84..c679a71 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -37,18 +37,14 @@
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 => {
- let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
- _dataresource = _dataresource.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
- _customScript = _customScript.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
- })
- }
+ // if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ // window.GLOB.funcs.forEach(item => {
+ // let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
+ // _dataresource = _dataresource.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+ // _customScript = _customScript.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+ // })
+ // }
let regs = [
// {reg: /@time_id@/ig, value: `'${getuuid()}'`}, // 璁＄畻md5鍚庢浛鎹�
@@ -62,8 +58,8 @@
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey}'`},
{reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@\$|\$@/ig, value: ''},
- {reg: /@select\$|\$select@/ig, value: ''},
- {reg: /@sum\$|\$sum@/ig, value: ''},
+ // {reg: /@select\$|\$select@/ig, value: ''},
+ // {reg: /@sum\$|\$sum@/ig, value: ''},
]
if (window.GLOB.process && type !== 'invoice') {
@@ -71,10 +67,16 @@
}
if (hasExtend) {
- regs.push({reg: /@mk_time@/ig, value: '2024-04-29 17:20:00'})
+ regs.push({reg: /@mk_time@/ig, value: `'2024-04-29 17:20:00'`})
}
if (type === 'calendar') {
- regs.push({reg: /@mk_year@/ig, value: '2024'})
+ regs.push({reg: /@mk_year@/ig, value: `'2024'`})
+ }
+ if (window.GLOB.getLocation) {
+ regs.push(
+ {reg: /@mk_longitude@/ig, value: 0},
+ {reg: /@mk_latitude@/ig, value: 0}
+ )
}
// 澶栬仈鏁版嵁搴撴浛鎹�
@@ -104,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@/i.test(_dataresource + _customScript)
let _regoptions = getSearchRegs(searches)
let _search = joinMainSearchkey(searches)
--
Gitblit v1.8.0