!648 Simple设计器-路由分支

Merge pull request !648 from Lesan/feature/bpm-路由分支

src/components/SimpleProcessDesignerV2/src/NodeHandler.vue

@@ -46,6 +46,13 @@
             </div>
             </div>
             <div class="handler-item-text">延迟器</div>
             <div class="handler-item-text">延迟器</div>
           </div>
           </div>
+          <div class="handler-item" @click="addNode(NodeType.ROUTE_BRANCH_NODE)">
+            <!-- TODO @芋艿 需要更换一下iconfont的图标 -->
+            <div class="handler-item-icon copy">
+              <span class="iconfont icon-size icon-copy"></span>
+            </div>
+            <div class="handler-item-text">路由分支</div>
+          </div>
         </div>
         </div>
         <template #reference>
         <template #reference>
           <div class="add-icon"><Icon icon="ep:plus" /></div>
           <div class="add-icon"><Icon icon="ep:plus" /></div>
@@ -228,6 +235,17 @@ const addNode = (type: number) => {
     }
     }
     emits('update:childNode', data)
     emits('update:childNode', data)
   }
   }
+  if (type === NodeType.ROUTE_BRANCH_NODE) {
+    const data: SimpleFlowNode = {
+      id: 'GateWay_' + generateUUID(),
+      name: NODE_DEFAULT_NAME.get(NodeType.ROUTE_BRANCH_NODE) as string,
+      showText: '',
+      type: NodeType.ROUTE_BRANCH_NODE,
+      childNode: props.childNode,
+      defaultFlowId: 'Flow_' + generateUUID()
+    }
+    emits('update:childNode', data)
+  }
 }
 }
 </script>
 </script>
 
 

src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue

@@ -44,6 +44,12 @@
     :flow-node="currentNode"
     :flow-node="currentNode"
     @update:flow-node="handleModelValueUpdate"
     @update:flow-node="handleModelValueUpdate"
   />
   />
+  <!-- 路由分支节点 -->
+  <RouteNode
+    v-if="currentNode && currentNode.type === NodeType.ROUTE_BRANCH_NODE"
+    :flow-node="currentNode"
+    @update:flow-node="handleModelValueUpdate"
+  />
   <!-- 递归显示孩子节点  -->
   <!-- 递归显示孩子节点  -->
   <ProcessNodeTree
   <ProcessNodeTree
     v-if="currentNode && currentNode.childNode"
     v-if="currentNode && currentNode.childNode"
@@ -67,6 +73,7 @@ import ExclusiveNode from './nodes/ExclusiveNode.vue'
 import ParallelNode from './nodes/ParallelNode.vue'
 import ParallelNode from './nodes/ParallelNode.vue'
 import InclusiveNode from './nodes/InclusiveNode.vue'
 import InclusiveNode from './nodes/InclusiveNode.vue'
 import DelayTimerNode from './nodes/DelayTimerNode.vue'
 import DelayTimerNode from './nodes/DelayTimerNode.vue'
+import RouteNode from './nodes/RouteNode.vue'
 import { SimpleFlowNode, NodeType } from './consts'
 import { SimpleFlowNode, NodeType } from './consts'
 import { useWatchNode } from './node'
 import { useWatchNode } from './node'
 defineOptions({
 defineOptions({

src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue

@@ -56,7 +56,7 @@ const props = defineProps({
     required: false
     required: false
   },
   },
   // 可发起流程的人员编号
   // 可发起流程的人员编号
-  startUserIds : {
+  startUserIds: {
     type: Array,
     type: Array,
     required: false
     required: false
   },
   },
@@ -91,6 +91,7 @@ provide('startUserIds', props.startUserIds)
 
 
 const message = useMessage() // 国际化
 const message = useMessage() // 国际化
 const processNodeTree = ref<SimpleFlowNode | undefined>()
 const processNodeTree = ref<SimpleFlowNode | undefined>()
+provide('processNodeTree', processNodeTree)
 const errorDialogVisible = ref(false)
 const errorDialogVisible = ref(false)
 let errorNodes: SimpleFlowNode[] = []
 let errorNodes: SimpleFlowNode[] = []
 
 

src/components/SimpleProcessDesignerV2/src/consts.ts

@@ -44,7 +44,11 @@ export enum NodeType {
   /**
   /**
    * 包容分支节点 (对应包容网关)
    * 包容分支节点 (对应包容网关)
    */
    */
-  INCLUSIVE_BRANCH_NODE = 53
+  INCLUSIVE_BRANCH_NODE = 53,
+  /**
+   * 路由分支节点
+   */
+  ROUTE_BRANCH_NODE = 54
 }
 }
 
 
 export enum NodeId {
 export enum NodeId {
@@ -107,6 +111,9 @@ export interface SimpleFlowNode {
   activityStatus?: TaskStatusEnum
   activityStatus?: TaskStatusEnum
   // 延迟设置
   // 延迟设置
   delaySetting?: DelaySetting
   delaySetting?: DelaySetting
+  // 路由分支
+  routeGroup?: RouteCondition[]
+  defaultFlowId?: string
 }
 }
 // 候选人策略枚举 （ 用于审批节点。抄送节点 )
 // 候选人策略枚举 （ 用于审批节点。抄送节点 )
 export enum CandidateStrategy {
 export enum CandidateStrategy {
@@ -448,6 +455,7 @@ NODE_DEFAULT_TEXT.set(NodeType.COPY_TASK_NODE, '请配置抄送人')
 NODE_DEFAULT_TEXT.set(NodeType.CONDITION_NODE, '请设置条件')
 NODE_DEFAULT_TEXT.set(NodeType.CONDITION_NODE, '请设置条件')
 NODE_DEFAULT_TEXT.set(NodeType.START_USER_NODE, '请设置发起人')
 NODE_DEFAULT_TEXT.set(NodeType.START_USER_NODE, '请设置发起人')
 NODE_DEFAULT_TEXT.set(NodeType.DELAY_TIMER_NODE, '请设置延迟器')
 NODE_DEFAULT_TEXT.set(NodeType.DELAY_TIMER_NODE, '请设置延迟器')
+NODE_DEFAULT_TEXT.set(NodeType.ROUTE_BRANCH_NODE, '请设置路由节点')
 
 
 export const NODE_DEFAULT_NAME = new Map<number, string>()
 export const NODE_DEFAULT_NAME = new Map<number, string>()
 NODE_DEFAULT_NAME.set(NodeType.USER_TASK_NODE, '审批人')
 NODE_DEFAULT_NAME.set(NodeType.USER_TASK_NODE, '审批人')
@@ -455,6 +463,7 @@ NODE_DEFAULT_NAME.set(NodeType.COPY_TASK_NODE, '抄送人')
 NODE_DEFAULT_NAME.set(NodeType.CONDITION_NODE, '条件')
 NODE_DEFAULT_NAME.set(NodeType.CONDITION_NODE, '条件')
 NODE_DEFAULT_NAME.set(NodeType.START_USER_NODE, '发起人')
 NODE_DEFAULT_NAME.set(NodeType.START_USER_NODE, '发起人')
 NODE_DEFAULT_NAME.set(NodeType.DELAY_TIMER_NODE, '延迟器')
 NODE_DEFAULT_NAME.set(NodeType.DELAY_TIMER_NODE, '延迟器')
+NODE_DEFAULT_NAME.set(NodeType.ROUTE_BRANCH_NODE, '路由分支')
 
 
 // 候选人策略。暂时不从字典中取。 后续可能调整。控制显示顺序
 // 候选人策略。暂时不从字典中取。 后续可能调整。控制显示顺序
 export const CANDIDATE_STRATEGY: DictDataVO[] = [
 export const CANDIDATE_STRATEGY: DictDataVO[] = [
@@ -631,3 +640,13 @@ export const DELAY_TYPE = [
   { label: '固定时长', value: DelayTypeEnum.FIXED_TIME_DURATION },
   { label: '固定时长', value: DelayTypeEnum.FIXED_TIME_DURATION },
   { label: '固定日期', value: DelayTypeEnum.FIXED_DATE_TIME }
   { label: '固定日期', value: DelayTypeEnum.FIXED_DATE_TIME }
 ]
 ]
+
+/**
+ * 路由分支结构定义
+ */
+export type RouteCondition = {
+  nodeId: string
+  conditionType: number
+  conditionExpression: string
+  conditionGroups: ConditionGroup
+}

src/components/SimpleProcessDesignerV2/src/nodes/RouteNode.vue

+<template>
+  <div class="node-wrapper">
+    <div class="node-container">
+      <div
+        class="node-box"
+        :class="[
+          { 'node-config-error': !currentNode.showText },
+          `${useTaskStatusClass(currentNode?.activityStatus)}`
+        ]"
+      >
+        <div class="node-title-container">
+          <!-- TODO @芋艿 需要更换一下iconfont的图标 -->
+          <div class="node-title-icon copy-task"><span class="iconfont icon-copy"></span></div>
+          <input
+            v-if="!readonly && showInput"
+            type="text"
+            class="editable-title-input"
+            @blur="blurEvent()"
+            v-mountedFocus
+            v-model="currentNode.name"
+            :placeholder="currentNode.name"
+          />
+          <div v-else class="node-title" @click="clickTitle">
+            {{ currentNode.name }}
+          </div>
+        </div>
+        <div class="node-content" @click="openNodeConfig">
+          <div class="node-text" :title="currentNode.showText" v-if="currentNode.showText">
+            {{ currentNode.showText }}
+          </div>
+          <div class="node-text" v-else>
+            {{ NODE_DEFAULT_TEXT.get(NodeType.ROUTE_BRANCH_NODE) }}
+          </div>
+          <Icon v-if="!readonly" icon="ep:arrow-right-bold" />
+        </div>
+        <div v-if="!readonly" class="node-toolbar">
+          <div class="toolbar-icon"
+            ><Icon color="#0089ff" icon="ep:circle-close-filled" :size="18" @click="deleteNode"
+          /></div>
+        </div>
+      </div>
+
+      <!-- 传递子节点给添加节点组件。会在子节点前面添加节点 -->
+      <NodeHandler
+        v-if="currentNode"
+        v-model:child-node="currentNode.childNode"
+        :current-node="currentNode"
+      />
+    </div>
+    <RouteNodeConfig
+      v-if="!readonly && currentNode"
+      ref="nodeSetting"
+      :flow-node="currentNode"
+    />
+  </div>
+</template>
+<script setup lang="ts">
+import { SimpleFlowNode, NodeType, NODE_DEFAULT_TEXT } from '../consts'
+import NodeHandler from '../NodeHandler.vue'
+import { useNodeName2, useWatchNode, useTaskStatusClass } from '../node'
+import RouteNodeConfig from '../nodes-config/RouteNodeConfig.vue'
+defineOptions({
+  name: 'RouteNode'
+})
+const props = defineProps({
+  flowNode: {
+    type: Object as () => SimpleFlowNode,
+    required: true
+  }
+})
+// 定义事件，更新父组件。
+const emits = defineEmits<{
+  'update:flowNode': [node: SimpleFlowNode | undefined]
+}>()
+// 是否只读
+const readonly = inject<Boolean>('readonly')
+// 监控节点的变化
+const currentNode = useWatchNode(props)
+// 节点名称编辑
+const { showInput, blurEvent, clickTitle } = useNodeName2(currentNode, NodeType.ROUTE_BRANCH_NODE)
+
+const nodeSetting = ref()
+// 打开节点配置
+const openNodeConfig = () => {
+  if (readonly) {
+    return
+  }
+  nodeSetting.value.showRouteNodeConfig(currentNode.value)
+  nodeSetting.value.openDrawer()
+}
+
+// 删除节点。更新当前节点为孩子节点
+const deleteNode = () => {
+  emits('update:flowNode', currentNode.value.childNode)
+}
+</script>
+
+<style lang="scss" scoped></style>