From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29
---
src/menu/datasource/verifycard/utils.jsx | 82 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 2a98793..7537ed2 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 = []) {
+ static getDebugSql (setting, scripts, columns, searches = [], defSearch) {
let sql = ''
let error = ''
let _dataresource = ''
@@ -26,11 +26,32 @@
_dataresource = setting.dataresource || ''
}
+ 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 (/\$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(/@\$|\$@/ig, '')
_customScript = _customScript.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, '/*$sum@')
+ _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
@@ -48,8 +69,7 @@
_customScript = _customScript.replace(reg, '0')
})
}
-
-
+
// 姝ｅ垯鏇挎崲
let _regoptions = []
let _fields = []
@@ -66,7 +86,7 @@
reg: new RegExp('@' + item.datefield + '1@', 'ig')
})
}
- if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
+ if (['dateweek', 'datemonth', 'daterange', 'range'].includes(item.type)) {
_regoptions.push({
var: new RegExp('@' + item.field, 'ig'),
reg: new RegExp('@' + item.field + '@', 'ig')
@@ -103,7 +123,7 @@
}
})
- let _search = ''
+ let _search = defSearch
if (setting.queryType === 'statistics' && _dataresource) {
_regoptions.forEach(item => {
@@ -125,7 +145,7 @@
}, {
reg: new RegExp('@FullName@', 'ig'),
})
- if (setting.laypage !== 'false') {
+ if (setting.laypage === 'true') {
_regoptions.push({
reg: new RegExp('@pageSize@', 'ig'),
}, {
@@ -136,26 +156,24 @@
_customScript = _customScript.replace(item.reg, '0')
originscript = originscript.replace(item.reg, '0')
})
+ }
- if (setting.varMark) {
- originscript = originscript.replace(/@ErrorCode/ig, '')
- originscript = originscript.replace(/@retmsg/ig, '')
- originscript = originscript.replace(/@UserName@/ig, '').replace(/@UserName/ig, '')
- originscript = originscript.replace(/@FullName@/ig, '').replace(/@FullName/ig, '')
- originscript = originscript.replace(/@login_city@/ig, '').replace(/@login_city/ig, '')
- originscript = originscript.replace(/@id@/ig, '').replace(/@id/ig, '')
- originscript = originscript.replace(/@bid@/ig, '').replace(/@bid/ig, '')
- originscript = originscript.replace(/@loginuid@/ig, '').replace(/@loginuid/ig, '')
- originscript = originscript.replace(/@sessionuid@/ig, '').replace(/@sessionuid/ig, '')
- originscript = originscript.replace(/@userid@/ig, '').replace(/@userid/ig, '')
- originscript = originscript.replace(/@appkey@/ig, '').replace(/@appkey/ig, '')
- originscript = originscript.replace(/@time_id@/ig, '').replace(/@time_id/ig, '')
-
- originscript = originscript.replace(new RegExp('@' + setting.varMark, 'ig'), '')
+ let sumSql = ''
- if (/@/ig.test(originscript)) {
- error = '浣跨敤浜嗗彉閲忔爣璇嗗鐨勫瓧娈碉紒'
- }
+ if (arr_field && _dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
+ let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
+ _sql = `${_sql} ${_search}`
+ if (_customScript) {
+ sumSql = `/* sql sum楠岃瘉 */
+ ${_customScript}
+ ${_sql}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ `
+ } else {
+ sumSql = `/* sql sum楠岃瘉 */
+ ${_sql}`
}
}
@@ -165,7 +183,11 @@
_dataresource = '(' + _dataresource + ') tb'
}
- _dataresource = `select${setting.laypage !== 'false' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
+ if (setting.order) {
+ _dataresource = `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 = `select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from ${_dataresource} ${_search}`
+ }
}
if (_customScript) {
@@ -183,7 +205,13 @@
sql = sql.replace(/\n\s{8}/ig, '\n')
console.info(sql)
+
+ if (sumSql) {
+ sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
+
+ console.info(sumSql)
+ }
- return { error, sql }
+ return { error, sql, sumSql }
}
}
\ No newline at end of file
--
Gitblit v1.8.0