From 31d832a847b10081e44e3fbb33283039af4e5af3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 9 Sep 2021 10:43:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20alertRuleBox=20type=20=E4=B8=BA?=
 =?UTF-8?q?=20SNMP=20trap=E6=97=B6Evaluation=20interval=20=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/alertRuleBox.vue  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index 73d99d5bb..ac928c9a4 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -20,7 +20,7 @@
           <!--type-->
           <el-form-item :label="$t('overall.type')" prop="type" class="half-form-item">
             <el-select
-              v-model="editAlertRule.type"
+              v-model="fromData.status"
               class="right-box__select"
               popper-class="right-box-select-dropdown prevent-clickoutside"
               size="small"
@@ -246,6 +246,7 @@
               :popper-append-to-body="false"
               popper-class="prevent-clickoutside"
               size="small"
+              @change="receiverAndNotifyValidate"
             >
               <el-option
                 :label="$t('dashboard.panel.chartForm.lockList.on')"
@@ -267,6 +268,7 @@
               :popper-append-to-body="false"
               popper-class="prevent-clickoutside"
               size="small"
+              @change="receiverAndNotifyValidate"
             >
               <el-option
                 :label="$t('dashboard.panel.chartForm.lockList.on')"
@@ -574,6 +576,12 @@ export default {
         callback()
       }
     },
+    receiverAndNotifyValidate () {
+      if (!this.editAlertRule.notifyExpired && !this.editAlertRule.notifyActive) {
+        this.$refs.alertRuleForm.clearValidate('receiver')
+        this.$refs.alertRuleForm.clearValidate('method')
+      }
+    },
     selectAlertRuleMetric (val) {
       if (val === 'Metrics') {
         this.MetricsType = 1 // type = 1
@@ -587,6 +595,7 @@ export default {
         this.$refs.alertRuleForm.clearValidate('expr') // 移除from表单的 expr 验证
       } else if (val === 'SNMP trap') {
         this.showSnmpTrap = false // showSnmpTrap 为 false 时,展示 OID
+        this.editAlertRule.inr = ''
         this.MetricsType = 3 // type = 3
       }
     },
@@ -621,6 +630,7 @@ export default {
             this.fromData.status = 'SNMP trap'
             this.showSnmpTrap = false // showSnmpTrap 为 false 时,展示 OID
             this.MetricsType = 3 // 默认保存 type
+            this.editAlertRule.inr = ''
             return
           }
           this.$nextTick(() => {