From c5a07dba94694d13f0a78e051dfa26c3522933ee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十一月 2024 18:10:02 +0800
Subject: [PATCH] 2024-11-15
---
src/utils/utils-custom.js | 125 +++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 19 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 88c4d03..e83a9ea 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1733,6 +1733,7 @@
if (config.interfaces) {
config.interfaces.forEach(item => {
+ if (item.status !== 'true') return
if (item.setting && item.setting.interType === 'outer' && item.setting.sysInterface !== 'true') {
inters = 'true'
}
@@ -2193,6 +2194,40 @@
notification.warning({
top: 92,
message: label + `${lines}锛屼笉鍙嚭鐜拌繛缁殑鑻辨枃閫楀彿,,`,
+ duration: 5
+ })
+ return false
+ } else if (/,\./ig.test(sql)) {
+ let lines = []
+ sql.split(/\n/).forEach((s, i) => {
+ if (/,\./ig.test(s)) {
+ lines.push(i + 1)
+ }
+ })
+
+ lines = lines.join('銆�')
+ lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+ notification.warning({
+ top: 92,
+ message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
+ duration: 5
+ })
+ return false
+ } else if (/\.,/ig.test(sql)) {
+ let lines = []
+ sql.split(/\n/).forEach((s, i) => {
+ if (/\.,/ig.test(s)) {
+ lines.push(i + 1)
+ }
+ })
+
+ lines = lines.join('銆�')
+ lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+ notification.warning({
+ top: 92,
+ message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
duration: 5
})
return false
@@ -4071,6 +4106,33 @@
if @works_flow_countersign@ = 'Y'
begin
/* 宸ヤ綔娴侀粯璁ql锛堜細绛撅級 */
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg =''
+ begin
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+ if @retmsg !=''
+ begin
+ select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+ goto aaa
+ end
+
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
+ begin
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
+ end
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+ goto aaa
+ end
+
declare @works_flow_statuscharone nvarchar(50),@works_flow_statuschartwo nvarchar(50),@works_flow_statuscharthree nvarchar(50),@works_flow_statuscharfour nvarchar(50),@works_flow_statuscharfive nvarchar(50),@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id nvarchar(50)
select @works_flow_statuscharone='',@works_flow_statuschartwo='',@works_flow_statuscharthree='',@works_flow_statuscharfour='',@works_flow_statuscharfive='',@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
@@ -4127,11 +4189,11 @@
begin
/* 宸ヤ綔娴侀粯璁ql锛堟垨绛撅級 */
set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg =''
begin
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg !=''
begin
@@ -4141,18 +4203,31 @@
if @dataM@ !=''
begin
- set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
- if @retmsg != ''
+ if @retmsg != ''
+ begin
+ goto goto_mk
+ end
+ end
+ else
+ begin
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
begin
- goto goto_mk
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
end
end
-
+
select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
goto aaa
- end
+ end
goto_mk:
@@ -4165,7 +4240,7 @@
if @works_begin_branch@ = 'Y'
begin
- update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'
end
else
@@ -4318,6 +4393,12 @@
}
})
+ if (new RegExp('@mk_submit_type[^0-9a-z_]', 'ig').test(_sql)) {
+ decSql.push(`@mk_submit_type nvarchar(50)`)
+ secSql.push(`@mk_submit_type=@mk_submit_type@`)
+ reps.push('mk_submit_type')
+ }
+
decSql = [...decSql, ..._declares]
// INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2)
@@ -4374,7 +4455,7 @@
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -4630,6 +4711,12 @@
}
})
+ if (new RegExp('@mk_submit_type[^0-9a-z_]', 'ig').test(_sql)) {
+ decSql.push(`@mk_submit_type nvarchar(50)`)
+ secSql.push(`@mk_submit_type=@mk_submit_type@`)
+ reps.push('mk_submit_type')
+ }
+
decSql = [...decSql, ..._declares]
_sql = `/* ${btn.logLabel}(鍥炶皟) */
@@ -4674,7 +4761,7 @@
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -4951,7 +5038,7 @@
}
reps.push('mk_obj_name')
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5256,7 +5343,7 @@
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5528,7 +5615,7 @@
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5812,7 +5899,7 @@
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5927,7 +6014,7 @@
// reps.push('mk_obj_name')
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -6051,7 +6138,7 @@
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -6158,7 +6245,7 @@
return true
})
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
return {LText: sql, md5: md5(sql), reps}
}
@@ -6254,7 +6341,7 @@
${callback}
`
- _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
--
Gitblit v1.8.0