@@ -70,8 +63,10 @@ import { generateUUID } from '@/utils'
defineOptions({
name: 'NodeHandler'
})
-const popoverShow = ref(false)
+const message = useMessage() // 消息弹窗
+
+const popoverShow = ref(false)
const props = defineProps({
childNode: {
type: Object as () => SimpleFlowNode,
@@ -87,6 +82,17 @@ const emits = defineEmits(['update:childNode'])
const readonly = inject
('readonly') // 是否只读
const addNode = (type: number) => {
+ // 校验:条件分支、包容分支后面,不允许直接添加并行分支
+ if (
+ type === NodeType.PARALLEL_BRANCH_NODE &&
+ [NodeType.CONDITION_BRANCH_NODE, NodeType.INCLUSIVE_BRANCH_NODE].includes(
+ props.currentNode?.type
+ )
+ ) {
+ message.error('条件分支、包容分支后面,不允许直接添加并行分支')
+ return
+ }
+
popoverShow.value = false
if (type === NodeType.USER_TASK_NODE) {
const id = 'Activity_' + generateUUID()
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue
index 0c627b0a..8b97ee5b 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/CopyTaskNode.vue
@@ -3,7 +3,10 @@
-
+
-
+
@@ -120,7 +134,7 @@ const emits = defineEmits<{
]
}>()
// 是否只读
-const readonly = inject
('readonly')
+const readonly = inject('readonly')
const currentNode = ref(props.flowNode)
watch(
() => props.flowNode,
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue
index cd06b358..f1445d83 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/InclusiveNode.vue
@@ -1,10 +1,16 @@
-
+
-
添加条件
+
添加条件
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
index ca711707..7aa67933 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
@@ -1,10 +1,16 @@
-
+
@@ -98,7 +108,7 @@ const emits = defineEmits<{
const currentNode = ref
(props.flowNode)
// 是否只读
-const readonly = inject('readonly')
+const readonly = inject('readonly')
watch(
() => props.flowNode,
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
index 0ae8e1e29..89a57d04 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
@@ -3,7 +3,10 @@
-
-
-
-
-
-
-
- {{ scope.row.assigneeUser?.nickname || scope.row.ownerUser?.nickname }}
-
-
-
-
-
- {{ scope.row.assigneeUser?.deptName || scope.row.ownerUser?.deptName }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatPast2(scope.row.durationInMillis) }}
-
-
-
-
+
+
+
+
+
+
+
+ {{ scope.row.assigneeUser?.nickname || scope.row.ownerUser?.nickname }}
+
+
+
+
+
+ {{ scope.row.assigneeUser?.deptName || scope.row.ownerUser?.deptName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatPast2(scope.row.durationInMillis) }}
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue
index 10eb678b..761a6743 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue
@@ -3,7 +3,10 @@
-
-
-
-
-
-
- {{ scope.row.assigneeUser?.nickname || scope.row.ownerUser?.nickname }}
-
-
-
-
-
- {{ scope.row.assigneeUser?.deptName || scope.row.ownerUser?.deptName }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatPast2(scope.row.durationInMillis) }}
-
-
-
-
+
+
+
+
+
+
+ {{ scope.row.assigneeUser?.nickname || scope.row.ownerUser?.nickname }}
+
+
+
+
+
+ {{ scope.row.assigneeUser?.deptName || scope.row.ownerUser?.deptName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatPast2(scope.row.durationInMillis) }}
+
+
+
+