From ec06780e037b636ade7e4084c889d58fa3cc8fa7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 01 十月 2023 14:06:56 +0800
Subject: [PATCH] 2023-10-01
---
src/utils/utils.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 5f0598e..e874151 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2132,9 +2132,9 @@
if (node) {
let lines = flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id)
if (verify.flowType === 'reject') {
- line = lines.filter(cell => cell.mkdata.flowType === 'reject')[0]
+ line = lines.filter(cell => cell.mkdata.flowType === 'reject' || cell.mknode === 'startEdge')[0]
} else {
- line = lines.filter(cell => cell.mkdata.flowType !== 'reject')[0]
+ line = lines.filter(cell => cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge')[0]
}
}
@@ -2160,7 +2160,7 @@
} else {
_sql += `
/* 宸ヤ綔娴侀粯璁ql */
- update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
@@ -2194,7 +2194,7 @@
statusName = '寮傚父'
_sql += `
/* 宸ヤ綔娴佸紓甯竤ql */
- update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
@@ -2226,7 +2226,8 @@
_sql = _sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
_sql = _sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
if (target) {
- let msg = {...target.mkdata, id: target.id}
+ let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
+ let msg = {...target.mkdata, label: label, id: target.id}
_sql = _sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`)
} else {
_sql = _sql.replace(/@works_flow_param@/ig, `''`)
--
Gitblit v1.8.0