From c74b7a88f5b49003221e08bd533b718e40324aa9 Mon Sep 17 00:00:00 2001 From: imizao <2313466338@qq.com> Date: Tue, 26 Sep 2023 18:22:14 +0800 Subject: [PATCH 1/2] Fix When the task instance status is 'STOP' --- dolphinscheduler-ui/src/common/common.ts | 8 ++++++++ dolphinscheduler-ui/src/common/types.ts | 1 + 2 files changed, 9 insertions(+) diff --git a/dolphinscheduler-ui/src/common/common.ts b/dolphinscheduler-ui/src/common/common.ts index b1aae9b9d645..261e8271c74d 100644 --- a/dolphinscheduler-ui/src/common/common.ts +++ b/dolphinscheduler-ui/src/common/common.ts @@ -220,6 +220,14 @@ export const tasksState = (t: any): ITaskStateConfig => ({ isSpin: false, classNames: 'pause' }, + STOP: { + id: 5, + desc: `${t('project.workflow.stop')}`, + color: '#e90101', + icon: StopOutlined, + isSpin: false, + classNames: 'stop' + }, FAILURE: { id: 6, desc: `${t('project.workflow.failed')}`, diff --git a/dolphinscheduler-ui/src/common/types.ts b/dolphinscheduler-ui/src/common/types.ts index ec40e638b508..6b7003e6c60d 100644 --- a/dolphinscheduler-ui/src/common/types.ts +++ b/dolphinscheduler-ui/src/common/types.ts @@ -19,6 +19,7 @@ import { Component } from 'vue' export type ITaskState = | 'SUBMITTED_SUCCESS' | 'RUNNING_EXECUTION' + | 'STOP' | 'PAUSE' | 'FAILURE' | 'SUCCESS' From 40e06c9999cd276997036e20aefa84ad71798749 Mon Sep 17 00:00:00 2001 From: imizao <2313466338@qq.com> Date: Wed, 27 Sep 2023 11:57:57 +0800 Subject: [PATCH 2/2] Fix ITaskState types sort by ID --- dolphinscheduler-ui/src/common/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/src/common/types.ts b/dolphinscheduler-ui/src/common/types.ts index 6b7003e6c60d..c6d9eecc07a7 100644 --- a/dolphinscheduler-ui/src/common/types.ts +++ b/dolphinscheduler-ui/src/common/types.ts @@ -19,8 +19,8 @@ import { Component } from 'vue' export type ITaskState = | 'SUBMITTED_SUCCESS' | 'RUNNING_EXECUTION' - | 'STOP' | 'PAUSE' + | 'STOP' | 'FAILURE' | 'SUCCESS' | 'NEED_FAULT_TOLERANCE'