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 248e2bc..d40fba5 100644 --- a/src/model/workflow/workflowConfig.ts +++ b/src/model/workflow/workflowConfig.ts @@ -105,6 +105,15 @@ export interface ProcessConfig { timeoutRemidConfig: TimeoutConfig; //超时提醒配置 relationProcessConfigs: Array; //关联任务 processParamConfigs: ProcessConfigParameter; //流程参数 + globalStartEventConfigs: NodeEventConfig[];//全局 用户节点 结束事件 + globalEndEventConfigs: NodeEventConfig[];//全局 用户节点 结束事件 + globalPrequalifyBeforeEventConfigs: NodeEventConfig[];//预审前 + globalPrequalifyAfterEventConfigs: 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..cee365f 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -85,6 +85,15 @@ export const processConfig: ProcessConfig = { }, relationProcessConfigs: [], //关联任务 processParamConfigs: [], //流程参数 + globalStartEventConfigs: [],//全局 用户节点 结束事件 + globalEndEventConfigs: [],//全局 用户节点 结束事件 + globalPrequalifyBeforeEventConfigs: [],//预审前 + globalPrequalifyAfterEventConfigs: [],//预审后 + 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..0f247ed --- /dev/null +++ b/src/views/workflow/design/bpmn/panel/process/globalEvent/Index.vue @@ -0,0 +1,793 @@ + + + + +