fix：修改 表达式模板的按钮顺序 修改mib表格无法编辑的问题 修改 alert rule methods的显示问题

nezha-fronted/src/components/common/language/cn.js

@@ -103,6 +103,7 @@ const cn = {
     SyncSave: '保存同时更新 Assets',
     copySuccess: '复制成功',
     moreOption: '更多选项',
+    copy: '复制',
     silence: '静默'
   },
   setup: {

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',

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
     },

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
       }

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,

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>

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
     }
   }
 }

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"

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>