From 331da887f386352e1e57dbb29bc7443c1b23f2b0 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 20 Sep 2022 11:06:07 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2207=20feat=EF=BC=9Aalert=20rule=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/popBox/topToolMoreOptions.vue      | 36 +++++++++++++++----
 .../common/rightBox/chart/chartConfig.vue     |  3 +-
 .../common/table/alert/alertRuleTable.vue     |  4 +--
 .../src/components/page/alert/alertRule.vue   |  5 ++-
 .../page/dashboard/explore/promqlInput.vue    |  1 +
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 039135ccc..dbbd56e57 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -240,20 +240,44 @@ export default {
     language () { return this.$store.getters.getLanguage },
     // 显示新版导入
     importType () {
-      // asset module endpoint dc cabinet model
-      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
+      // asset module endpoint dc cabinet model alertRule
+      const arr = [
+        '/asset/asset/import',
+        '/monitor/module/import',
+        '/monitor/endpoint/import',
+        '/dc/import',
+        '/dc/cabinet/import',
+        '/asset/model/import',
+        '/alert/rule/import'
+      ]
       return arr.some(item => item === this.importUrl)
     },
     // 已存在的内容处理方式
     showEexisted () {
-      // asset module endpoint dc cabinet model
-      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
+      // asset module endpoint dc cabinet model alertRule
+      const arr = [
+        '/asset/asset/import',
+        '/monitor/module/import',
+        '/monitor/endpoint/import',
+        '/dc/import',
+        '/dc/cabinet/import',
+        '/asset/model/import',
+        '/alert/rule/import'
+      ]
       return arr.some(item => item === this.importUrl)
     },
     // 遇到错误是否继续导入
     showIgnoreError () {
-      // asset module endpoint dc cabinet model
-      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
+      // asset module endpoint dc cabinet model alertRule
+      const arr = [
+        '/asset/asset/import',
+        '/monitor/module/import',
+        '/monitor/endpoint/import',
+        '/dc/import',
+        '/dc/cabinet/import',
+        '/asset/model/import',
+        '/alert/rule/import'
+      ]
       return arr.some(item => item === this.importUrl)
     },
     // 是否同步更新关联的dashboard
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 2cb2fe53a..845ebc9a2 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -76,8 +76,7 @@
           </div>
           <transition name="el-zoom-in-top">
             <el-row v-show="expressionsShow[index-1].show" style="margin-bottom: 10px">
-              <el-form-item :prop="'elements.' + (index -1) + '.expression'"
-                            :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}">
+              <el-form-item :prop="'elements.' + (index -1) + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}">
                 <promql-input
                   :from-father-data="true"
                   :metricOptionsParent="metricOptions"
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 2c295049a..ab6c36ad3 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -39,7 +39,7 @@
       </template>
       <template slot-scope="scope" :column="item">
         <span v-if="item.prop === 'severity'&&scope.row[item.prop]" class="severity">
-            <i class="nz-icon nz-icon-circle" :style="{color:scope.row[item.prop].color,'font-size':'12px','margin-right':'5px'}"></i> {{scope.row[item.prop].name}}
+          <i class="nz-icon nz-icon-circle" :style="{color:scope.row[item.prop].color,'font-size':'12px','margin-right':'5px'}"></i> {{scope.row[item.prop].name}}
         </span>
         <template v-else-if="item.prop === 'alertNum'">
           <span style="cursor: pointer" @click="queryMessage(scope.row)">
@@ -157,7 +157,7 @@
       </div>
     </el-table-column>
     <template slot="empty">
-      <div  v-if="!loading"  class="table-no-data">
+      <div v-if="!loading" class="table-no-data">
         <svg class="icon" aria-hidden="true">
           <use xlink:href="#nz-icon-no-data-list"></use>
         </svg>
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index 8133c204e..eed8b71e9 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -63,7 +63,7 @@
         >
           <template>
             <el-input-number ref="jumpInput" v-model="pageObj.pageNo" :controls="false" :min="1" :max="pageObj.pages" class="jump-input" @change="getTableData" @keyup.enter.native="getTableData" size="mini"/>
-            <span class="jump-pages">/&nbsp{{pageObj.pages}}</span>
+            <span class="jump-pages">/&nbsp;{{pageObj.pages}}</span>
           </template>
         </el-pagination>
       </template>
@@ -81,8 +81,7 @@
       @getTableData="getTableData"
     >
       <template v-slot:top-tool-right>
-        <button id="alert-add" v-has="'alertRule_add'" :title="$t('overall.createAlertRule')" class="top-tool-btn"
-                @click="add">
+        <button id="alert-add" v-has="'alertRule_add'" :title="$t('overall.createAlertRule')" class="top-tool-btn"  @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
         <top-tool-more-options
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 8c831cde2..2e9d5588f 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -712,6 +712,7 @@ export default {
         this.codeMirrorValue[this.index] = ''
         // this.expressionList[this.index] = ''
         this.$set(this.expressionList, this.index, '')
+        this.$emit('change', '')
       }
     },
     newDoc (val) {