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 1c36df02..1224c4bf 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -818,17 +818,21 @@ export type ChildProcessSetting = { 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 a7d9aee6..724ee723 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue @@ -28,11 +28,7 @@
- + + + 超时设置 + + + +
+ + + + + + + + + + + + + 后进入下一节点 + + + + 后进入下一节点 + +
@@ -210,9 +260,17 @@