diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue new file mode 100644 index 000000000..19aba8a8c --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue @@ -0,0 +1,196 @@ + + + + + + + + {{ currentNode.name }} + + + + + + + + 未满足其它条件时,将进入此分支(该分支不可编辑和删除) + + + + + + + + + 确 定 + 取 消 + + + + diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue new file mode 100644 index 000000000..fb00d2e71 --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue @@ -0,0 +1,277 @@ + + + + + + + + + 添加条件 + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + 优先级{{ index + 1 }} + + + + {{ item.showText }} + + + {{ NODE_DEFAULT_TEXT.get(NodeType.CONDITION_NODE) }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue new file mode 100644 index 000000000..8d613c8ca --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue @@ -0,0 +1,282 @@ + + + + + + + + + 添加条件 + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + {{ item.showText }} + + + {{ NODE_DEFAULT_TEXT.get(NodeType.CONDITION_NODE) }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue b/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue index 5f7bb5905..fadf8b3ad 100644 --- a/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue +++ b/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue @@ -5,6 +5,8 @@ import { NodeType } from '../consts'; import { useWatchNode } from '../helpers'; import CopyTaskNode from './nodes/copy-task-node.vue'; import EndEventNode from './nodes/end-event-node.vue'; +import ExclusiveNode from './nodes/exclusive-node.vue'; +import InclusiveNode from './nodes/inclusive-node.vue'; import StartUserNode from './nodes/start-user-node.vue'; import TriggerNode from './nodes/trigger-node.vue'; import UserTaskNode from './nodes/user-task-node.vue'; @@ -85,12 +87,12 @@ const recursiveFindParentNode = ( @update:flow-node="handleModelValueUpdate" /> - + @find-parent-node="findParentNode" + /> - + @find-parent-node="findParentNode" + />