From ea9cdac78107c68b94d24a0055bce461d0fd1ae2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 11 五月 2023 10:41:36 +0800
Subject: [PATCH] 2023-05-11
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 4d99470..5f186cf 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} regoptions 鎼滅储鏉′欢姝ｅ垯鏇挎崲
*/
- static getDebugSql (setting, scripts, arr_field, regoptions, search) {
+ static getDebugSql (setting, scripts, arr_field, regoptions, search, timestamp) {
let sql = ''
let _dataresource = setting.dataresource || ''
let _customScript = ''
@@ -18,7 +18,7 @@
})
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@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(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 =''
${_customScript}
`
}
@@ -35,12 +35,17 @@
})
}
+ _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(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
_dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
_customScript = _customScript.replace(/@select\$|\$select@/ig, '')
- _dataresource = _dataresource.replace(/@sum\$|\$sum@/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 (window.GLOB.externalDatabase !== null) {
@@ -58,9 +63,6 @@
})
_regoptions.push({
- reg: new RegExp('@login_city@', 'ig'),
- value: `''`
- }, {
reg: new RegExp('@userName@', 'ig'),
value: `''`
}, {
@@ -97,13 +99,33 @@
})
}
+ let sumSql = ''
+
+ if (arr_field && _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 (arr_field && _dataresource) {
if (/\s/.test(_dataresource)) {
_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`
+ _dataresource = `/*system_query*/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 (_customScript) {
@@ -112,16 +134,43 @@
${_dataresource}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
`
} else {
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}`
}
+
sql = sql.replace(/\n\s{8}/ig, '\n')
console.info(sql)
- return sql
+ let errors = []
+
+ if (/@[0-9a-zA-Z_]+@/ig.test(sql)) {
+ let arr = sql.match(/@[0-9a-zA-Z_]+@/ig)
+
+ arr.forEach(item => {
+ let reg = new RegExp(item, 'ig')
+ if (reg.test(_dataresource)) {
+ errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
+ }
+ scripts && scripts.forEach(script => {
+ if (reg.test(script.sql)) {
+ errors.push(`鑷畾涔夎剼鏈�(${script.$index || ''})瀛樺湪鏈浛鎹㈠��${item}`)
+ }
+ })
+ })
+ }
+
+ if (sumSql) {
+ sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
+ console.info(sumSql)
+ sumSql = sumSql.replace(/\n/g, ' ')
+ }
+ sql = sql.replace(/\n/g, ' ')
+
+ return { sql, sumSql, errors: errors.join('锛�') }
}
/**
@@ -142,7 +191,7 @@
})
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@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(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 =''
${_customScript}
`
}
@@ -155,7 +204,7 @@
}
_customScript = _customScript.replace(/@\$|\$@/ig, '')
- _customScript = _customScript.replace(/@userName@|@fullName@|@login_city@/ig, `''`)
+ _customScript = _customScript.replace(/@userName@|@fullName@/ig, `''`)
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
--
Gitblit v1.8.0