You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zi...@apache.org on 2023/10/17 10:19:10 UTC
[dolphinscheduler] branch dev updated: Fix When the task instance status is 'STOP' (#14967)
This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 28788c7df6 Fix When the task instance status is 'STOP' (#14967)
28788c7df6 is described below
commit 28788c7df69f8ae19ad565b548da643dbd52e825
Author: Xin Xiu <23...@qq.com>
AuthorDate: Tue Oct 17 18:19:04 2023 +0800
Fix When the task instance status is 'STOP' (#14967)
* Fix When the task instance status is 'STOP'
* Fix ITaskState types sort by ID
---------
Co-authored-by: Eric Gao <er...@gmail.com>
Co-authored-by: xiangzihao <46...@qq.com>
---
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 b1aae9b9d6..261e8271c7 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 ec40e638b5..c6d9eecc07 100644
--- a/dolphinscheduler-ui/src/common/types.ts
+++ b/dolphinscheduler-ui/src/common/types.ts
@@ -20,6 +20,7 @@ export type ITaskState =
| 'SUBMITTED_SUCCESS'
| 'RUNNING_EXECUTION'
| 'PAUSE'
+ | 'STOP'
| 'FAILURE'
| 'SUCCESS'
| 'NEED_FAULT_TOLERANCE'