From 7e46c386be5c2cfc20af3936d26839ad3fce44b0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 八月 2023 17:40:32 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/utils.jsx | 61 ++++++++++++------------------
1 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 93f129b..e1efa0b 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} columns 鏄剧ず瀛楁
*/
- static getDebugSql (setting, scripts, columns, searches = [], defSearch, timestamp) {
+ static getDebugSql (setting, scripts, columns, searches = [], defSearch, type, timestamp) {
let sql = ''
let error = ''
let _dataresource = ''
@@ -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}'`)
@@ -54,6 +48,11 @@
_dataresource = _dataresource.replace(/\$sum@/ig, '/*$sum@')
_dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
+
+ if (type === 'calendar') {
+ _dataresource = _dataresource.replace(/@mk_year@/ig, '')
+ _customScript = _customScript.replace(/@mk_year@/ig, '')
+ }
if (_customScript) {
_customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
@@ -128,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 = ''
@@ -243,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