From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/menu/datasource/verifycard/utils.jsx | 54 +++++++++++++++++++-----------------------------------
1 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index f9fdeb7..e1efa0b 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -36,12 +36,6 @@
})
}
- // if (/\$ex@.{1,50}@ex\$/.test(_dataresource)) {
- // error = '绯荤粺鍑芥暟' + _dataresource.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
- // } else if (/\$ex@.{1,50}@ex\$/.test(_customScript)) {
- // error = '绯荤粺鍑芥暟' + _customScript.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
- // }
-
_dataresource = _dataresource.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'${timestamp}'`)
_customScript = _customScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'${timestamp}'`)
@@ -133,37 +127,27 @@
}
})
+ _regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ }, {
+ reg: new RegExp('@UserName@', 'ig'),
+ }, {
+ reg: new RegExp('@FullName@', 'ig'),
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ })
+
+ _regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, '0')
+ _customScript = _customScript.replace(item.reg, '0')
+ })
+
let _search = defSearch
- if (_dataresource) {
- _regoptions.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, '0')
- })
-
+ if (setting.queryType === 'statistics') {
_search = ''
- }
-
- let originscript = _customScript
-
- if (_customScript) {
- _regoptions.push({
- reg: new RegExp('@orderBy@', 'ig'),
- }, {
- reg: new RegExp('@UserName@', 'ig'),
- }, {
- reg: new RegExp('@FullName@', 'ig'),
- })
- if (setting.laypage === 'true') {
- _regoptions.push({
- reg: new RegExp('@pageSize@', 'ig'),
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- })
- }
- _regoptions.forEach(item => {
- _customScript = _customScript.replace(item.reg, '0')
- originscript = originscript.replace(item.reg, '0')
- })
}
let sumSql = ''
@@ -248,7 +232,7 @@
})
arr.forEach(item => {
- let reg = new RegExp(item, 'ig')
+ let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
}
--
Gitblit v1.8.0