You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/03/19 01:51:43 UTC
[dolphinscheduler] branch dev updated: Add a new option of 'thisMonthBegin into the options of the month select for the dependent task. (#9004)
This is an automated email from the ASF dual-hosted git repository.
songjian 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 d89c7ac Add a new option of 'thisMonthBegin into the options of the month select for the dependent task. (#9004)
d89c7ac is described below
commit d89c7ac8bb0f4c35cccb89b7cf05afa53fd5fb85
Author: calvin <ji...@163.com>
AuthorDate: Sat Mar 19 09:51:36 2022 +0800
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 +
.../src/views/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 58adae2..12d4bef 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 cdc4f7e..c38dcf2 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 f11c910..ed49efc 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
@@ -142,6 +142,10 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
label: t('project.node.this_month')
},
{
+ value: 'thisMonthBegin',
+ label: t('project.node.this_month_begin')
+ },
+ {
value: 'lastMonth',
label: t('project.node.last_month')
},