From efa4cebaac8c92adab9bce775c6e9785eedccb5c Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Wed, 19 Mar 2025 16:38:35 +0800 Subject: [PATCH 1/2] =?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=201.=20=E5=8D=95=E4=B8=80=EF=BC=9A=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E4=BA=8B=E4=BB=B6=EF=BC=8C=E6=8C=82=E8=B5=B7=E3=80=81?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BA=8B=E4=BB=B6=202.=20=E5=A4=8D=E5=90=88?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E4=BA=8B=E4=BB=B6=E5=90=8E=E4=BA=8E=E5=8E=9F?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91=EF=BC=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=8A=82=E7=82=B9=20=E8=A7=A6=E5=8F=91=E7=9A=84=20=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E4=BA=8B=E4=BB=B6=203.=20=E6=B7=B7=E5=90=88=E5=9C=A8?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E4=B8=AD=EF=BC=9A=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/model/workflow/workflowConfig.ts | 7 + .../design/bpmn/config/propertyConfig.ts | 7 + .../workflow/design/bpmn/panel/Process.vue | 4 + .../bpmn/panel/process/globalEvent/Index.vue | 597 ++++++++++++++++++ 4 files changed, 615 insertions(+) create mode 100644 src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue diff --git a/src/model/workflow/workflowConfig.ts b/src/model/workflow/workflowConfig.ts index 248e2bc..073bc08 100644 --- a/src/model/workflow/workflowConfig.ts +++ b/src/model/workflow/workflowConfig.ts @@ -105,6 +105,13 @@ export interface ProcessConfig { timeoutRemidConfig: TimeoutConfig; //超时提醒配置 relationProcessConfigs: Array; //关联任务 processParamConfigs: ProcessConfigParameter; //流程参数 + globalStartEventConfigs: NodeEventConfig[];//全局 用户节点 结束事件 + globalEndEventConfigs: NodeEventConfig[];//全局 用户节点 结束事件 + globalFinishEventConfigs: NodeEventConfig[];//终止事件 + globalRejectEventConfigs: NodeEventConfig[];//全局退回事件 + globalAgreeEventConfigs: NodeEventConfig[];//全局同意事件 + globalSuspendedEventConfigs: NodeEventConfig[];//全局 挂起/暂停事件 + globalRestoreEventConfigs: NodeEventConfig[];//全局 恢复事件 xmlContent: String; //xml } diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index 888df23..02827c1 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -85,6 +85,13 @@ export const processConfig: ProcessConfig = { }, relationProcessConfigs: [], //关联任务 processParamConfigs: [], //流程参数 + globalStartEventConfigs: [],//全局 用户节点 结束事件 + globalEndEventConfigs: [],//全局 用户节点 结束事件 + globalFinishEventConfigs: [],//终止事件 + globalRejectEventConfigs: [],//全局退回事件 + globalAgreeEventConfigs: [],//全局同意事件 + globalSuspendedEventConfigs: [],//全局 挂起/暂停事件 + globalRestoreEventConfigs: [],//全局 恢复事件 xmlContent: '', }; // 默认属性 diff --git a/src/views/workflow/design/bpmn/panel/Process.vue b/src/views/workflow/design/bpmn/panel/Process.vue index 6850d40..3dd419b 100644 --- a/src/views/workflow/design/bpmn/panel/Process.vue +++ b/src/views/workflow/design/bpmn/panel/Process.vue @@ -23,6 +23,9 @@ + + + @@ -35,6 +38,7 @@ import AssociatedFunctions from '/@bpmn/panel/process/functionForm/Index.vue'; import ProcessTimeout from '/@bpmn/panel/process/ProcessTimeout.vue'; import ProcessRelated from '/@bpmn/panel/process/related/Index.vue'; + import ProcessGlobalEvent from '/@bpmn/panel/process/globalEvent/Index.vue'; import ProcessParameters from '/@bpmn/components/parameters/Process.vue'; import { useI18n } from '/@/hooks/web/useI18n'; const { t } = useI18n(); diff --git a/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue b/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue new file mode 100644 index 0000000..4f17fb0 --- /dev/null +++ b/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue @@ -0,0 +1,597 @@ + + + + + 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 2/2] =?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('类注入') }}