From 61f8123b4a8775779c90d69bf46d02877744ddba Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 22 Sep 2022 10:19:30 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2210=20feat=EF=BC=9Arecord=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

---
 nezha-fronted/src/assets/css/common.scss      |  5 +-
 .../common/popBox/topToolMoreOptions.vue      | 70 ++++---------------
 .../src/components/page/config/recordRule.vue |  7 +-
 3 files changed, 21 insertions(+), 61 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 89029076d..c1737856a 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -322,9 +322,12 @@ td .nz-icon-gear:before {
       background-color: $--background-color-empty;
       border: 1px solid $--border-color-light;
     }
-    .el-button:hover {
+    .el-button:hover:not(.nz-btn-disabled) {
       border: 1px solid $--color-primary;
     }
+    .el-button.nz-btn-disabled{
+      color: $--color-text-regular !important;
+    }
     .el-button:nth-child(3) {
       margin-left: 10px;
     }
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 46d85d805..98ba47603 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -74,7 +74,7 @@
                   <i class="el-icon-arrow-down el-icon--right"></i>
                 </button>
               </el-popover>
-              <button  :id="id+'-xlsx-import-add'" :class="{'nz-btn-disabled':prevent_opt.import}" :disabled="prevent_opt.import" class="nz-btn el-button el-button--default el-button--small" @click="importExcel">
+              <button :id="id+'-xlsx-import-add'" :class="{'nz-btn-disabled':prevent_opt.import}" :disabled="prevent_opt.import" class="nz-btn el-button el-button--default el-button--small" @click="importExcel">
                 <span>{{$t('overall.importExcel')}}</span>
               </button>
               <button :id="id+'-xlsx-import-esc'" class="nz-btn el-button el-button--default el-button--small" @click="closeDialog">
@@ -98,7 +98,7 @@
               <button :id="id+'-xlsx-import-template'" class="nz-btn el-button el-button--default el-button--small" @click="downloadTemplate()">
                 <span>{{$t('upload.template')}}</span>
               </button>
-              <button  :id="id+'-xlsx-import-add'" :class="{'nz-btn-disabled':prevent_opt.import}" :disabled="prevent_opt.import" class="nz-btn el-button el-button--default el-button--small" @click="importExcel">
+              <button :id="id+'-xlsx-import-add'" :class="{'nz-btn-disabled':prevent_opt.import}" :disabled="prevent_opt.import" class="nz-btn el-button el-button--default el-button--small" @click="importExcel">
                 <span>{{$t('overall.importExcel')}}</span>
               </button>
               <button :id="id+'-xlsx-import-esc'" class="nz-btn el-button el-button--default el-button--small" @click="closeDialog">
@@ -234,64 +234,22 @@ export default {
     deleteObjs: Array,
     exportBoxShow: {
       type: Boolean, default: false
+    },
+    // 显示新版导入
+    importNew: {
+      type: Boolean, default: true
+    },
+    // 已存在的内容处理方式
+    showEexisted: {
+      type: Boolean, default: true
+    },
+    // 遇到错误是否继续导入
+    showIgnoreError: {
+      type: Boolean, default: true
     }
   },
   computed: {
     language () { return this.$store.getters.getLanguage },
-    // 显示新版导入
-    importNew () {
-      // asset module endpoint dc cabinet model alertRule ipamSubnet ipamIp panel expression
-      const arr = [
-        '/asset/asset/import',
-        '/monitor/module/import',
-        '/monitor/endpoint/import',
-        '/dc/import',
-        '/dc/cabinet/import',
-        '/asset/model/import',
-        '/alert/rule/import',
-        '/ipam/subnet/import',
-        '/ipam/ip/import',
-        '/visual/panel/import',
-        '/expression/tmpl/import'
-      ]
-      return arr.some(item => item === this.importUrl)
-    },
-    // 已存在的内容处理方式
-    showEexisted () {
-      // asset module endpoint dc cabinet model alertRule ipamSubnet ipamIp panel expression
-      const arr = [
-        '/asset/asset/import',
-        '/monitor/module/import',
-        '/monitor/endpoint/import',
-        '/dc/import',
-        '/dc/cabinet/import',
-        '/asset/model/import',
-        '/alert/rule/import',
-        '/ipam/subnet/import',
-        '/ipam/ip/import',
-        '/visual/panel/import',
-        '/expression/tmpl/import'
-      ]
-      return arr.some(item => item === this.importUrl)
-    },
-    // 遇到错误是否继续导入
-    showIgnoreError () {
-      // asset module endpoint dc cabinet model alertRule ipamSubnet ipamIp panel expression
-      const arr = [
-        '/asset/asset/import',
-        '/monitor/module/import',
-        '/monitor/endpoint/import',
-        '/dc/import',
-        '/dc/cabinet/import',
-        '/asset/model/import',
-        '/alert/rule/import',
-        '/ipam/subnet/import',
-        '/ipam/ip/import',
-        '/visual/panel/import',
-        '/expression/tmpl/import'
-      ]
-      return arr.some(item => item === this.importUrl)
-    },
     // 是否同步更新关联的dashboard
     showSyncDashboard () {
       // asset endpoint model
diff --git a/nezha-fronted/src/components/page/config/recordRule.vue b/nezha-fronted/src/components/page/config/recordRule.vue
index 7c1acd393..d4cb0d97a 100644
--- a/nezha-fronted/src/components/page/config/recordRule.vue
+++ b/nezha-fronted/src/components/page/config/recordRule.vue
@@ -20,9 +20,9 @@
           id="record-rule"
           :params="searchLabel"
           :permissions="{
-                  import: 'record_rule_add',
-                  export: 'record_rule_edit'
-                }"
+            import: 'record_rule_add',
+            export: 'record_rule_edit'
+          }"
           class="top-tool-export margin-l-10 margin-r-10"
           export-file-name="record-rule"
           export-url="/record/rule/export"
@@ -76,7 +76,6 @@
 </template>
 
 <script>
-import bus from '@/libs/bus'
 import nzDataList from '@/components/common/table/nzDataList'
 import dataListMixin from '@/components/common/mixin/dataList'
 import routerPathParams from '@/components/common/mixin/routerPathParams'