-
+
@@ -23,6 +23,7 @@
{{ scaleValue }}%
+ 重置
@@ -93,6 +94,8 @@ const startX = ref(0)
const startY = ref(0)
const currentX = ref(0)
const currentY = ref(0)
+const initialX = ref(0)
+const initialY = ref(0)
const setGrabCursor = () => {
document.body.style.cursor = 'grab';
@@ -238,6 +241,18 @@ const zoomOut = () => {
const processReZoom = () => {
scaleValue.value = 100
}
+
+// 在组件初始化时记录初始位置
+onMounted(() => {
+ initialX.value = currentX.value
+ initialY.value = currentY.value
+})
+
+// 重置位置的函数
+const resetPosition = () => {
+ currentX.value = initialX.value
+ currentY.value = initialY.value
+}
--
Gitee
From 58825842abb4ee3afda11eeb80ba8d2828191567 Mon Sep 17 00:00:00 2001
From: Lemon <1599456917@qq.com>
Date: Tue, 18 Feb 2025 12:03:12 +0800
Subject: [PATCH 27/88] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E5=9B=BE=20=E5=B0=8F=E6=89=8B=E5=8A=9F=E8=83=BD=202.=20?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=20?=
=?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=B5=81=E7=A8=8B=E4=BD=8D=E7=BD=AE=E5=90=8E?=
=?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=8E=9F=E4=BD=8D=E7=BD=AE=203.=20=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E6=8C=AA=E5=8A=A8=E7=9A=84=E6=97=B6=E5=80=99=E7=A6=81?=
=?UTF-8?q?=E7=94=A8=E6=96=87=E6=9C=AC=E9=80=89=E6=8B=A9,=E7=A1=AE?=
=?UTF-8?q?=E4=BF=9D=E6=8B=96=E5=8A=A8=E6=97=B6=E4=B8=8D=E4=BC=9A=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SimpleProcessDesignerV2/src/SimpleProcessModel.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue
index 5a472980c..daf74867d 100644
--- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue
+++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue
@@ -114,7 +114,7 @@ const startDrag = (e: MouseEvent) => {
const onDrag = (e: MouseEvent) => {
if (!isDragging.value) return;
- e.preventDefault();
+ e.preventDefault(); // 禁用文本选择
// 使用 requestAnimationFrame 优化性能
requestAnimationFrame(() => {
@@ -261,6 +261,7 @@ const resetPosition = () => {
height: 100%;
position: relative;
overflow: hidden;
+ user-select: none; // 禁用文本选择
}
.simple-process-model {
--
Gitee
From b03711e0df7725b8847888b1a0adac8896925449 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Tue, 18 Feb 2025 14:15:53 +0800
Subject: [PATCH 28/88] =?UTF-8?q?fix=EF=BC=9A=E7=A7=BB=E9=99=A4=E5=88=9B?=
=?UTF-8?q?=E5=BB=BA=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
=?UTF-8?q?nodeIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../create/ProcessDefinitionDetail.vue | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 756b323f5..bbe67a8a5 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -155,6 +155,19 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
}
}
+// 监听 formVariables 的变化
+watch(
+ detailForm.value,
+ (newValue, oldValue) => {
+ console.log('formVariables 发生了变化')
+ console.log('新值:', newValue)
+ console.log('旧值:', oldValue)
+ },
+ {
+ deep: true // 深度监听，当对象内部属性变化时也会触发回调
+ }
+)
+
/** 获取审批详情 */
const getApprovalDetail = async (row: any) => {
try {
@@ -249,8 +262,7 @@ const submitForm = async () => {
await ProcessInstanceApi.createProcessInstance({
processDefinitionId: props.selectProcessDefinition.id,
variables: detailForm.value.value,
- startUserSelectAssignees: startUserSelectAssignees.value,
- nodeIds: activityNodes.value?.map((item: any) => item.id)
+ startUserSelectAssignees: startUserSelectAssignees.value
})
// 提示
message.success('发起流程成功')
--
Gitee
From 91e2e32aceba2e6b3b63cbb7af65db7f3a565088 Mon Sep 17 00:00:00 2001
From: Lemon <1599456917@qq.com>
Date: Tue, 18 Feb 2025 14:43:27 +0800
Subject: [PATCH 29/88] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=98=E5=88=B6?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=20=E5=AE=A1=E6=89=B9=E4=BA=BA,=20?=
=?UTF-8?q?=E5=8A=9E=E7=90=86=E4=BA=BA=EF=BC=8C=E6=8A=84=E9=80=81=20?=
=?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E7=9A=84=E4=B8=80=E9=94=AE=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/nodes-config/CopyTaskNodeConfig.vue | 24 +++++++++++-
.../src/nodes-config/StartUserNodeConfig.vue | 36 ++++++++++++++++--
.../src/nodes-config/UserTaskNodeConfig.vue | 37 +++++++++++++++++--
3 files changed, 89 insertions(+), 8 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
index f83f18505..9b74e7e7e 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
@@ -195,9 +195,13 @@
字段名称
- 只读
+ 只读
+
+
可编辑
- 隐藏
+ 隐藏
+
+
{
// 表单字段权限
getNodeConfigFormFields(node.fieldsPermission)
}
+const readSwitch = ref(false);
+const noneSwitch = ref(false);
+const updatePermission = (type: string) => {
+ if (type === 'READ') {
+ readSwitch.value = true;
+ noneSwitch.value = false;
+ } else if (type === 'NONE') {
+ readSwitch.value = false;
+
+ noneSwitch.value = true;
+ }
+
+ fieldsPermissionConfig.value.forEach(field => {
+ field.permission = type === 'READ' ? FieldPermissionType.READ : FieldPermissionType.NONE;
+ });
+};
defineExpose({ openDrawer, showCopyTaskNodeConfig }) // 暴露方法给父组件
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue
index 26c8e1315..11c43a47b 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue
@@ -46,9 +46,15 @@
字段名称
- 只读
- 可编辑
- 隐藏
+ 只读
+
+
+ 可编辑
+
+
+ 隐藏
+
+
{
// 表单字段权限
getNodeConfigFormFields(node.fieldsPermission)
}
+const readSwitch = ref(false)
+const writeSwitch = ref(false)
+const noneSwitch = ref(false)
+const updatePermission = (type) => {
+ if (type === 'READ') {
+ readSwitch.value = true;
+ writeSwitch.value = false;
+ noneSwitch.value = false;
+ } else if (type === 'WRITE') {
+ readSwitch.value = false;
+ writeSwitch.value = true;
+ noneSwitch.value = false;
+ } else if (type === 'NONE') {
+ readSwitch.value = false;
+ writeSwitch.value = false;
+ noneSwitch.value = true;
+ }
+ fieldsPermissionConfig.value.forEach(item => {
+ item.permission = type === 'READ' ? FieldPermissionType.READ :
+ type === 'WRITE' ? FieldPermissionType.WRITE :
+ FieldPermissionType.NONE;
+ });
+}
defineExpose({ openDrawer, showStartUserNodeConfig }) // 暴露方法给父组件
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
index 32ad6a06b..dfe5a4e92 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
@@ -454,9 +454,15 @@
字段名称
- 只读
- 可编辑
- 隐藏
+ 只读
+
+
+ 可编辑
+
+
+ 隐藏
+
+
{
+ if (type === 'READ') {
+ readSwitch.value = true;
+ writeSwitch.value = false;
+ noneSwitch.value = false;
+ } else if (type === 'WRITE') {
+ readSwitch.value = false;
+ writeSwitch.value = true;
+ noneSwitch.value = false;
+ } else if (type === 'NONE') {
+ readSwitch.value = false;
+ writeSwitch.value = false;
+ noneSwitch.value = true;
+ }
+
+ fieldsPermissionConfig.value.forEach(field => {
+ field.permission = type === 'READ' ? FieldPermissionType.READ :
+ type === 'WRITE' ? FieldPermissionType.WRITE :
+ FieldPermissionType.NONE;
+ });
+};
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
index dfe5a4e92..433864b02 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
@@ -454,14 +454,14 @@
字段名称
- 只读
-
-
- 可编辑
-
+
+ 只读
- 隐藏
-
+
+ 可编辑
+
+
+ 隐藏
@@ -959,31 +959,18 @@ function useTimeoutHandler() {
cTimeoutMaxRemindCount
}
}
-const readSwitch = ref(false);
-const writeSwitch = ref(false);
-const noneSwitch = ref(false);
+/** 批量更新权限 */
const updatePermission = (type: string) => {
- if (type === 'READ') {
- readSwitch.value = true;
- writeSwitch.value = false;
- noneSwitch.value = false;
- } else if (type === 'WRITE') {
- readSwitch.value = false;
- writeSwitch.value = true;
- noneSwitch.value = false;
- } else if (type === 'NONE') {
- readSwitch.value = false;
- writeSwitch.value = false;
- noneSwitch.value = true;
- }
-
- fieldsPermissionConfig.value.forEach(field => {
- field.permission = type === 'READ' ? FieldPermissionType.READ :
- type === 'WRITE' ? FieldPermissionType.WRITE :
- FieldPermissionType.NONE;
- });
-};
+ fieldsPermissionConfig.value.forEach((field) => {
+ field.permission =
+ type === 'READ'
+ ? FieldPermissionType.READ
+ : type === 'WRITE'
+ ? FieldPermissionType.WRITE
+ : FieldPermissionType.NONE
+ })
+}
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ChildProcessNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ChildProcessNode.vue
new file mode 100644
index 000000000..987f09498
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/ChildProcessNode.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.CHILD_PROCESS_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/theme/iconfont.ttf b/src/components/SimpleProcessDesignerV2/theme/iconfont.ttf
index 58f31c36179719bbeed7b42238b838ff9c3d4d49..06f4e31c4b4ce9868cd39b25f6beb1fd5884ff9c 100644
GIT binary patch
delta 961
zcmZvZTSydP6vxk*SzU7--ECcG+}*aFS#@(Am)wh#w@N|usi+4dic&LI@CF)a1pAPI
zRFt_7fsja9(OV>ifrUy$(Nm=bL1qNsM)s1>Ll
C{iwiQdM{Dz?QQMpuwJjZ1CTdM^E&(c286-SKd09K
zHhby7t;=)1T>>Dv#DhoQ2ae{|d;^P#5&$3H&C^Z)+Em;G{CNtqfYYKdy71
z_}%<8|I$=qn#d@~xS%&oJ>!4zJD?u+!eP=*$wjlQltgVIu^=paxNxWrBSG~2$=6~y
zR2eDp$%;8MUo5CbTfPV5bdd6OTqMZxArI!~q7uYN9oh|Jr1&GHjpe*{Rq|)%ShMl8
zxol6d+8hWptHpcD%-R*ne?#)iqBi1ki1{|>SznccXYBie-fC5n)atF0>U63Vs>`Jo
z7V3M29%E){V`+Swh#uagR4IX`gG~Xle(9_?DCb(EdBO&xMrxH*UbU;bT*O+Z8qy1C
z+jv5z%;hR0Uza>}j{nN{(GLoxxhDofgj25iGy4cdE@xt8(eC9S0ai!}44@#QyoTbsZln2DL9IVdD1tp#orFc&PR
Xy1Khgw#PbpJ1esP`H6eh0|>tXY+u>p
delta 564
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
delta 2324
zcmV+v3G4R66qphicTYw#00961000RX01E&B000pP000Qfkr*C-HVTt0kP87e0we=0
z3m5
zW_JC=ktSx1=%rsIYJ>!#dm?%BQq)VhDcZC>j_6@Y14Q(Q$uy*5K!liKF(+wEiQct-
z*E$euJz^Diq^2Q%?;784Ew4nvN7XILvn7u{H~SZdUM5SfLYw~ITC2LRA5H8`8lh1t
zsr=bJWOmQyd^yZKK@~8h3!;VY8|Zul&%v_jry=>E
zrQbl*>CB=rIIbcks4BDzWx;e>M65hXM-QX?h(a?Ti$yngL(HhT5Y5}0Z>5Pk2#$7u
zd(8+LL$hX;hMgo5zbYE!l-zYGX3~Ek-CO|&~lFQ3`V1#-yo4%Jv5>ncjen5poir
zs2U9=CwdGUH`kd@>E%u?8BIX$`J4-Q6c7Ub0>>8mnucQSZf`j4d!KtVB{oJ(KoCAj
zj)PKv^$@2>J1{uPF4Xjw?f(lAV=_#mA$xmqt(H)$TLkD{oY|UqiY)%h3LzvLBCKC0
z(s)d!e|{5?3ZqeRjHe_F8qx}YYdT#Pv8KTEdeUgb4F=VXCmIaavWa$H@TYq(NGLq9!}tn<
z?jeZN?Mpvscm`Pf)fJZQ)Ga+PMZON2Z)vx=1+;D=+$fwhLc0ux`6s`{A^e2e(A)8!jjHSv)AZ7era}(_W|EY_~YYp-Uhr`_t@=Ak|62JKmf30NZtk}2eagtjoyB$Kev{$c5vU`RX&Zv
zM&E4-70*6TtzoTkm(X|%1#B?eLHBU-pg+te=Fpw
zC6-tx-AY!pIo>D9FS8&$BqcaFB_!=~NP5AAzODk=<#0MpmgFAq+SuqC@18W_o+wbk
zc()|Ci9|O5*yo_i1GBl3_1S_xx4lix``r2j+3O|ov0YuUac>sp&Yz!uTNkjgu9}a-
zJI~}Zwgvjf#rX#u3^1I`z-(HK7Vaw2Pi?D2XI0_1{5LQ>8bDyk9-Ojm9LO=J@
zJh0L1XwgyK>bEV=+U4(m-_`1y59Wca<~-F!j)fXH-45L^Suh1c_qaxS;PxmJ+T$K2
zq7nzxA<}`DoIBs4P*jN8()i797~Jb0v3IN
zRg6fca#UuZgA6{y?gB5v<`eS6GQ_gLFF3emnmp13Au?d+F
zIQ9aoVMe({F|!0$F=Oj|ATjfl%hf=auXj6sbXSCg`Q|6Y=JQfTlv;5_9S||m9QGsY
z=&xM@uezLKisxZ*p4*vG%sE>QwAiO2W1W4t7d<33W$uU6D2GUwC@+uhj84Dh3+M2h
zHTMFJTu?&bE%VNQ8IkL9SJ9a}%p3h7(U#J$q?Cv-hSWcH<4wK=`}RO^jFt3H85BOB
zE(!dnxMOF@1J?#Z#8%$w^B9tVI72=cgb0rJpomlP-eO
zXLAiK5WdR8u)DAaJ`a<^?fH9HCH$B#!QsMx^JN$=gykoH@Cp#7=694vxpg{s4LgW@
z=F;CRk-ys!-%tJiMkKBDP{HXeT6vRUGcu_zhuLNEES#cE5@u)Y;GRU{o^T&^L+Xs5
z_4f4oIkr~P*3UK4q_Gy~DQX=qpteaXgMGLLbyC{fPQ3D9P91x$e64EejT$)UJ
zjx(rRxPUT$N-K*@xCV9Mzx3X3Jgx7+bC?$aD;hfOG??Jq7_=DeC%W0PjAi^n(m)zj
zdD+kVfQKBhKw7$5wWU^qqjzm*ur^SXFv4iwtHxtdv{MV@Cb+{30ZcRH207V74vfHS
zyVma8`vjet#f0hp%Znsv8a=7xN{0If=UGkONabX6(Wxo%ElRLZu0!4p09!pfAaOc#
z1jcpc`W>0kQ4w|3a=HBSdiP~>zPo0_4GobZM~N!xXrhfS`uHQ6$IV3 {
}
/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
-watch(
- detailForm.value,
- (newValue) => {
- if (newValue && Object.keys(newValue.value).length > 0) {
- // 记录之前的节点审批人
- tempStartUserSelectAssignees.value = startUserSelectAssignees.value
- startUserSelectAssignees.value = {}
- // 加载最新的审批详情
- getApprovalDetail({
- id: props.selectProcessDefinition.id,
- processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
- })
- }
- },
- {
- immediate: true
- }
-)
+// watch(
+// detailForm.value,
+// (newValue) => {
+// if (newValue && Object.keys(newValue.value).length > 0) {
+// // 记录之前的节点审批人
+// tempStartUserSelectAssignees.value = startUserSelectAssignees.value
+// startUserSelectAssignees.value = {}
+// // 加载最新的审批详情
+// getApprovalDetail({
+// id: props.selectProcessDefinition.id,
+// processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+// })
+// }
+// },
+// {
+// immediate: true
+// }
+// )
/** 获取审批详情 */
const getApprovalDetail = async (row: any) => {
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
index 8d1d3fc6e..540bb62cc 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
@@ -85,7 +85,9 @@ const setSimpleModelNodeTaskStatus = (
if (
simpleModel.type === NodeType.START_USER_NODE ||
simpleModel.type === NodeType.USER_TASK_NODE ||
- simpleModel.type === NodeType.TRANSACTOR_NODE
+ simpleModel.type === NodeType.TRANSACTOR_NODE ||
+ simpleModel.type === NodeType.CHILD_PROCESS_NODE ||
+ simpleModel.type === NodeType.ASYNC_CHILD_PROCESS_NODE
) {
simpleModel.activityStatus = TaskStatusEnum.NOT_START
if (rejectedTaskActivityIds.includes(simpleModel.id)) {
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
index b78912496..f93a2d9c6 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
@@ -181,6 +181,8 @@ import conditionSvg from '@/assets/svgs/bpm/condition.svg'
import parallelSvg from '@/assets/svgs/bpm/parallel.svg'
import finishSvg from '@/assets/svgs/bpm/finish.svg'
import transactorSvg from '@/assets/svgs/bpm/transactor.svg'
+import childProcessSvg from '@/assets/svgs/bpm/child-process.svg'
+import asyncChildProcessSvg from '@/assets/svgs/bpm/async-child-process.svg'
defineOptions({ name: 'BpmProcessInstanceTimeline' })
withDefaults(
@@ -249,7 +251,11 @@ const nodeTypeSvgMap = {
// 条件分支节点
[NodeType.CONDITION_NODE]: { color: '#14bb83', svg: conditionSvg },
// 并行分支节点
- [NodeType.PARALLEL_BRANCH_NODE]: { color: '#14bb83', svg: parallelSvg }
+ [NodeType.PARALLEL_BRANCH_NODE]: { color: '#14bb83', svg: parallelSvg },
+ // 子流程节点
+ [NodeType.CHILD_PROCESS_NODE]: { color: '#14bb83', svg: childProcessSvg },
+ // 异步子流程节点
+ [NodeType.ASYNC_CHILD_PROCESS_NODE]: { color: '#14bb83', svg: asyncChildProcessSvg }
}
// 只有只有状态是 -1、0、1 才展示头像右小角状态小icon
@@ -269,6 +275,8 @@ const getApprovalNodeIcon = (taskStatus: number, nodeType: NodeType) => {
nodeType === NodeType.START_USER_NODE ||
nodeType === NodeType.USER_TASK_NODE ||
nodeType === NodeType.TRANSACTOR_NODE ||
+ nodeType === NodeType.CHILD_PROCESS_NODE ||
+ nodeType === NodeType.ASYNC_CHILD_PROCESS_NODE ||
nodeType === NodeType.END_EVENT_NODE
) {
return statusIconMap[taskStatus]?.icon
--
Gitee
From bfe43369ef09c62613b893e5a8deded0010cad45 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Fri, 21 Feb 2025 22:46:27 +0800
Subject: [PATCH 39/88] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E3=80=91=20=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E8=A7=A6=E5=8F=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SimpleProcessDesignerV2/src/consts.ts | 17 +-
.../src/nodes-config/TriggerNodeConfig.vue | 156 ++++++++++++++++--
.../components/ConditionDialog.vue | 3 +-
3 files changed, 158 insertions(+), 18 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index 7270b104e..303db1ec4 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -748,9 +748,13 @@ export enum TriggerTypeEnum {
*/
HTTP_REQUEST = 1,
/**
- * 流程表单更新触发器
+ * 表单数据更新触发器
*/
- FORM_UPDATE = 2
+ FORM_UPDATE = 2,
+ /**
+ * 表单数据删除触发器
+ */
+ FORM_DELETE = 3
}
/**
@@ -777,11 +781,14 @@ export type FormTriggerSetting = {
conditionExpression?: string
// 条件组
conditionGroups?: ConditionGroup
- // 更新表单字段
- updateFormFields?: Record
+ // 更新表单字段配置
+ updateFormFields?: Record,
+ // 删除表单字段配置
+ deleteFields?: string[]
}
export const TRIGGER_TYPES: DictDataVO[] = [
{ label: 'HTTP 请求', value: TriggerTypeEnum.HTTP_REQUEST },
- { label: '修改表单数据', value: TriggerTypeEnum.FORM_UPDATE }
+ { label: '修改表单数据', value: TriggerTypeEnum.FORM_UPDATE },
+ { label: '删除表单数据', value: TriggerTypeEnum.FORM_DELETE }
]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
index b2e2e330f..01c611a4c 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
@@ -26,7 +26,7 @@
-
+
+
@@ -150,8 +151,8 @@
type="success"
effect="light"
closable
- @close="deleteFormUpdateCondition(formSetting)"
- @click="openFormUpdateCondition(index, formSetting)"
+ @close="deleteFormSettingCondition(formSetting)"
+ @click="openFormSettingCondition(index, formSetting)"
>
{{ showConditionText(formSetting) }}
@@ -160,7 +161,7 @@
v-else
type="primary"
text
- @click="addFormUpdateCondition(index, formSetting)"
+ @click="addFormSettingCondition(index, formSetting)"
>
添加条件
@@ -231,6 +232,76 @@
添加设置
+
+
+
+
+
+
+
+
删除表单设置 {{ index + 1 }}
+
+
+
+
+
+ {{ showConditionText(formSetting) }}
+
+
+
+ 添加条件
+
+
+ 删除表单字段设置
+
+
+
+
+
+
+
+
+
+
+
+ 添加设置
+
+
@@ -292,7 +363,8 @@ const configForm = ref({
formSettings: [
{
conditionGroups: DEFAULT_CONDITION_GROUP_VALUE,
- updateFormFields: {}
+ updateFormFields: {},
+ deleteFields: []
}
]
})
@@ -308,6 +380,46 @@ const optionalUpdateFormFields = computed(() => {
}))
})
+let originalSetting: TriggerSetting | undefined
+
+/** 触发器类型改变了 */
+const changeTriggerType = () => {
+ if (configForm.value.type === TriggerTypeEnum.HTTP_REQUEST) {
+ configForm.value.httpRequestSetting = originalSetting?.httpRequestSetting || {
+ url: '',
+ header: [],
+ body: [],
+ response: []
+ }
+ configForm.value.formSettings = undefined
+ } else if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
+ configForm.value.formSettings =
+ originalSetting?.type === TriggerTypeEnum.FORM_UPDATE && originalSetting.formSettings
+ ? originalSetting.formSettings
+ : [
+ {
+ conditionGroups: DEFAULT_CONDITION_GROUP_VALUE,
+ updateFormFields: {},
+ deleteFields: []
+ }
+ ]
+ configForm.value.httpRequestSetting = undefined
+ } else if (configForm.value.type === TriggerTypeEnum.FORM_DELETE) {
+ console.log('originalSetting?.type', originalSetting?.type)
+ configForm.value.formSettings =
+ originalSetting?.type === TriggerTypeEnum.FORM_DELETE && originalSetting.formSettings
+ ? originalSetting.formSettings
+ : [
+ {
+ conditionGroups: DEFAULT_CONDITION_GROUP_VALUE,
+ updateFormFields: undefined,
+ deleteFields: []
+ }
+ ]
+ configForm.value.httpRequestSetting = undefined
+ }
+}
+
/** 添加 HTTP 请求返回值设置项 */
const addHttpResponseSetting = (responseSetting: Record[]) => {
responseSetting.push({
@@ -325,7 +437,8 @@ const deleteHttpResponseSetting = (responseSetting: Record[], in
const addFormSetting = () => {
configForm.value.formSettings!.push({
conditionGroups: DEFAULT_CONDITION_GROUP_VALUE,
- updateFormFields: {}
+ updateFormFields: {},
+ deleteFields: []
})
}
@@ -335,16 +448,16 @@ const deleteFormSetting = (index: number) => {
}
/** 添加条件配置 */
-const addFormUpdateCondition = (index: number, formSetting: FormTriggerSetting) => {
+const addFormSettingCondition = (index: number, formSetting: FormTriggerSetting) => {
const conditionDialog = proxy.$refs[`condition-${index}`][0]
conditionDialog.open(formSetting)
}
/** 删除条件配置 */
-const deleteFormUpdateCondition = (formSetting: FormTriggerSetting) => {
+const deleteFormSettingCondition = (formSetting: FormTriggerSetting) => {
formSetting.conditionType = undefined
}
/** 打开条件配置弹窗 */
-const openFormUpdateCondition = (index: number, formSetting: FormTriggerSetting) => {
+const openFormSettingCondition = (index: number, formSetting: FormTriggerSetting) => {
const conditionDialog = proxy.$refs[`condition-${index}`][0]
conditionDialog.open(formSetting)
}
@@ -397,9 +510,18 @@ const saveConfig = async () => {
currentNode.value.showText = showText
if (configForm.value.type === TriggerTypeEnum.HTTP_REQUEST) {
configForm.value.formSettings = undefined
- }
- if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
+ } else if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
+ configForm.value.httpRequestSetting = undefined
+ // 清理删除字段相关的数据
+ configForm.value.formSettings?.forEach((setting) => {
+ setting.deleteFields = undefined
+ })
+ } else if (configForm.value.type === TriggerTypeEnum.FORM_DELETE) {
configForm.value.httpRequestSetting = undefined
+ // 清理修改字段相关的数据
+ configForm.value.formSettings?.forEach((setting) => {
+ setting.updateFormFields = undefined
+ })
}
currentNode.value.triggerSetting = configForm.value
settingVisible.value = false
@@ -419,6 +541,14 @@ const getShowText = (): string => {
}
}
showText = '修改表单数据'
+ } else if (configForm.value.type === TriggerTypeEnum.FORM_DELETE) {
+ for (const [index, setting] of configForm.value.formSettings!.entries()) {
+ if (!setting.deleteFields || setting.deleteFields.length === 0) {
+ message.warning(`请选择表单设置${index + 1}要删除的字段`)
+ return ''
+ }
+ }
+ showText = '删除表单数据'
}
return showText
}
@@ -426,6 +556,7 @@ const getShowText = (): string => {
/** 显示触发器节点配置， 由父组件传过来 */
const showTriggerNodeConfig = (node: SimpleFlowNode) => {
nodeName.value = node.name
+ originalSetting = node.triggerSetting
if (node.triggerSetting) {
configForm.value = {
type: node.triggerSetting.type,
@@ -438,7 +569,8 @@ const showTriggerNodeConfig = (node: SimpleFlowNode) => {
formSettings: node.triggerSetting.formSettings || [
{
conditionGroups: DEFAULT_CONDITION_GROUP_VALUE,
- updateFormFields: {}
+ updateFormFields: {},
+ deleteFields: []
}
]
}
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/ConditionDialog.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/ConditionDialog.vue
index 7b45901e3..9d6260d5d 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/ConditionDialog.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/ConditionDialog.vue
@@ -1,4 +1,5 @@
-
+
+
@@ -303,8 +297,8 @@ const addNode = (type: number) => {
type: NodeType.CHILD_PROCESS_NODE,
childNode: props.childNode,
childProcessSetting: {
- calledElement: '',
- calledElementName: '',
+ calledProcessDefinitionKey: '',
+ calledProcessDefinitionName: '',
async: false,
skipStartUserNode: false,
startUserSetting: {
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index e9d0bde5a..8e9328abc 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -39,15 +39,10 @@ export enum NodeType {
TRIGGER_NODE = 15,
/**
- * 触发器节点
+ * 子流程节点
*/
CHILD_PROCESS_NODE = 20,
- /**
- * 触发器节点
- */
- ASYNC_CHILD_PROCESS_NODE = 21,
-
/**
* 条件节点
*/
@@ -804,11 +799,11 @@ export const TRIGGER_TYPES: DictDataVO[] = [
* 子流程节点结构定义
*/
export type ChildProcessSetting = {
- calledElement: string
- calledElementName: string
+ calledProcessDefinitionKey: string
+ calledProcessDefinitionName: string
async: boolean,
- inVariable?: IOParameter[],
- outVariable?: IOParameter[],
+ inVariables?: IOParameter[],
+ outVariables?: IOParameter[],
skipStartUserNode: boolean,
startUserSetting: StartUserSetting,
}
@@ -823,5 +818,5 @@ export type IOParameter = {
export type StartUserSetting = {
type: number
formField?: string
- emptyHandleType?: number
+ emptyType?: number
}
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index 26df65efe..a7d9aee6b 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -27,9 +27,16 @@
-
+
+
+
+
@@ -48,11 +55,11 @@
inactive-text="不跳过"
/>
-
-
+
+
-
+
添加一行
-
+
-
+
添加一行
@@ -227,7 +234,8 @@ const activeTabName = ref('child')
const formRef = ref() // 表单 Ref
// 表单校验规则
const formRules = reactive({
- calledElement: [{ required: true, message: '子流程不能为空', trigger: 'change' }],
+ async: [{ required: true, message: '是否异步不能为空', trigger: 'change' }],
+ calledProcessDefinitionKey: [{ required: true, message: '子流程不能为空', trigger: 'change' }],
skipStartUserNode: [
{ required: true, message: '是否自动跳过子流程发起节点不能为空', trigger: 'change' }
],
@@ -238,10 +246,10 @@ const formRules = reactive({
startUserFormField: [{ required: true, message: '发起人表单不能为空', trigger: 'change' }]
})
const configForm = ref({
- calledElement: '',
+ calledProcessDefinitionKey: '',
skipStartUserNode: false,
- inVariable: [],
- outVariable: [],
+ inVariables: [],
+ outVariables: [],
startUserType: 1,
startUserEmptyType: 1,
startUserFormField: ''
@@ -257,17 +265,18 @@ const saveConfig = async () => {
const valid = await formRef.value.validate()
if (!valid) return false
const childInfo = childProcessOptions.value.find(
- (option) => option.key === configForm.value.calledElement
+ (option) => option.key === configForm.value.calledProcessDefinitionKey
)
currentNode.value.name = nodeName.value!
if (currentNode.value.childProcessSetting) {
- currentNode.value.childProcessSetting.calledElement = childInfo.key
- currentNode.value.childProcessSetting.calledElementName = childInfo.name
+ currentNode.value.childProcessSetting.async = configForm.value.async
+ currentNode.value.childProcessSetting.calledProcessDefinitionKey = childInfo.key
+ currentNode.value.childProcessSetting.calledProcessDefinitionName = childInfo.name
currentNode.value.childProcessSetting.skipStartUserNode = configForm.value.skipStartUserNode
- currentNode.value.childProcessSetting.inVariable = configForm.value.inVariable
- currentNode.value.childProcessSetting.outVariable = configForm.value.outVariable
+ currentNode.value.childProcessSetting.inVariables = configForm.value.inVariables
+ currentNode.value.childProcessSetting.outVariables = configForm.value.outVariables
currentNode.value.childProcessSetting.startUserSetting.type = configForm.value.startUserType
- currentNode.value.childProcessSetting.startUserSetting.emptyHandleType =
+ currentNode.value.childProcessSetting.startUserSetting.emptyType =
configForm.value.startUserEmptyType
currentNode.value.childProcessSetting.startUserSetting.formField =
configForm.value.startUserFormField
@@ -280,13 +289,15 @@ const saveConfig = async () => {
const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
nodeName.value = node.name
if (node.childProcessSetting) {
- configForm.value.calledElement = node.childProcessSetting.calledElement
+ configForm.value.async =
+ node.childProcessSetting.async
+ configForm.value.calledProcessDefinitionKey =
+ node.childProcessSetting.calledProcessDefinitionKey
configForm.value.skipStartUserNode = node.childProcessSetting.skipStartUserNode
- configForm.value.inVariable = node.childProcessSetting.inVariable
- configForm.value.outVariable = node.childProcessSetting.outVariable
+ configForm.value.inVariables = node.childProcessSetting.inVariables
+ configForm.value.outVariables = node.childProcessSetting.outVariables
configForm.value.startUserType = node.childProcessSetting.startUserSetting.type
- configForm.value.startUserEmptyType =
- node.childProcessSetting.startUserSetting.emptyHandleType ?? 1
+ configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? 1
configForm.value.startUserFormField = node.childProcessSetting.startUserSetting.formField ?? ''
}
loadFormInfo()
@@ -304,13 +315,13 @@ const deleteVariable = (arr, index: number) => {
arr.splice(index, 1)
}
const handleCalledElementChange = () => {
- configForm.value.inVariable = []
- configForm.value.outVariable = []
+ configForm.value.inVariables = []
+ configForm.value.outVariables = []
loadFormInfo()
}
const loadFormInfo = async () => {
const childInfo = childProcessOptions.value.find(
- (option) => option.key === configForm.value.calledElement
+ (option) => option.key === configForm.value.calledProcessDefinitionKey
)
const formInfo = await getForm(childInfo.formId)
childFormFieldOptions.value = []
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
index 540bb62cc..e1d11091d 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
@@ -86,8 +86,7 @@ const setSimpleModelNodeTaskStatus = (
simpleModel.type === NodeType.START_USER_NODE ||
simpleModel.type === NodeType.USER_TASK_NODE ||
simpleModel.type === NodeType.TRANSACTOR_NODE ||
- simpleModel.type === NodeType.CHILD_PROCESS_NODE ||
- simpleModel.type === NodeType.ASYNC_CHILD_PROCESS_NODE
+ simpleModel.type === NodeType.CHILD_PROCESS_NODE
) {
simpleModel.activityStatus = TaskStatusEnum.NOT_START
if (rejectedTaskActivityIds.includes(simpleModel.id)) {
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
index f93a2d9c6..30afe69c4 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
@@ -182,7 +182,6 @@ import parallelSvg from '@/assets/svgs/bpm/parallel.svg'
import finishSvg from '@/assets/svgs/bpm/finish.svg'
import transactorSvg from '@/assets/svgs/bpm/transactor.svg'
import childProcessSvg from '@/assets/svgs/bpm/child-process.svg'
-import asyncChildProcessSvg from '@/assets/svgs/bpm/async-child-process.svg'
defineOptions({ name: 'BpmProcessInstanceTimeline' })
withDefaults(
@@ -254,8 +253,6 @@ const nodeTypeSvgMap = {
[NodeType.PARALLEL_BRANCH_NODE]: { color: '#14bb83', svg: parallelSvg },
// 子流程节点
[NodeType.CHILD_PROCESS_NODE]: { color: '#14bb83', svg: childProcessSvg },
- // 异步子流程节点
- [NodeType.ASYNC_CHILD_PROCESS_NODE]: { color: '#14bb83', svg: asyncChildProcessSvg }
}
// 只有只有状态是 -1、0、1 才展示头像右小角状态小icon
@@ -276,7 +273,6 @@ const getApprovalNodeIcon = (taskStatus: number, nodeType: NodeType) => {
nodeType === NodeType.USER_TASK_NODE ||
nodeType === NodeType.TRANSACTOR_NODE ||
nodeType === NodeType.CHILD_PROCESS_NODE ||
- nodeType === NodeType.ASYNC_CHILD_PROCESS_NODE ||
nodeType === NodeType.END_EVENT_NODE
) {
return statusIconMap[taskStatus]?.icon
--
Gitee
From 2f8f5454b35f67dae717b8bd25773d2cd7ce7101 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Mon, 24 Feb 2025 09:54:22 +0800
Subject: [PATCH 44/88] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E5=BF=85?=
=?UTF-8?q?=E8=A6=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 803322e90..04f1d0a10 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -157,6 +157,7 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
}
/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
+// TODO @芋艿：这里我执行填写表单的时候不知道为啥一直报错，先注释了
// watch(
// detailForm.value,
// (newValue) => {
--
Gitee
From 64ff45e46caccbe0dfb68a3e17a83aa4b8fa38d0 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Mon, 24 Feb 2025 15:27:27 +0800
Subject: [PATCH 45/88] =?UTF-8?q?feat:=20=E5=AD=90=E6=B5=81=E7=A8=8B-?=
=?UTF-8?q?=E8=B6=85=E6=97=B6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/NodeHandler.vue | 3 +
.../SimpleProcessDesignerV2/src/consts.ts | 8 +-
.../nodes-config/ChildProcessNodeConfig.vue | 148 ++++++++++++++++--
3 files changed, 145 insertions(+), 14 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
index 22d113f9e..255323445 100644
--- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
+++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
@@ -303,6 +303,9 @@ const addNode = (type: number) => {
skipStartUserNode: false,
startUserSetting: {
type: 1
+ },
+ timeoutSetting: {
+ enable: false
}
}
}
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index 1c36df026..1224c4bf4 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -818,17 +818,21 @@ export type ChildProcessSetting = {
outVariables?: IOParameter[],
skipStartUserNode: boolean,
startUserSetting: StartUserSetting,
+ timeoutSetting: TimeoutSetting,
}
-
export type IOParameter = {
source: string
sourceExpression: string
target: string
targetExpression: string
}
-
export type StartUserSetting = {
type: number
formField?: string
emptyType?: number
}
+export type TimeoutSetting = {
+ enable: boolean,
+ type?: DelayTypeEnum,
+ timeExpression?: string,
+}
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index a7d9aee6b..724ee7233 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -28,11 +28,7 @@
-
+
+
+ 超时设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 后进入下一节点
+
+
+
+ 后进入下一节点
+
+
@@ -210,9 +260,17 @@
-
+
--
Gitee
From 303bbbdd7f1dcab50cedc0721b0c100551539c9e Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Tue, 25 Feb 2025 22:42:46 +0800
Subject: [PATCH 52/88] =?UTF-8?q?review=EF=BC=9A=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E5=AE=A1=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/ProcessInstanceOperationButton.vue | 95 ++++++++-----------
.../detail/ProcessInstanceSimpleViewer.vue | 2 +-
.../bpm/processInstance/detail/index.vue | 14 +--
3 files changed, 46 insertions(+), 65 deletions(-)
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 5e1c50822..fcb984ce5 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -36,8 +36,16 @@
:rule="approveForm.rule"
/>
+
+
+
@@ -48,14 +56,6 @@
@select-user-confirm="selectUserConfirm"
/>
-
-
-
{
message.warning('表单校验不通过，请先完善表单!!')
return
}
- // 获取修改的流程变量, 暂时只支持流程表单
- const variables = getUpdatedProcessInstanceVariables()
- const param = {
- processInstanceId: props.processInstance.id,
- processVariablesStr: JSON.stringify(variables)
- }
- // 流程通过时，根据表单变量查询新的流程节点，判断下一个节点类型是否为自选审批人
- const res = await ProcessInstanceApi.getApprovalDetail(param)
- //当前待审批节点id
- const activityId = res.todoTask?.taskDefinitionKey
- if (res.activityNodes && res.activityNodes.length > 0) {
- // 找到当前节点的索引
- const currentNodeIndex = res.activityNodes.findIndex((node) => node.id === activityId)
- const nextNode = res.activityNodes[currentNodeIndex + 1]
- if (
- nextNode.candidateStrategy === CandidateStrategy.START_USER_SELECT &&
- !nextNode.tasks &&
- nextNode.candidateUsers?.length === 0
- ) {
- // 自选审批人，则弹出选择审批人弹窗
- activityNodes.value = [nextNode]
- dialogVisibleSelectApproveUser.value = true
- }
- }
+ initNextTaskSelectAssigneeFormField()
}
if (type === 'return') {
// 获取退回节点
@@ -744,6 +721,33 @@ const closePropover = (type: string, formRef: FormInstance | undefined) => {
dialogVisibleSelectApproveUser.value = false
}
+/** // 流程通过时，根据表单变量查询新的流程节点，判断下一个节点类型是否为自选审批人 */
+const initNextTaskSelectAssigneeFormField = async () => {
+ // 获取修改的流程变量, 暂时只支持流程表单
+ const variables = getUpdatedProcessInstanceVariables()
+ const param = {
+ processInstanceId: props.processInstance.id,
+ processVariablesStr: JSON.stringify(variables)
+ }
+ const res = await ProcessInstanceApi.getApprovalDetail(param)
+ //当前待审批节点id
+ const activityId = res.todoTask?.taskDefinitionKey
+ if (res.activityNodes && res.activityNodes.length > 0) {
+ // 找到当前节点的索引
+ const currentNodeIndex = res.activityNodes.findIndex((node) => node.id === activityId)
+ const nextNode = res.activityNodes[currentNodeIndex + 1]
+ if (
+ nextNode.candidateStrategy === CandidateStrategy.START_USER_SELECT &&
+ !nextNode.tasks &&
+ nextNode.candidateUsers?.length === 0
+ ) {
+ // 自选审批人，则弹出选择审批人弹窗
+ activityNodes.value = [nextNode]
+ dialogVisibleSelectApproveUser.value = true
+ }
+ }
+}
+
/** 处理审批通过和不通过的操作 */
const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) => {
formLoading.value = true
@@ -764,33 +768,10 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
dialogVisibleSelectApproveUser.value &&
Object.keys(approveReasonForm.selectApproveUser).length === 0
) {
- message.warning('审批人不能为空!')
+ message.warning('下一个节点的审批人不能为空!')
return
}
- // 获取修改的流程变量, 暂时只支持流程表单
const variables = getUpdatedProcessInstanceVariables()
- const param = {
- processInstanceId: props.processInstance.id,
- processVariablesStr: JSON.stringify(variables)
- }
- // 流程通过时，根据表单变量查询新的流程节点，判断下一个节点类型是否为自选审批人
- const res = await ProcessInstanceApi.getApprovalDetail(param)
- //当前待审批节点id
- const activityId = res.todoTask?.taskDefinitionKey
- if (res.activityNodes && res.activityNodes.length > 0) {
- // 找到当前节点的索引
- const currentNodeIndex = res.activityNodes.findIndex((node) => node.id === activityId)
- const nextNode = res.activityNodes[currentNodeIndex + 1]
- if (
- nextNode.candidateStrategy === CandidateStrategy.START_USER_SELECT &&
- !nextNode.tasks &&
- nextNode.candidateUsers?.length === 0
- ) {
- // 自选审批人，则弹出选择审批人弹窗
- activityNodes.value = [nextNode]
- dialogVisibleSelectApproveUser.value = true
- }
- }
// 审批通过数据
const data = {
id: runningTask.value.id,
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
index 602096193..87f8119df 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
@@ -48,7 +48,7 @@ watch(
finishedActivityIds,
finishedSequenceFlowActivityIds
)
- simpleModel.value = newModelView.simpleModel == null ? {} : newModelView.simpleModel
+ simpleModel.value = newModelView.simpleModel ? newModelView.simpleModel : {}
}
}
)
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index ab6c4380f..46ecaaeef 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -178,21 +178,21 @@ const writableFields: Array = [] // 表单可以编辑的字段
/** 获得详情 */
const getDetail = () => {
- const param = {
- processInstanceId: props.id,
- activityId: props.activityId,
- taskId: props.taskId
- }
- getApprovalDetail(param)
+ getApprovalDetail()
getProcessModelView()
}
/** 加载流程实例 */
const BusinessFormComponent = ref(null) // 异步组件
/** 获取审批详情 */
-const getApprovalDetail = async (param?: any) => {
+const getApprovalDetail = async () => {
processInstanceLoading.value = true
try {
+ const param = {
+ processInstanceId: props.id,
+ activityId: props.activityId,
+ taskId: props.taskId
+ }
const data = await ProcessInstanceApi.getApprovalDetail(param)
if (!data) {
message.error('查询不到审批详情信息！')
--
Gitee
From d7664c92cd9ab38a8c7cdfba168da8531e1d6487 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Tue, 25 Feb 2025 22:44:33 +0800
Subject: [PATCH 53/88] =?UTF-8?q?fix:=20processVariablesStr=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E8=BD=ACstring=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bpm/processInstance/create/ProcessDefinitionDetail.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 169d7ff6c..8856fac79 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -167,7 +167,7 @@ watch(
// 加载最新的审批详情
getApprovalDetail({
id: props.selectProcessDefinition.id,
- processVariablesStr: newValue.value // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+ processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
})
}
},
@@ -183,7 +183,7 @@ const getApprovalDetail = async (row: any) => {
const data = await ProcessInstanceApi.getApprovalDetail({
processDefinitionId: row.id,
activityId: NodeId.START_USER_NODE_ID,
- processVariablesStr: JSON.stringify(row.processVariablesStr) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+ processVariablesStr: row.processVariablesStr // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
})
if (!data) {
--
Gitee
From 2ff1bccbaff7be85c11669247073f27f1ebee329 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 26 Feb 2025 09:38:10 +0800
Subject: [PATCH 54/88] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SimpleProcessDesignerV2/src/consts.ts | 39 ++++++++++--
.../nodes-config/ChildProcessNodeConfig.vue | 62 ++++++++++++-------
2 files changed, 76 insertions(+), 25 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index c7285f93f..b8d08b791 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -824,17 +824,48 @@ export type ChildProcessSetting = {
}
export type IOParameter = {
source: string
- sourceExpression: string
target: string
- targetExpression: string
}
export type StartUserSetting = {
- type: number
+ type: ChildProcessStartUserTypeEnum
formField?: string
- emptyType?: number
+ emptyType?: ChildProcessStartUserEmptyTypeEnum
}
export type TimeoutSetting = {
enable: boolean,
type?: DelayTypeEnum,
timeExpression?: string,
}
+export enum ChildProcessStartUserTypeEnum {
+ /**
+ * 同主流程发起人
+ */
+ MAIN_PROCESS_START_USER = 1,
+ /**
+ * 表单
+ */
+ FROM_FORM = 2,
+}
+export const CHILD_PROCESS_START_USER_TYPE = [
+ { label: '同主流程发起人', value: ChildProcessStartUserTypeEnum.MAIN_PROCESS_START_USER },
+ { label: '表单', value: ChildProcessStartUserTypeEnum.FROM_FORM }
+]
+export enum ChildProcessStartUserEmptyTypeEnum {
+ /**
+ * 同主流程发起人
+ */
+ MAIN_PROCESS_START_USER = 1,
+ /**
+ * 子流程管理员
+ */
+ CHILD_PROCESS_ADMIN = 2,
+ /**
+ * 主流程管理员
+ */
+ MAIN_PROCESS_ADMIN = 3,
+}
+export const CHILD_PROCESS_START_USER_EMPTY_TYPE = [
+ { label: '同主流程发起人', value: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER },
+ { label: '子流程管理员', value: ChildProcessStartUserEmptyTypeEnum.CHILD_PROCESS_ADMIN },
+ { label: '主流程管理员', value: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_ADMIN }
+]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index 9e2ce4a2d..0289151bd 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -95,7 +95,7 @@
@@ -160,11 +159,13 @@
添加一行
-
- 同主流程发起人
- 表单
+
+ {{ item.label }}
- 同主流程发起人
- 子流程管理员
- 主流程管理员
+
+ {{ item.label }}
({
async: false,
calledProcessDefinitionKey: '',
skipStartUserNode: false,
inVariables: [],
outVariables: [],
- startUserType: 1,
- startUserEmptyType: 1,
+ startUserType: ChildProcessStartUserTypeEnum.MAIN_PROCESS_START_USER,
+ startUserEmptyType: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER,
startUserFormField: '',
timeoutEnable: false,
timeoutType: DelayTypeEnum.FIXED_TIME_DURATION,
@@ -334,9 +357,8 @@ const saveConfig = async () => {
if (!formRef) return false
const valid = await formRef.value.validate()
if (!valid) return false
- // TODO @lesan：这里的 option 黄色告警，也处理下哈
const childInfo = childProcessOptions.value.find(
- (option) => option.key === configForm.value.calledProcessDefinitionKey
+ (option: any) => option.key === configForm.value.calledProcessDefinitionKey
)
currentNode.value.name = nodeName.value!
if (currentNode.value.childProcessSetting) {
@@ -378,7 +400,6 @@ const saveConfig = async () => {
return true
}
// 显示子流程节点配置， 由父组件传过来
-// TODO @lesan：inVariables、outVariables 红色告警
const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
nodeName.value = node.name
if (node.childProcessSetting) {
@@ -421,15 +442,14 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
defineExpose({ openDrawer, showChildProcessNodeConfig }) // 暴露方法给父组件
-// TODO @lesan：这里的 arr 黄色告警，也处理下哈，可以用 cursor quick fix 哈
-const addVariable = (arr) => {
- arr.push({
+const addVariable = (arr?: IOParameter[]) => {
+ arr?.push({
source: '',
target: ''
})
}
-const deleteVariable = (arr, index: number) => {
- arr.splice(index, 1)
+const deleteVariable = (index: number, arr?: IOParameter[]) => {
+ arr?.splice(index, 1)
}
const handleCalledElementChange = () => {
configForm.value.inVariables = []
--
Gitee
From bad11ff29bb57dd1119a4a16c4c201faa5fd6cea Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 26 Feb 2025 15:23:51 +0800
Subject: [PATCH 55/88] =?UTF-8?q?feat:=20=E5=AD=90=E6=B5=81=E7=A8=8B-?=
=?UTF-8?q?=E5=A4=9A=E5=AE=9E=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/NodeHandler.vue | 3 +
.../SimpleProcessDesignerV2/src/consts.ts | 27 ++++
.../nodes-config/ChildProcessNodeConfig.vue | 125 +++++++++++++++++-
3 files changed, 148 insertions(+), 7 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
index 255323445..25e4ed74f 100644
--- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
+++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
@@ -306,6 +306,9 @@ const addNode = (type: number) => {
},
timeoutSetting: {
enable: false
+ },
+ multiInstanceSetting: {
+ enable: false
}
}
}
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index b8d08b791..e74ad58a4 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -821,6 +821,7 @@ export type ChildProcessSetting = {
skipStartUserNode: boolean,
startUserSetting: StartUserSetting,
timeoutSetting: TimeoutSetting,
+ multiInstanceSetting: MultiInstanceSetting,
}
export type IOParameter = {
source: string
@@ -836,6 +837,13 @@ export type TimeoutSetting = {
type?: DelayTypeEnum,
timeExpression?: string,
}
+export type MultiInstanceSetting = {
+ enable: boolean,
+ sequential?: boolean,
+ completeRatio?: number,
+ sourceType?: ChildProcessMultiInstanceSourceTypeEnum,
+ source?: string,
+}
export enum ChildProcessStartUserTypeEnum {
/**
* 同主流程发起人
@@ -869,3 +877,22 @@ export const CHILD_PROCESS_START_USER_EMPTY_TYPE = [
{ label: '子流程管理员', value: ChildProcessStartUserEmptyTypeEnum.CHILD_PROCESS_ADMIN },
{ label: '主流程管理员', value: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_ADMIN }
]
+export enum ChildProcessMultiInstanceSourceTypeEnum {
+ /**
+ * 固定数量
+ */
+ FIXED_QUANTITY = 1,
+ /**
+ * 数字表单
+ */
+ DIGITAL_FORM = 2,
+ /**
+ * 多项表单
+ */
+ MULTI_FORM = 3,
+}
+export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [
+ { label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY },
+ { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM },
+ { label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM }
+]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index 0289151bd..b8f3172ec 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -164,8 +164,10 @@
- {{ item.label }}
+ :value="item.value"
+ >
+ {{ item.label }}
- {{ item.label }}
+ :value="item.value"
+ >
+ {{ item.label }}
后进入下一节点
+
+
多实例设置
+
+
+
+
+
+
+
+
+ 完成比例(%)
+
+
+
+ 多实例来源
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -276,7 +342,9 @@ import {
ChildProcessStartUserTypeEnum,
CHILD_PROCESS_START_USER_TYPE,
ChildProcessStartUserEmptyTypeEnum,
- CHILD_PROCESS_START_USER_EMPTY_TYPE
+ CHILD_PROCESS_START_USER_EMPTY_TYPE,
+ CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE,
+ ChildProcessMultiInstanceSourceTypeEnum
} from '../consts'
import { useWatchNode, useDrawer, useNodeName, useFormFieldsAndStartUser } from '../node'
import { parseFormFields } from '@/components/FormCreate/src/utils'
@@ -315,7 +383,8 @@ const formRules = reactive({
timeoutEnable: [{ required: true, message: '超时设置是否开启不能为空', trigger: 'change' }],
timeoutType: [{ required: true, message: '超时设置时间不能为空', trigger: 'change' }],
timeDuration: [{ required: true, message: '超时设置时间不能为空', trigger: 'change' }],
- dateTime: [{ required: true, message: '超时设置时间不能为空', trigger: 'change' }]
+ dateTime: [{ required: true, message: '超时设置时间不能为空', trigger: 'change' }],
+ multiInstanceEnable: [{ required: true, message: '多实例设置不能为空', trigger: 'change' }]
})
type ChildProcessFormType = {
async: boolean
@@ -331,6 +400,11 @@ type ChildProcessFormType = {
timeDuration: number
timeUnit: TimeUnitType
dateTime: string
+ multiInstanceEnable: boolean
+ sequential: boolean
+ completeRatio: number
+ multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum
+ multiInstanceSource: string
}
const configForm = ref
({
async: false,
@@ -345,10 +419,21 @@ const configForm = ref({
timeoutType: DelayTypeEnum.FIXED_TIME_DURATION,
timeDuration: 1,
timeUnit: TimeUnitType.HOUR,
- dateTime: ''
+ dateTime: '',
+ multiInstanceEnable: false,
+ sequential: false,
+ completeRatio: 100,
+ multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY,
+ multiInstanceSource: ''
})
const childProcessOptions = ref()
const formFieldOptions = useFormFieldsAndStartUser()
+const digitalFormFieldOptions = computed(() => {
+ return formFieldOptions.filter((item) => item.type === 'inputNumber')
+})
+const multiFormFieldOptions = computed(() => {
+ return formFieldOptions.filter((item) => item.type === 'select' || item.type === 'checkbox')
+})
const childFormFieldOptions = ref()
// 保存配置
@@ -393,6 +478,19 @@ const saveConfig = async () => {
configForm.value.dateTime
}
}
+ // 8. 多实例设置
+ currentNode.value.childProcessSetting.multiInstanceSetting = {
+ enable: configForm.value.multiInstanceEnable
+ }
+ if (configForm.value.multiInstanceEnable) {
+ currentNode.value.childProcessSetting.multiInstanceSetting.sequential = configForm.value.sequential
+ currentNode.value.childProcessSetting.multiInstanceSetting.completeRatio =
+ configForm.value.completeRatio
+ currentNode.value.childProcessSetting.multiInstanceSetting.sourceType =
+ configForm.value.multiInstanceSourceType
+ currentNode.value.childProcessSetting.multiInstanceSetting.source =
+ configForm.value.multiInstanceSource
+ }
}
currentNode.value.showText = `调用子流程：${childInfo.name}`
@@ -436,6 +534,16 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
configForm.value.dateTime = node.childProcessSetting.timeoutSetting.timeExpression ?? ''
}
}
+ // 8. 多实例设置
+ configForm.value.multiInstanceEnable =
+ node.childProcessSetting.multiInstanceSetting.enable ?? false
+ if (configForm.value.multiInstanceEnable) {
+ configForm.value.sequential = node.childProcessSetting.multiInstanceSetting.sequential ?? false
+ configForm.value.completeRatio = node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100
+ configForm.value.multiInstanceSourceType =
+ node.childProcessSetting.multiInstanceSetting.sourceType ?? ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY
+ configForm.value.multiInstanceSource = node.childProcessSetting.multiInstanceSetting.source ?? ''
+ }
}
loadFormInfo()
}
@@ -481,6 +589,9 @@ const getIsoTimeDuration = () => {
}
return strTimeDuration
}
+const handleMultiInstanceSourceTypeChange = () => {
+ configForm.value.multiInstanceSource = ''
+}
onMounted(async () => {
childProcessOptions.value = await getModelList(undefined)
--
Gitee
From 74d560a19ea316bd6c040c686fabbaf3c72872cc Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Wed, 26 Feb 2025 15:58:13 +0800
Subject: [PATCH 56/88] =?UTF-8?q?review:=20=E8=B0=83=E6=95=B4=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/ProcessInstanceOperationButton.vue | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index fcb984ce5..990f24171 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -46,7 +46,7 @@
{
return {
@@ -581,7 +581,7 @@ const approveReasonRule = computed(() => {
{ required: reasonRequire.value, message: nodeTypeName + '意见不能为空', trigger: 'blur' }
],
signPicUrl: [{ required: true, message: '签名不能为空', trigger: 'change' }],
- selectApproveUser: [{ required: true, message: '审批人不能为空', trigger: 'change' }]
+ nextAssignees: [{ required: true, message: '审批人不能为空', trigger: 'blur' }]
}
})
// 拒绝表单
@@ -681,9 +681,9 @@ watch(
}
)
-/** 选择发起人 */
+/** 选择下一个节点的审批人 */
const selectUserConfirm = (id: string, userList: any[]) => {
- approveReasonForm.selectApproveUser[id] = userList?.map((item: any) => item.id)
+ approveReasonForm.nextAssignees[id] = userList?.map((item: any) => item.id)
}
/** 弹出气泡卡 */
@@ -766,7 +766,7 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
// 如果需要自选审批人，则校验自选审批人
if (
dialogVisibleSelectApproveUser.value &&
- Object.keys(approveReasonForm.selectApproveUser).length === 0
+ Object.keys(approveReasonForm.nextAssignees).length === 0
) {
message.warning('下一个节点的审批人不能为空!')
return
@@ -777,7 +777,7 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
id: runningTask.value.id,
reason: approveReasonForm.reason,
variables, // 审批通过, 把修改的字段值赋于流程实例变量
- startUserSelectAssignees: approveReasonForm.selectApproveUser // 下个自选节点选择的审批人信息
+ nextAssignees: approveReasonForm.nextAssignees // 下个自选节点选择的审批人信息
}
// 签名
if (runningTask.value.signEnable) {
--
Gitee
From 9994059cad9adde3e54968d03bf68efcb21b744c Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Wed, 26 Feb 2025 21:59:36 +0800
Subject: [PATCH 57/88] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E3=80=91BPM=EF=BC=9A=E5=AD=90=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=9A=84=E5=A4=9A=E5=AE=9E=E4=BE=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SimpleProcessDesignerV2/src/consts.ts | 40 +++++++-------
.../nodes-config/ChildProcessNodeConfig.vue | 32 ++++++++----
.../src/nodes-config/ConditionNodeConfig.vue | 52 ++++++++++++-------
.../create/ProcessDefinitionDetail.vue | 37 +++++++------
4 files changed, 92 insertions(+), 69 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index e74ad58a4..2535baf9f 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -815,13 +815,13 @@ export const TRIGGER_TYPES: DictDataVO[] = [
export type ChildProcessSetting = {
calledProcessDefinitionKey: string
calledProcessDefinitionName: string
- async: boolean,
- inVariables?: IOParameter[],
- outVariables?: IOParameter[],
- skipStartUserNode: boolean,
- startUserSetting: StartUserSetting,
- timeoutSetting: TimeoutSetting,
- multiInstanceSetting: MultiInstanceSetting,
+ async: boolean
+ inVariables?: IOParameter[]
+ outVariables?: IOParameter[]
+ skipStartUserNode: boolean
+ startUserSetting: StartUserSetting
+ timeoutSetting: TimeoutSetting
+ multiInstanceSetting: MultiInstanceSetting
}
export type IOParameter = {
source: string
@@ -833,16 +833,16 @@ export type StartUserSetting = {
emptyType?: ChildProcessStartUserEmptyTypeEnum
}
export type TimeoutSetting = {
- enable: boolean,
- type?: DelayTypeEnum,
- timeExpression?: string,
+ enable: boolean
+ type?: DelayTypeEnum
+ timeExpression?: string
}
export type MultiInstanceSetting = {
- enable: boolean,
- sequential?: boolean,
- completeRatio?: number,
- sourceType?: ChildProcessMultiInstanceSourceTypeEnum,
- source?: string,
+ enable: boolean
+ sequential?: boolean
+ completeRatio?: number
+ sourceType?: ChildProcessMultiInstanceSourceTypeEnum
+ source?: string
}
export enum ChildProcessStartUserTypeEnum {
/**
@@ -852,7 +852,7 @@ export enum ChildProcessStartUserTypeEnum {
/**
* 表单
*/
- FROM_FORM = 2,
+ FROM_FORM = 2
}
export const CHILD_PROCESS_START_USER_TYPE = [
{ label: '同主流程发起人', value: ChildProcessStartUserTypeEnum.MAIN_PROCESS_START_USER },
@@ -870,7 +870,7 @@ export enum ChildProcessStartUserEmptyTypeEnum {
/**
* 主流程管理员
*/
- MAIN_PROCESS_ADMIN = 3,
+ MAIN_PROCESS_ADMIN = 3
}
export const CHILD_PROCESS_START_USER_EMPTY_TYPE = [
{ label: '同主流程发起人', value: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER },
@@ -889,10 +889,10 @@ export enum ChildProcessMultiInstanceSourceTypeEnum {
/**
* 多项表单
*/
- MULTI_FORM = 3,
+ MULTI_FORM = 3
}
export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [
{ label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY },
- { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM },
- { label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM }
+ { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM }, // TODO @lesan：DIGITAL 改成 NUMBER，和 Element plus 更接近？
+ { label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM } // TODO @lesan：多选表单？multiple 是这个解释。另外 MULTI => MULTIPLE
]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index b8f3172ec..abd3a3100 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -166,12 +166,12 @@
:key="item.value"
:value="item.value"
>
- {{ item.label }}
+ {{ item.label }}
+
@@ -181,8 +181,8 @@
:key="item.value"
:value="item.value"
>
- {{ item.label }}
+ {{ item.label }}
+
多实例来源
-
+
+
@@ -483,7 +488,8 @@ const saveConfig = async () => {
enable: configForm.value.multiInstanceEnable
}
if (configForm.value.multiInstanceEnable) {
- currentNode.value.childProcessSetting.multiInstanceSetting.sequential = configForm.value.sequential
+ currentNode.value.childProcessSetting.multiInstanceSetting.sequential =
+ configForm.value.sequential
currentNode.value.childProcessSetting.multiInstanceSetting.completeRatio =
configForm.value.completeRatio
currentNode.value.childProcessSetting.multiInstanceSetting.sourceType =
@@ -538,11 +544,15 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
configForm.value.multiInstanceEnable =
node.childProcessSetting.multiInstanceSetting.enable ?? false
if (configForm.value.multiInstanceEnable) {
- configForm.value.sequential = node.childProcessSetting.multiInstanceSetting.sequential ?? false
- configForm.value.completeRatio = node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100
+ configForm.value.sequential =
+ node.childProcessSetting.multiInstanceSetting.sequential ?? false
+ configForm.value.completeRatio =
+ node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100
configForm.value.multiInstanceSourceType =
- node.childProcessSetting.multiInstanceSetting.sourceType ?? ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY
- configForm.value.multiInstanceSource = node.childProcessSetting.multiInstanceSetting.source ?? ''
+ node.childProcessSetting.multiInstanceSetting.sourceType ??
+ ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY
+ configForm.value.multiInstanceSource =
+ node.childProcessSetting.multiInstanceSetting.source ?? ''
}
}
loadFormInfo()
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
index 63d80d601..9020d655e 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
@@ -48,7 +48,7 @@ import { getDefaultConditionNodeName } from '../utils'
import { useFormFieldsAndStartUser, getConditionShowText } from '../node'
import Condition from './components/Condition.vue'
import { cloneDeep } from 'lodash-es'
-const message = useMessage() // 消息弹窗
+
defineOptions({
name: 'ConditionNodeConfig'
})
@@ -69,14 +69,18 @@ const condition = ref({
conditionExpression: '',
conditionGroups: {
and: true,
- conditions: [{
- and: true,
- rules: [{
- opCode: '==',
- leftSide: '',
- rightSide: ''
- }]
- }]
+ conditions: [
+ {
+ and: true,
+ rules: [
+ {
+ opCode: '==',
+ leftSide: '',
+ rightSide: ''
+ }
+ ]
+ }
+ ]
}
})
const open = () => {
@@ -90,14 +94,18 @@ const open = () => {
conditionExpression: '',
conditionGroups: {
and: true,
- conditions: [{
- and: true,
- rules: [{
- opCode: '==',
- leftSide: '',
- rightSide: ''
- }]
- }]
+ conditions: [
+ {
+ and: true,
+ rules: [
+ {
+ opCode: '==',
+ leftSide: '',
+ rightSide: ''
+ }
+ ]
+ }
+ ]
}
}
}
@@ -162,8 +170,14 @@ const saveConfig = async () => {
currentNode.value.conditionSetting = cloneDeep({
...currentNode.value.conditionSetting,
conditionType: condition.value?.conditionType,
- conditionExpression: condition.value?.conditionType === ConditionType.EXPRESSION ? condition.value?.conditionExpression : undefined,
- conditionGroups: condition.value?.conditionType === ConditionType.RULE ? condition.value?.conditionGroups : undefined
+ conditionExpression:
+ condition.value?.conditionType === ConditionType.EXPRESSION
+ ? condition.value?.conditionExpression
+ : undefined,
+ conditionGroups:
+ condition.value?.conditionType === ConditionType.RULE
+ ? condition.value?.conditionGroups
+ : undefined
})
}
settingVisible.value = false
diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 5944c253a..0bab7d443 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -157,25 +157,24 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
}
/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
-// TODO @芋艿：这里我执行填写表单的时候不知道为啥一直报错，先注释了 @lesan：可以和群里的小北说下
-// watch(
-// detailForm.value,
-// (newValue) => {
-// if (newValue && Object.keys(newValue.value).length > 0) {
-// // 记录之前的节点审批人
-// tempStartUserSelectAssignees.value = startUserSelectAssignees.value
-// startUserSelectAssignees.value = {}
-// // 加载最新的审批详情
-// getApprovalDetail({
-// id: props.selectProcessDefinition.id,
-// processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
-// })
-// }
-// },
-// {
-// immediate: true
-// }
-// )
+watch(
+ detailForm.value,
+ (newValue) => {
+ if (newValue && Object.keys(newValue.value).length > 0) {
+ // 记录之前的节点审批人
+ tempStartUserSelectAssignees.value = startUserSelectAssignees.value
+ startUserSelectAssignees.value = {}
+ // 加载最新的审批详情
+ getApprovalDetail({
+ id: props.selectProcessDefinition.id,
+ processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+ })
+ }
+ },
+ {
+ immediate: true
+ }
+)
/** 获取审批详情 */
const getApprovalDetail = async (row: any) => {
--
Gitee
From 7652c412202d844bf34b302f696d37acf23bb334 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Thu, 27 Feb 2025 09:05:21 +0800
Subject: [PATCH 58/88] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E4=BF=AE=E6=94=B9=E3=80=91=E8=A7=A6=E5=8F=91=E5=99=A8?=
=?UTF-8?q?=20=E5=BC=82=E6=AD=A5=20Http=20=E6=94=B9=E6=88=90=20Http=20?=
=?UTF-8?q?=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SimpleProcessDesignerV2/src/consts.ts | 17 ++++++++---------
.../src/nodes-config/TriggerNodeConfig.vue | 10 ++++------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index c7285f93f..2b6ebce45 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -756,20 +756,19 @@ export enum TriggerTypeEnum {
* 发送 HTTP 请求触发器
*/
HTTP_REQUEST = 1,
- // TODO @jason：要不把 FORM_UPDATE、FORM_DELETE 调整从 10、11 这样？
/**
- * 表单数据更新触发器
+ * 发起 HTTP 回调请求触发器
*/
- FORM_UPDATE = 2,
+ HTTP_CALLBACK = 2,
/**
- * 表单数据删除触发器
+ * 表单数据更新触发器
*/
- FORM_DELETE = 3,
- // TODO @jason：1）HTTP_CALLBACK 这个枚举值？然后，相关注释，朝着“HTTP 回调”走；2）枚举值改成 2？
+ FORM_UPDATE = 10,
/**
- * 发起异步 HTTP 请求
+ * 表单数据删除触发器
*/
- ASYNC_HTTP_REQUEST = 4
+ FORM_DELETE = 11
+
}
/**
@@ -804,7 +803,7 @@ export type FormTriggerSetting = {
export const TRIGGER_TYPES: DictDataVO[] = [
{ label: 'HTTP 请求', value: TriggerTypeEnum.HTTP_REQUEST },
- { label: '异步 HTTP 请求', value: TriggerTypeEnum.ASYNC_HTTP_REQUEST },
+ { label: 'HTTP 回调', value: TriggerTypeEnum.HTTP_CALLBACK },
{ label: '修改表单数据', value: TriggerTypeEnum.FORM_UPDATE },
{ label: '删除表单数据', value: TriggerTypeEnum.FORM_DELETE }
]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
index 29e9eea02..135fd93d4 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
@@ -36,11 +36,9 @@
-
@@ -407,9 +405,9 @@ const changeTriggerType = () => {
return
}
- if (configForm.value.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST) {
+ if (configForm.value.type === TriggerTypeEnum.HTTP_CALLBACK) {
configForm.value.httpRequestSetting =
- originalSetting?.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST &&
+ originalSetting?.type === TriggerTypeEnum.HTTP_CALLBACK &&
originalSetting.httpRequestSetting
? originalSetting.httpRequestSetting
: {
@@ -566,7 +564,7 @@ const getShowText = (): string => {
let showText = ''
if (
configForm.value.type === TriggerTypeEnum.HTTP_REQUEST ||
- configForm.value.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST
+ configForm.value.type === TriggerTypeEnum.HTTP_CALLBACK
) {
showText = `${configForm.value.httpRequestSetting?.url}`
} else if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
--
Gitee
From d0b0c8d502ec903cf64f731aee34085faad3cd99 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Thu, 27 Feb 2025 09:53:14 +0800
Subject: [PATCH 59/88] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E3=80=91BPM=EF=BC=9A=E8=A7=A6=E5=8F=91=E5=99=A8=20HTT?=
=?UTF-8?q?P=20=E5=BC=82=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SimpleProcessDesignerV2/src/consts.ts | 7 +++----
.../src/nodes-config/TriggerNodeConfig.vue | 8 ++++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index 3ef479898..7f3e3530a 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -757,7 +757,7 @@ export enum TriggerTypeEnum {
*/
HTTP_REQUEST = 1,
/**
- * 发起 HTTP 回调请求触发器
+ * 接收 HTTP 回调请求触发器
*/
HTTP_CALLBACK = 2,
/**
@@ -768,7 +768,6 @@ export enum TriggerTypeEnum {
* 表单数据删除触发器
*/
FORM_DELETE = 11
-
}
/**
@@ -802,8 +801,8 @@ export type FormTriggerSetting = {
}
export const TRIGGER_TYPES: DictDataVO[] = [
- { label: 'HTTP 请求', value: TriggerTypeEnum.HTTP_REQUEST },
- { label: 'HTTP 回调', value: TriggerTypeEnum.HTTP_CALLBACK },
+ { label: '发送 HTTP 请求', value: TriggerTypeEnum.HTTP_REQUEST },
+ { label: '接收 HTTP 回调', value: TriggerTypeEnum.HTTP_CALLBACK },
{ label: '修改表单数据', value: TriggerTypeEnum.FORM_UPDATE },
{ label: '删除表单数据', value: TriggerTypeEnum.FORM_DELETE }
]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
index 135fd93d4..3f4109fb8 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue
@@ -38,8 +38,9 @@
@@ -407,8 +408,7 @@ const changeTriggerType = () => {
if (configForm.value.type === TriggerTypeEnum.HTTP_CALLBACK) {
configForm.value.httpRequestSetting =
- originalSetting?.type === TriggerTypeEnum.HTTP_CALLBACK &&
- originalSetting.httpRequestSetting
+ originalSetting?.type === TriggerTypeEnum.HTTP_CALLBACK && originalSetting.httpRequestSetting
? originalSetting.httpRequestSetting
: {
url: '',
--
Gitee
From c304d456c3be1f3992b223cf1479380f252a51d1 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Fri, 28 Feb 2025 09:29:17 +0800
Subject: [PATCH 60/88] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SimpleProcessDesignerV2/src/consts.ts | 12 ++++-----
.../nodes-config/ChildProcessNodeConfig.vue | 25 +++++++++----------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index 7f3e3530a..c5404f18f 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -838,7 +838,7 @@ export type TimeoutSetting = {
export type MultiInstanceSetting = {
enable: boolean
sequential?: boolean
- completeRatio?: number
+ approveRatio?: number
sourceType?: ChildProcessMultiInstanceSourceTypeEnum
source?: string
}
@@ -883,14 +883,14 @@ export enum ChildProcessMultiInstanceSourceTypeEnum {
/**
* 数字表单
*/
- DIGITAL_FORM = 2,
+ NUMBER_FORM = 2,
/**
- * 多项表单
+ * 多选表单
*/
- MULTI_FORM = 3
+ MULTIPLE_FORM = 3
}
export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [
{ label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY },
- { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM }, // TODO @lesan：DIGITAL 改成 NUMBER，和 Element plus 更接近？
- { label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM } // TODO @lesan：多选表单？multiple 是这个解释。另外 MULTI => MULTIPLE
+ { label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM },
+ { label: '多选表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM }
]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index abd3a3100..7ec382fca 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -270,11 +270,11 @@
inactive-text="并行"
/>
-
+
完成比例(%)
-
-
+
-
+
-
+
({
dateTime: '',
multiInstanceEnable: false,
sequential: false,
- completeRatio: 100,
+ approveRatio: 100,
multiInstanceSourceType: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY,
multiInstanceSource: ''
})
@@ -490,8 +489,8 @@ const saveConfig = async () => {
if (configForm.value.multiInstanceEnable) {
currentNode.value.childProcessSetting.multiInstanceSetting.sequential =
configForm.value.sequential
- currentNode.value.childProcessSetting.multiInstanceSetting.completeRatio =
- configForm.value.completeRatio
+ currentNode.value.childProcessSetting.multiInstanceSetting.approveRatio =
+ configForm.value.approveRatio
currentNode.value.childProcessSetting.multiInstanceSetting.sourceType =
configForm.value.multiInstanceSourceType
currentNode.value.childProcessSetting.multiInstanceSetting.source =
@@ -520,7 +519,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
configForm.value.outVariables = node.childProcessSetting.outVariables
// 6. 发起人设置
configForm.value.startUserType = node.childProcessSetting.startUserSetting.type
- configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? 1
+ configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER
configForm.value.startUserFormField = node.childProcessSetting.startUserSetting.formField ?? ''
// 7. 超时设置
configForm.value.timeoutEnable = node.childProcessSetting.timeoutSetting.enable ?? false
@@ -546,8 +545,8 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
if (configForm.value.multiInstanceEnable) {
configForm.value.sequential =
node.childProcessSetting.multiInstanceSetting.sequential ?? false
- configForm.value.completeRatio =
- node.childProcessSetting.multiInstanceSetting.completeRatio ?? 100
+ configForm.value.approveRatio =
+ node.childProcessSetting.multiInstanceSetting.approveRatio ?? 100
configForm.value.multiInstanceSourceType =
node.childProcessSetting.multiInstanceSetting.sourceType ??
ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY
--
Gitee
From afca393cac6cb2dad4ec0e990e324fd8a68c431f Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Fri, 28 Feb 2025 09:34:00 +0800
Subject: [PATCH 61/88] =?UTF-8?q?feat:=20bpmn=E8=AE=BE=E8=AE=A1=E5=99=A8Us?=
=?UTF-8?q?erTask=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/UserTaskCustomConfig.vue | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
index a735419d9..b0249307d 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
@@ -127,9 +127,9 @@
字段名称
- 只读
- 可编辑
- 隐藏
+ 只读
+ 可编辑
+ 隐藏
@@ -486,6 +486,18 @@ function useButtonsSetting() {
}
}
+/** 批量更新权限 */
+const updatePermission = (type: string) => {
+ fieldsPermissionEl.value.forEach((field) => {
+ field.permission =
+ type === 'READ'
+ ? FieldPermissionType.READ
+ : type === 'WRITE'
+ ? FieldPermissionType.WRITE
+ : FieldPermissionType.NONE
+ })
+}
+
const userOptions = ref
([]) // 用户列表
onMounted(async () => {
// 获得用户列表
--
Gitee
From 5258c7b81aa512af7f1f0d480c9c289d1e9a3af8 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Fri, 28 Feb 2025 09:37:43 +0800
Subject: [PATCH 62/88] =?UTF-8?q?feat:=20bpmn=E8=AE=BE=E8=AE=A1=E5=99=A8Us?=
=?UTF-8?q?erTask=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/nodes-config/CopyTaskNodeConfig.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
index 8274e3147..aec32da35 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
@@ -375,7 +375,6 @@ const showCopyTaskNodeConfig = (node: SimpleFlowNode) => {
}
/** 批量更新权限 */
-// TODO @lesan：要不要 bpmn 也加下？
const updatePermission = (type: string) => {
fieldsPermissionConfig.value.forEach((field) => {
field.permission =
--
Gitee
From 29dfd4550e32607d2d4b7b4aa8fbf56483eec644 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Fri, 28 Feb 2025 13:29:55 +0800
Subject: [PATCH 63/88] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E3=80=91BPM=EF=BC=9A=E5=AD=90=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=9A=84=E5=A4=9A=E5=AE=9E=E4=BE=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/UserTaskCustomConfig.vue | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
index b0249307d..5f34df452 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
@@ -127,9 +127,15 @@
字段名称
- 只读
- 可编辑
- 隐藏
+ 只读
+ 可编辑
+ 隐藏
@@ -487,6 +493,7 @@ function useButtonsSetting() {
}
/** 批量更新权限 */
+// TODO @lesan：这个页面，有一些 idea 红色报错，咱要不要 fix 下！
const updatePermission = (type: string) => {
fieldsPermissionEl.value.forEach((field) => {
field.permission =
--
Gitee
From cf03e7226423f6d54316f3cc097c0cdd3ca4dcac Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Fri, 28 Feb 2025 17:11:34 +0800
Subject: [PATCH 64/88] =?UTF-8?q?feat=EF=BC=9A=20=E6=B7=BB=E5=8A=A0todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/ProcessInstanceOperationButton.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 990f24171..4d09d9771 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -1069,7 +1069,11 @@ const validateNormalForm = async () => {
return true
}
}
-
+// TODO @小北 这里存在问题，如果当前节点没有可编辑的字段，在提交审批时 variables = {}，会导致流程走向出错 @芋道
+/** 场景：
+ 流程发起后，A节点字段可编辑，因为变量值变更，流程预测节点发生变化，A审批通过后,
+ B节点无可编辑字段且为审批人自选节点，在提交审批时variables = {}
+ */
/** 从可以编辑的流程表单字段，获取需要修改的流程实例的变量 */
const getUpdatedProcessInstanceVariables = () => {
const variables = {}
--
Gitee
From 10c65d3967c62830626c8248e474d2797b83cfff Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Fri, 28 Feb 2025 22:55:24 +0800
Subject: [PATCH 65/88] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/ProcessInstanceOperationButton.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 990f24171..33ec94e4b 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -1071,6 +1071,11 @@ const validateNormalForm = async () => {
}
/** 从可以编辑的流程表单字段，获取需要修改的流程实例的变量 */
+/**
+ * TODO @小北 TO @芋道
+ * 问题：这里存在一种场景会出现问题，流程发起后，A节点审批完成，B节点没有可编辑的流程字段且B节点为自选审批人节点，会导致流程审批人为空，
+ * 原因：因为没有可编辑的流程字段时props.writableFields为空，参数variables传递时也为空
+ */
const getUpdatedProcessInstanceVariables = () => {
const variables = {}
props.writableFields.forEach((field) => {
--
Gitee
From 3ef04b55bc49060426b8cbe58578419756c97f60 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Fri, 28 Feb 2025 22:56:22 +0800
Subject: [PATCH 66/88] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/ProcessInstanceOperationButton.vue | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 11115a3cc..137d91bdc 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -1069,17 +1069,13 @@ const validateNormalForm = async () => {
return true
}
}
-// TODO @小北 这里存在问题，如果当前节点没有可编辑的字段，在提交审批时 variables = {}，会导致流程走向出错 @芋道
-/** 场景：
- 流程发起后，A节点字段可编辑，因为变量值变更，流程预测节点发生变化，A审批通过后,
- B节点无可编辑字段且为审批人自选节点，在提交审批时variables = {}
- */
-/** 从可以编辑的流程表单字段，获取需要修改的流程实例的变量 */
+
/**
* TODO @小北 TO @芋道
* 问题：这里存在一种场景会出现问题，流程发起后，A节点审批完成，B节点没有可编辑的流程字段且B节点为自选审批人节点，会导致流程审批人为空，
* 原因：因为没有可编辑的流程字段时props.writableFields为空，参数variables传递时也为空
*/
+/** 从可以编辑的流程表单字段，获取需要修改的流程实例的变量 */
const getUpdatedProcessInstanceVariables = () => {
const variables = {}
props.writableFields.forEach((field) => {
--
Gitee
From bd9cdb73af305b9d096ec67aa0711ad6c30c78c5 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Sat, 1 Mar 2025 00:45:15 +0800
Subject: [PATCH 67/88] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90=E3=80=81=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E9=9C=80=E8=A6=81=E7=AD=BE=E5=90=8D=E3=80=81=E5=AE=A1=E6=89=B9?=
=?UTF-8?q?=E6=84=8F=E8=A7=81=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=E6=97=A0?=
=?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../custom-config/components/UserTaskCustomConfig.vue | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
index a735419d9..460a6cc11 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
@@ -140,6 +140,7 @@
:value="FieldPermissionType.READ"
size="large"
:label="FieldPermissionType.READ"
+ @change="updateElementExtensions"
>
@@ -148,6 +149,7 @@
:value="FieldPermissionType.WRITE"
size="large"
:label="FieldPermissionType.WRITE"
+ @change="updateElementExtensions"
>
@@ -165,12 +168,12 @@
是否需要签名
-
+
审批意见
-
+