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 | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 6296192..e1efa0b 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,20 +7,18 @@
* @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 = ''
let _customScript = ''
let arr_field = columns.map(item => item.field).join(',')
- if (scripts.length > 0) {
- scripts.forEach(item => {
- _customScript += `
- ${item.sql}
- `
- })
- }
+ scripts.forEach(item => {
+ _customScript += `
+ ${item.sql}
+ `
+ })
if (!arr_field) {
arr_field = '*'
@@ -38,14 +36,8 @@
})
}
- // 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|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
- _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
+ _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}'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
@@ -56,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 =''
@@ -130,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 = ''
@@ -218,12 +205,38 @@
if (/@[0-9a-zA-Z_]+@/ig.test(sql)) {
let arr = sql.match(/@[0-9a-zA-Z_]+@/ig)
+ let getTrueSql = (sl) => {
+ if (!/\/\*/.test(sl)) return sl
+ let index = 0
+
+ sl = sl.replace(/\s/ig, ' ')
+ sl = sl.replace(/\*\//ig, 'm_k@')
+ sl = sl.replace(/\/\*/ig, () => {
+ index++
+ return '@m_k' + index
+ })
+
+ for (let i = index; i > 0; i--) {
+ let reg = new RegExp(`@m_k${i}.+m_k@`, 'ig')
+ sl = sl.replace(reg, '')
+ }
+
+ return sl
+ }
+
+ let _scripts = []
+ _dataresource = _dataresource.replace('/*system_query*/', '')
+ _dataresource = getTrueSql(_dataresource)
+ scripts.forEach(item => {
+ _scripts.push({...item, sql: getTrueSql(item.sql)})
+ })
+
arr.forEach(item => {
- let reg = new RegExp(item, 'ig')
+ let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
}
- scripts && scripts.forEach(script => {
+ _scripts.forEach(script => {
if (reg.test(script.sql)) {
errors.push(`鑷畾涔夎剼鏈�(${script.$index || ''})瀛樺湪鏈浛鎹㈠��${item}`)
}
--
Gitblit v1.8.0