From ba854123d463744d6008cf45fee87a83976d7a97 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 11 May 2021 20:47:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E6=A8=A1=E6=9D=BF=E7=9A=84=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=20=E4=BF=AE=E6=94=B9mib=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20alert=20rule=20methods=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js        | 1 +
 nezha-fronted/src/components/common/language/en.js        | 1 +
 nezha-fronted/src/components/common/mixin/dataList.js     | 8 ++++++++
 nezha-fronted/src/components/common/mixin/table.js        | 4 ++++
 .../src/components/common/table/alert/alertRuleTable.vue  | 6 +++++-
 .../components/common/table/settings/exprTmplTable.vue    | 4 ++--
 nezha-fronted/src/components/page/config/mib.vue          | 4 ++++
 .../src/components/page/config/template/exprTemp.vue      | 2 +-
 .../src/components/page/config/template/index.vue         | 2 +-
 9 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 428811a4d..9b1092554 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -103,6 +103,7 @@ const cn = {
     SyncSave: '保存同时更新 Assets',
     copySuccess: '复制成功',
     moreOption: '更多选项',
+    copy: '复制',
     silence: '静默'
   },
   setup: {
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index b3cdb0d62..d747d7b9f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -110,6 +110,7 @@ const en = {
     dc: 'Data center',
     labels: 'Labels',
     moreOption: 'More option',
+    copy: 'Copy',
     silence: 'Silence'
   },
   pageSize: '/page',
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index c232302f9..981c96a9f 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -49,6 +49,10 @@ export default {
           this.del(row)
           break
         }
+        case 'copy': {
+          this.copy(row)
+          break
+        }
         default:
           break
       }
@@ -135,6 +139,10 @@ export default {
         }
       })
     },
+    copy (u) {
+      this.object = { ...u, name: 'Copy from ' + u.name, id: '' }
+      this.rightBox.show = true
+    },
     esc () {
       this.rightBox.show = false
     },
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index aa3883e47..87d05e3ad 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -46,6 +46,10 @@ export default {
           this.$emit('duplicate', row)
           break
         }
+        case 'copy': {
+          this.$emit('copy', row)
+          break
+        }
         default:
           break
       }
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 31edd581e..f365d89ba 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -44,6 +44,10 @@
           </span>
         </template>
         <template v-else-if="item.prop === 'threshold'">{{formatThreshold(scope.row[item.prop], scope.row.unit)}}</template>
+        <template v-else-if="item.prop === 'method'">
+          <span v-if="scope.row.methods">{{scope.row.methods.map(label=>label.name).join(',')}}</span>
+          <span v-else>-</span>
+        </template>
         <template v-else-if="item.prop === 'receivers'">
           <el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.userName" :key="index" class="alert-rule-tag" effect="dark" size="mini">{{user.userName}}&nbsp;</el-tag>
         </template>
@@ -123,7 +127,7 @@ export default {
           prop: 'description',
           show: true
         }, {
-          label: this.$t('alert.message'),
+          label: this.$t('alert.alert'),
           prop: 'alertNum',
           show: true,
           width: 150,
diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
index 19042caa9..1c6d85091 100644
--- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
@@ -44,13 +44,13 @@
       fixed="right">
       <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
       <div slot-scope="scope" class="table-operation-items">
-        <button class="table-operation-item" title="Copy" @click="tableOperation('copy', scope.row)"><i class="nz-icon nz-icon-override"></i></button>
+        <button class="table-operation-item" title="Edit" @click="tableOperation(['edit', scope.row])"><i class="nz-icon nz-icon-edit"></i></button>
         <el-dropdown size="medium" trigger="hover" @command="tableOperation">
           <div class="table-operation-item table-operation-item--more">
             <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+            <el-dropdown-item :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.copy')}}</span></el-dropdown-item>
             <el-dropdown-item :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index 82a1f601b..d394b56f9 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -106,6 +106,10 @@ export default {
     },
     toBrowserTab () {
       this.$emit('toBrowserTab')
+    },
+    edit (u) {
+      this.object = { ...u }
+      this.rightBox.show = true
     }
   }
 }
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index 95c306222..5f0d5889b 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -48,7 +48,7 @@
           :table-data="tableData"
           @del="del"
           @edit="edit"
-          @copy="(row) => {copyRow(row, 'exprTmpl')}"
+          @copy="(row) => {copy(row)}"
           @orderBy="tableDataSort"
           @reload="getTableData"
           @selectionChange="selectionChange"
diff --git a/nezha-fronted/src/components/page/config/template/index.vue b/nezha-fronted/src/components/page/config/template/index.vue
index ac85846a8..01a8d2b05 100644
--- a/nezha-fronted/src/components/page/config/template/index.vue
+++ b/nezha-fronted/src/components/page/config/template/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <exprTemp class="template-tab" :show-tab="showTab" v-if="showTab == 'exprTemp'" @changeShowTab="changeShowTab" @toCredentialTab="changeTab(['mib','credentials'],'credentials')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></exprTemp>
+    <exprTemp class="template-tab" :show-tab="showTab" v-show="showTab == 'exprTemp'" @changeShowTab="changeShowTab" @toCredentialTab="changeTab(['mib','credentials'],'credentials')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></exprTemp>
     <chartTemp class="template-tab" :show-tab="showTab" v-if="showTab == 'chartTemp'" @changeShowTab="changeShowTab" @toCredentialTab="changeTab(['mib','credentials'],'credentials')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></chartTemp>
   </div>
 </template>