diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index 22d113f9..25532344 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -303,6 +303,9 @@ const addNode = (type: number) => { skipStartUserNode: false, startUserSetting: { type: 1 + }, + timeoutSetting: { + enable: false } } } diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index bc0eea69..c7285f93 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -815,22 +815,26 @@ export const TRIGGER_TYPES: DictDataVO[] = [ export type ChildProcessSetting = { calledProcessDefinitionKey: string calledProcessDefinitionName: string - async: boolean - inVariables?: IOParameter[] - outVariables?: IOParameter[] - skipStartUserNode: boolean - startUserSetting: StartUserSetting + async: boolean, + inVariables?: IOParameter[], + outVariables?: IOParameter[], + skipStartUserNode: boolean, + startUserSetting: StartUserSetting, + timeoutSetting: TimeoutSetting, } - export type IOParameter = { source: string sourceExpression: string target: string targetExpression: string } - export type StartUserSetting = { type: number formField?: string emptyType?: number } +export type TimeoutSetting = { + enable: boolean, + type?: DelayTypeEnum, + timeExpression?: string, +} diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue index b6813444..9e2ce4a2 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue @@ -192,6 +192,60 @@ /> + + 超时设置 + + + +
+ + + + + + + + + + + + + 后进入下一节点 + + + + 后进入下一节点 + +
@@ -208,10 +262,17 @@