diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index b72c4cab..1000e953 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -46,7 +46,7 @@
延迟器
-
+
@@ -241,12 +241,12 @@ const addNode = (type: number) => { } emits('update:childNode', data) } - if (type === NodeType.ROUTE_BRANCH_NODE) { + if (type === NodeType.ROUTER_BRANCH_NODE) { const data: SimpleFlowNode = { id: 'GateWay_' + generateUUID(), - name: NODE_DEFAULT_NAME.get(NodeType.ROUTE_BRANCH_NODE) as string, + name: NODE_DEFAULT_NAME.get(NodeType.ROUTER_BRANCH_NODE) as string, showText: '', - type: NodeType.ROUTE_BRANCH_NODE, + type: NodeType.ROUTER_BRANCH_NODE, childNode: props.childNode } emits('update:childNode', data) diff --git a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue index 4c87d5b0..26ef13dd 100644 --- a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue +++ b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue @@ -45,8 +45,8 @@ @update:flow-node="handleModelValueUpdate" /> - @@ -73,7 +73,7 @@ import ExclusiveNode from './nodes/ExclusiveNode.vue' import ParallelNode from './nodes/ParallelNode.vue' import InclusiveNode from './nodes/InclusiveNode.vue' import DelayTimerNode from './nodes/DelayTimerNode.vue' -import RouteNode from './nodes/RouteNode.vue' +import RouterNode from './nodes/RouterNode.vue' import { SimpleFlowNode, NodeType } from './consts' import { useWatchNode } from './node' defineOptions({ diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 55808c96..039c5349 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -48,7 +48,7 @@ export enum NodeType { /** * 路由分支节点 */ - ROUTE_BRANCH_NODE = 54 + ROUTER_BRANCH_NODE = 54 } export enum NodeId { @@ -116,7 +116,7 @@ export interface SimpleFlowNode { // 延迟设置 delaySetting?: DelaySetting // 路由分支 - routerGroups?: RouteCondition[] + routerGroups?: RouterCondition[] defaultFlowId?: string // 签名 signEnable?: boolean @@ -471,7 +471,7 @@ NODE_DEFAULT_TEXT.set(NodeType.COPY_TASK_NODE, '请配置抄送人') NODE_DEFAULT_TEXT.set(NodeType.CONDITION_NODE, '请设置条件') NODE_DEFAULT_TEXT.set(NodeType.START_USER_NODE, '请设置发起人') NODE_DEFAULT_TEXT.set(NodeType.DELAY_TIMER_NODE, '请设置延迟器') -NODE_DEFAULT_TEXT.set(NodeType.ROUTE_BRANCH_NODE, '请设置路由节点') +NODE_DEFAULT_TEXT.set(NodeType.ROUTER_BRANCH_NODE, '请设置路由节点') export const NODE_DEFAULT_NAME = new Map() NODE_DEFAULT_NAME.set(NodeType.USER_TASK_NODE, '审批人') @@ -479,7 +479,7 @@ NODE_DEFAULT_NAME.set(NodeType.COPY_TASK_NODE, '抄送人') NODE_DEFAULT_NAME.set(NodeType.CONDITION_NODE, '条件') NODE_DEFAULT_NAME.set(NodeType.START_USER_NODE, '发起人') NODE_DEFAULT_NAME.set(NodeType.DELAY_TIMER_NODE, '延迟器') -NODE_DEFAULT_NAME.set(NodeType.ROUTE_BRANCH_NODE, '路由分支') +NODE_DEFAULT_NAME.set(NodeType.ROUTER_BRANCH_NODE, '路由分支') // 候选人策略。暂时不从字典中取。 后续可能调整。控制显示顺序 export const CANDIDATE_STRATEGY: DictDataVO[] = [ @@ -660,7 +660,7 @@ export const DELAY_TYPE = [ /** * 路由分支结构定义 */ -export type RouteCondition = { +export type RouterCondition = { nodeId: string conditionType: ConditionType conditionExpression: string diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouterNodeConfig.vue similarity index 91% rename from src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue rename to src/components/SimpleProcessDesignerV2/src/nodes-config/RouterNodeConfig.vue index 62170fc0..d51e27be 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouterNodeConfig.vue @@ -37,7 +37,7 @@ :value="node.value" /> - 删除
@@ -46,7 +46,7 @@ - + 新增路由分支
@@ -61,11 +61,11 @@