diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index 25e54f6b..c94998d5 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -163,8 +163,10 @@ const addNode = (type: number) => { showText: '', type: NodeType.CONDITION_NODE, childNode: undefined, - conditionType: 1, - defaultFlow: false + conditionSetting: { + defaultFlow: false + }, + }, { id: 'Flow_' + generateUUID(), @@ -172,8 +174,9 @@ const addNode = (type: number) => { showText: '未满足其它条件时,将进入此分支', type: NodeType.CONDITION_NODE, childNode: undefined, - conditionType: undefined, - defaultFlow: true + conditionSetting: { + defaultFlow: true + } } ] } @@ -217,7 +220,10 @@ const addNode = (type: number) => { showText: '', type: NodeType.CONDITION_NODE, childNode: undefined, - defaultFlow: false + conditionSetting: { + defaultFlow: false + } + }, { id: 'Flow_' + generateUUID(), @@ -225,7 +231,9 @@ const addNode = (type: number) => { showText: '未满足其它条件时,将进入此分支', type: NodeType.CONDITION_NODE, childNode: undefined, - defaultFlow: true + conditionSetting: { + defaultFlow: true + } } ] } diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 55808c96..ffc37b80 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -103,14 +103,8 @@ export interface SimpleFlowNode { taskAssignListener?: ListenerHandler // 创建任务监听器 taskCompleteListener?: ListenerHandler - // 条件类型 - conditionType?: ConditionType - // 条件表达式 - conditionExpression?: string - // 条件组 - conditionGroups?: ConditionGroup - // 是否默认的条件 - defaultFlow?: boolean + // 条件设置 + conditionSetting?: ConditionSetting // 活动的状态,用于前端节点状态展示 activityStatus?: TaskStatusEnum // 延迟设置 @@ -365,6 +359,20 @@ export enum TimeUnitType { DAY = 3 } +/** + * 条件节点设置结构定义,用于条件节点 + */ +export type ConditionSetting = { + // 条件类型 + conditionType?: ConditionType, + // 条件表达式 + conditionExpression?: string, + // 条件组 + conditionGroups?: ConditionGroup, + // 是否默认的条件 + defaultFlow?: boolean +} + // 条件配置类型 ( 用于条件节点配置 ) export enum ConditionType { /** diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts index 79bb5d38..ea983ce9 100644 --- a/src/components/SimpleProcessDesignerV2/src/node.ts +++ b/src/components/SimpleProcessDesignerV2/src/node.ts @@ -113,7 +113,6 @@ export function useFormFields() { } export type UserTaskFormType = { - //candidateParamArray: any[] candidateStrategy: CandidateStrategy approveMethod: ApproveMethodType roleIds?: number[] // 角色 @@ -152,7 +151,6 @@ export type UserTaskFormType = { } export type CopyTaskFormType = { - // candidateParamArray: any[] candidateStrategy: CandidateStrategy roleIds?: number[] // 角色 deptIds?: number[] // 部门 diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue index ae931724..7c45e1bf 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue @@ -26,13 +26,16 @@