From c7d9719e97a9c37eed77e59e9a669653e5edeb73 Mon Sep 17 00:00:00 2001
From: fuchanghai <33984497+fuchanghai@users.noreply.github.com>
Date: Thu, 29 Sep 2022 11:22:10 +0800
Subject: [PATCH] [improvement] improve relation between notification strategy
 and alarm group on ui (#12200)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

Co-authored-by: Jackie <‘2875334588@qq.com’>
---
 .../projects/workflow/definition/components/start-modal.tsx   | 4 ++--
 .../projects/workflow/definition/components/timing-modal.tsx  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx
index ab3e590983..6de60e00c8 100644
--- a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx
+++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx
@@ -323,7 +323,7 @@ export default defineComponent({
               clearable
             />
           </NFormItem>
-          <NFormItem
+          {this.startForm.warningType !== 'NONE' && (<NFormItem
             label={t('project.workflow.alarm_group')}
             path='warningGroupId'
           >
@@ -333,7 +333,7 @@ export default defineComponent({
               v-model:value={this.startForm.warningGroupId}
               clearable
             />
-          </NFormItem>
+          </NFormItem>)}
           <NFormItem
             label={t('project.workflow.complement_data')}
             path='complement_data'
diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
index 1e1a933fe5..ba9ae72fa2 100644
--- a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
+++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
@@ -378,7 +378,7 @@ export default defineComponent({
               clearable
             />
           </NFormItem>
-          <NFormItem
+          {this.timingForm.warningType !== 'NONE' && ( <NFormItem
             label={t('project.workflow.alarm_group')}
             path='warningGroupId'
           >
@@ -388,7 +388,7 @@ export default defineComponent({
               v-model:value={this.timingForm.warningGroupId}
               clearable
             />
-          </NFormItem>
+          </NFormItem> )}
         </NForm>
       </Modal>
     )