From d89c7ac8bb0f4c35cccb89b7cf05afa53fd5fb85 Mon Sep 17 00:00:00 2001 From: calvin Date: Sat, 19 Mar 2022 09:51:36 +0800 Subject: [PATCH] Add a new option of 'thisMonthBegin into the options of the month select for the dependent task. (#9004) --- dolphinscheduler-ui-next/src/locales/modules/en_US.ts | 1 + dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts | 1 + .../projects/task/components/node/fields/use-dependent.ts | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts index 58adae225..12d4bef99 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts @@ -847,6 +847,7 @@ const project = { last_saturday: 'LastSaturday', last_sunday: 'LastSunday', this_month: 'ThisMonth', + this_month_begin: 'ThisMonthBegin', last_month: 'LastMonth', last_month_begin: 'LastMonthBegin', last_month_end: 'LastMonthEnd', diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts index cdc4f7e08..c38dcf22a 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts @@ -837,6 +837,7 @@ const project = { last_saturday: '上周六', last_sunday: '上周日', this_month: '本月', + this_month_begin: '本月初', last_month: '上月', last_month_begin: '上月初', last_month_end: '上月末', diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts index f11c910d9..ed49efc30 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts @@ -141,6 +141,10 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { value: 'thisMonth', label: t('project.node.this_month') }, + { + value: 'thisMonthBegin', + label: t('project.node.this_month_begin') + }, { value: 'lastMonth', label: t('project.node.last_month')