Browse Source

[improvement] improve relation between notification strategy and alarm group on ui (#12200)

* [improvement] improve relation between notification strategy and alarm group

* [improvement] change to use ```&&```

Co-authored-by: Jackie <‘2875334588@qq.com’>
3.2.0-release
fuchanghai 2 years ago committed by GitHub
parent
commit
c7d9719e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx
  2. 4
      dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx

4
dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx

@ -323,7 +323,7 @@ export default defineComponent({
clearable clearable
/> />
</NFormItem> </NFormItem>
<NFormItem {this.startForm.warningType !== 'NONE' && (<NFormItem
label={t('project.workflow.alarm_group')} label={t('project.workflow.alarm_group')}
path='warningGroupId' path='warningGroupId'
> >
@ -333,7 +333,7 @@ export default defineComponent({
v-model:value={this.startForm.warningGroupId} v-model:value={this.startForm.warningGroupId}
clearable clearable
/> />
</NFormItem> </NFormItem>)}
<NFormItem <NFormItem
label={t('project.workflow.complement_data')} label={t('project.workflow.complement_data')}
path='complement_data' path='complement_data'

4
dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx

@ -378,7 +378,7 @@ export default defineComponent({
clearable clearable
/> />
</NFormItem> </NFormItem>
<NFormItem {this.timingForm.warningType !== 'NONE' && ( <NFormItem
label={t('project.workflow.alarm_group')} label={t('project.workflow.alarm_group')}
path='warningGroupId' path='warningGroupId'
> >
@ -388,7 +388,7 @@ export default defineComponent({
v-model:value={this.timingForm.warningGroupId} v-model:value={this.timingForm.warningGroupId}
clearable clearable
/> />
</NFormItem> </NFormItem> )}
</NForm> </NForm>
</Modal> </Modal>
) )

Loading…
Cancel
Save