From 6015b7c1997ae1fc14c399b19677a374fbd5fc03 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Mon, 31 Mar 2025 16:20:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=85=A8=E5=B1=80=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=204.=E6=96=B0=E5=A2=9E=E9=A2=84=E5=AE=A1?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E8=8A=82=E7=82=B9=205.=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=B1=BB=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/workflowEnum.ts | 3 +- src/model/workflow/workflowConfig.ts | 2 + .../design/bpmn/config/propertyConfig.ts | 2 + .../bpmn/panel/process/globalEvent/Index.vue | 206 +++++++++++++++++- 4 files changed, 207 insertions(+), 6 deletions(-) diff --git a/src/enums/workflowEnum.ts b/src/enums/workflowEnum.ts index fe1eb52..3ad650d 100644 --- a/src/enums/workflowEnum.ts +++ b/src/enums/workflowEnum.ts @@ -237,7 +237,8 @@ export enum NodeEventType { //事件执行类型 export enum NodeEventExType { API = 0, //api - LITEFLOW, //规则引擎 + LITEFLOW = 1, //规则引擎 + SERVICE = 2, //类注入 } //用户节点超时处理 diff --git a/src/model/workflow/workflowConfig.ts b/src/model/workflow/workflowConfig.ts index 073bc08..d40fba5 100644 --- a/src/model/workflow/workflowConfig.ts +++ b/src/model/workflow/workflowConfig.ts @@ -107,6 +107,8 @@ export interface ProcessConfig { processParamConfigs: ProcessConfigParameter; //流程参数 globalStartEventConfigs: NodeEventConfig[];//全局 用户节点 结束事件 globalEndEventConfigs: NodeEventConfig[];//全局 用户节点 结束事件 + globalPrequalifyBeforeEventConfigs: NodeEventConfig[];//预审前 + globalPrequalifyAfterEventConfigs: NodeEventConfig[];//预审后 globalFinishEventConfigs: NodeEventConfig[];//终止事件 globalRejectEventConfigs: NodeEventConfig[];//全局退回事件 globalAgreeEventConfigs: NodeEventConfig[];//全局同意事件 diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index 02827c1..cee365f 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -87,6 +87,8 @@ export const processConfig: ProcessConfig = { processParamConfigs: [], //流程参数 globalStartEventConfigs: [],//全局 用户节点 结束事件 globalEndEventConfigs: [],//全局 用户节点 结束事件 + globalPrequalifyBeforeEventConfigs: [],//预审前 + globalPrequalifyAfterEventConfigs: [],//预审后 globalFinishEventConfigs: [],//终止事件 globalRejectEventConfigs: [],//全局退回事件 globalAgreeEventConfigs: [],//全局同意事件 diff --git a/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue b/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue index 4f17fb0..0f247ed 100644 --- a/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue +++ b/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue @@ -28,6 +28,7 @@ {{ t('执行API') }} {{ t('规则引擎') }} + {{ t('类注入') }} - + +
+ + {{ t('添加全局预审前事件') }} + +
+ + + + +
+ +
+ + {{ t('添加全局预审后事件') }} + +
+ + + + +
+
{{ t('添加终止事件') }} @@ -148,6 +292,7 @@ {{ t('执行API') }} {{ t('规则引擎') }} + {{ t('类注入') }} - +
{{ t('添加全局退回事件') }} @@ -208,6 +358,7 @@ {{ t('执行API') }} {{ t('规则引擎') }} + {{ t('类注入') }} - +
{{ t('添加全局同意事件') }} @@ -268,6 +424,7 @@ {{ t('执行API') }} {{ t('规则引擎') }} + {{ t('类注入') }} - +
{{ t('添加挂起事件') }} @@ -328,6 +490,7 @@ {{ t('执行API') }} {{ t('规则引擎') }} + {{ t('类注入') }} - +
{{ t('添加恢复事件') }} @@ -388,6 +556,7 @@ {{ t('执行API') }} {{ t('规则引擎') }} + {{ t('类注入') }}