Browse Source

worked out the issue (#14588)

3.2.1-prepare
calvin 1 year ago committed by GitHub
parent
commit
50386d622c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      dolphinscheduler-ui/src/views/projects/preference/components/use-alert-group.ts
  2. 3
      dolphinscheduler-ui/src/views/projects/preference/components/use-tenant.ts
  3. 12
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-environment-name.ts

3
dolphinscheduler-ui/src/views/projects/preference/components/use-alert-group.ts

@ -42,7 +42,6 @@ export function useAlertGroup(): IJsonItem {
field: 'alertGroups', field: 'alertGroups',
span: 12, span: 12,
name: t('project.workflow.alarm_group'), name: t('project.workflow.alarm_group'),
options: options, options: options
value: 'default'
} }
} }

3
dolphinscheduler-ui/src/views/projects/preference/components/use-tenant.ts

@ -42,7 +42,6 @@ export function useTenant(): IJsonItem {
field: 'tenant', field: 'tenant',
span: 12, span: 12,
name: t('project.workflow.tenant_code'), name: t('project.workflow.tenant_code'),
options: options, options: options
value: 'default'
} }
} }

12
dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-environment-name.ts

@ -68,9 +68,21 @@ export function useEnvironmentName(
options.value = environmentList.filter((option: IEnvironmentNameOption) => options.value = environmentList.filter((option: IEnvironmentNameOption) =>
filterByWorkerGroup(option) filterByWorkerGroup(option)
) )
if (model?.environmentCode) {
if (options.value) {
let elementExists =
options.value.find(
(item) => item.value === model.environmentCode
) !== undefined
if (!elementExists) {
model.environmentCode = null
}
}
} else {
model.environmentCode = model.environmentCode =
options.value.length === 0 ? null : options.value[0].value options.value.length === 0 ? null : options.value[0].value
} }
}
) )
onMounted(async () => { onMounted(async () => {

Loading…
Cancel
Save