From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 4d99470..f98ee4f 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -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(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
@@ -39,8 +39,11 @@
_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) {
@@ -97,6 +100,26 @@
})
}
+ let sumSql = ''
+
+ 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楠岃瘉 */
+ 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 =''
+ ${_sql}`
+ }
+ }
+
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
if (arr_field && _dataresource) {
if (/\s/.test(_dataresource)) {
@@ -116,12 +139,18 @@
`
} else {
sql = `/* sql 楠岃瘉 */
+ 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 =''
${_dataresource}`
}
sql = sql.replace(/\n\s{8}/ig, '\n')
console.info(sql)
- return sql
+ if (sumSql) {
+ sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
+ console.info(sumSql)
+ }
+
+ return { sql, sumSql }
}
/**
@@ -142,7 +171,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(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
--
Gitblit v1.8.0