From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/menu/datasource/verifycard/utils.jsx | 143 +++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 78 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 93f129b..71bb2b5 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,17 +7,24 @@
* @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(',')
-
- scripts.forEach(item => {
- _customScript += `
- ${item.sql}
- `
+ let _customScript = ''
+ let _tailScript = ''
+ scripts && scripts.forEach(script => {
+ if (script.status === 'false') return
+ if (script.position !== 'back') {
+ _customScript += `
+ ${script.sql}
+ `
+ } else {
+ _tailScript += `
+ ${script.sql}
+ `
+ }
})
if (!arr_field) {
@@ -26,6 +33,10 @@
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) {
@@ -36,24 +47,24 @@
})
}
- // 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}'`)
+ _tailScript = _tailScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'${timestamp}'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
+ _tailScript = _tailScript.replace(/@\$|\$@/ig, '')
+
_dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
_customScript = _customScript.replace(/@select\$|\$select@/ig, '')
- // _dataresource = _dataresource.replace(/@sum\$|\$sum@/ig, '')
_customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
+ _dataresource = _dataresource.replace(/\$sum@/ig, '/*')
+ _dataresource = _dataresource.replace(/@sum\$/ig, '*/')
- _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 =''
@@ -65,6 +76,7 @@
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)
}
if (window.GLOB.urlFields) {
@@ -72,12 +84,14 @@
let reg = new RegExp('@' + field + '@', 'ig')
_dataresource = _dataresource.replace(reg, `'0'`)
_customScript = _customScript.replace(reg, `'0'`)
+ _tailScript = _tailScript.replace(reg, `'0'`)
})
}
// 姝ｅ垯鏇挎崲
let _regoptions = []
let _fields = []
+ let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
searches.forEach(item => {
if (!item.field) return
@@ -128,69 +142,38 @@
}
})
+ _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')
+ _tailScript = _tailScript.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 = ''
-
- if (_dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
- let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
- _sql = `/*system_query*/${_sql} ${_search}`
- if (_customScript) {
- sumSql = `/* sql sum楠岃瘉 */
- ${_customScript}
- ${_sql}
- aaa:
- if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
- `
- } else {
- sumSql = `/* sql sum楠岃瘉 */
- 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 =''
- ${_sql}`
- }
}
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
if (_dataresource) {
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- if (setting.order) {
+ if (custompage) {
+ _dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
+ } else if (setting.order) {
_dataresource = `/*system_query*/select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage === 'true' ? 'where rows > 0' : ''} order by tmptable.rows`
} else {
- _dataresource = `/*system_query*/select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from ${_dataresource} ${_search}`
+ _dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
}
}
@@ -198,9 +181,19 @@
sql = `/* sql 楠岃瘉 */
${_customScript}
${_dataresource}
+ ${_tailScript}
aaa:
if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
+ `
+ } else if (_tailScript) {
+ sql = `/* sql 楠岃瘉 */
+ 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 =''
+ ${_dataresource}
+ ${_tailScript}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
`
} else {
sql = `/* sql 楠岃瘉 */
@@ -243,7 +236,7 @@
})
arr.forEach(item => {
- let reg = new RegExp(item, 'ig')
+ let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
}
@@ -255,14 +248,8 @@
})
}
- if (sumSql) {
- sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
-
- console.info(sumSql)
- sumSql = sumSql.replace(/\n/g, ' ')
- }
sql = sql.replace(/\n/g, ' ')
- return { error, sql, sumSql, errors: errors.join('锛�') }
+ return { error, sql, errors: errors.join('锛�') }
}
}
\ No newline at end of file
--
Gitblit v1.8.0