Browse Source

Add a new option of 'thisMonthBegin into the options of the month select for the dependent task. (#9004)

3.0.0/version-upgrade
calvin 3 years ago committed by GitHub
parent
commit
d89c7ac8bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      dolphinscheduler-ui-next/src/locales/modules/en_US.ts
  2. 1
      dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
  3. 4
      dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-dependent.ts

1
dolphinscheduler-ui-next/src/locales/modules/en_US.ts

@ -847,6 +847,7 @@ const project = {
last_saturday: 'LastSaturday', last_saturday: 'LastSaturday',
last_sunday: 'LastSunday', last_sunday: 'LastSunday',
this_month: 'ThisMonth', this_month: 'ThisMonth',
this_month_begin: 'ThisMonthBegin',
last_month: 'LastMonth', last_month: 'LastMonth',
last_month_begin: 'LastMonthBegin', last_month_begin: 'LastMonthBegin',
last_month_end: 'LastMonthEnd', last_month_end: 'LastMonthEnd',

1
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts

@ -837,6 +837,7 @@ const project = {
last_saturday: '上周六', last_saturday: '上周六',
last_sunday: '上周日', last_sunday: '上周日',
this_month: '本月', this_month: '本月',
this_month_begin: '本月初',
last_month: '上月', last_month: '上月',
last_month_begin: '上月初', last_month_begin: '上月初',
last_month_end: '上月末', last_month_end: '上月末',

4
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', value: 'thisMonth',
label: t('project.node.this_month') label: t('project.node.this_month')
}, },
{
value: 'thisMonthBegin',
label: t('project.node.this_month_begin')
},
{ {
value: 'lastMonth', value: 'lastMonth',
label: t('project.node.last_month') label: t('project.node.last_month')

Loading…
Cancel
Save