This is an automated email from the ASF dual-hosted git repository. zhongjiajie pushed a commit to branch 3.0.0-beta-prepare in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit a521d49e94e50895c429d5b8e58e4556702bfad0 Author: Amy0104 <[email protected]> AuthorDate: Fri May 20 10:06:43 2022 +0800 [Fix][UI] Add the task status of pending. (#10129) (cherry picked from commit 3dd007ca599c5d3fdd6b32db8c2559991940ddc6) --- dolphinscheduler-ui/src/common/common.ts | 11 ++++++++++- dolphinscheduler-ui/src/common/types.ts | 1 + dolphinscheduler-ui/src/locales/modules/en_US.ts | 1 + dolphinscheduler-ui/src/locales/modules/zh_CN.ts | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/src/common/common.ts b/dolphinscheduler-ui/src/common/common.ts index 29a58ac627..ae644aeb01 100644 --- a/dolphinscheduler-ui/src/common/common.ts +++ b/dolphinscheduler-ui/src/common/common.ts @@ -31,7 +31,8 @@ import { StopOutlined, GlobalOutlined, IssuesCloseOutlined, - SendOutlined + SendOutlined, + HistoryOutlined } from '@vicons/antd' import { format, parseISO } from 'date-fns' import _ from 'lodash' @@ -275,6 +276,14 @@ export const tasksState = (t: any): ITaskStateConfig => ({ icon: SendOutlined, isSpin: false, classNames: 'dispatch' + }, + PENDING: { + id: 18, + desc: `${t('project.workflow.pending')}`, + color: '#5101be', + icon: HistoryOutlined, + isSpin: false, + classNames: 'pending' } }) diff --git a/dolphinscheduler-ui/src/common/types.ts b/dolphinscheduler-ui/src/common/types.ts index c766e1471f..20085cefc0 100644 --- a/dolphinscheduler-ui/src/common/types.ts +++ b/dolphinscheduler-ui/src/common/types.ts @@ -33,6 +33,7 @@ export type ITaskState = | 'FORCED_SUCCESS' | 'SERIAL_WAIT' | 'DISPATCH' + | 'PENDING' export type ITaskStateConfig = { [key in ITaskState]: { diff --git a/dolphinscheduler-ui/src/locales/modules/en_US.ts b/dolphinscheduler-ui/src/locales/modules/en_US.ts index 20ae35e133..9c7664c5d2 100644 --- a/dolphinscheduler-ui/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui/src/locales/modules/en_US.ts @@ -498,6 +498,7 @@ const project = { forced_success: 'Forced success', serial_wait: 'Serial wait', dispatch: 'Dispatch', + pending: 'Pending', executing: 'Executing', startup_type: 'Startup Type', complement_range: 'Complement Range', diff --git a/dolphinscheduler-ui/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui/src/locales/modules/zh_CN.ts index 6ef3bd209d..2d3e34ad39 100644 --- a/dolphinscheduler-ui/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui/src/locales/modules/zh_CN.ts @@ -495,6 +495,7 @@ const project = { forced_success: '强制成功', serial_wait: '串行等待', dispatch: '派发', + pending: '挂起', executing: '正在执行', startup_type: '启动类型', complement_range: '补数范围',
