From c0e9effe1558d7993b9ad438ef0cc4a47facb1b9 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 4 Apr 2022 15:06:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=85=A8=E9=80=89=E6=97=B6=E7=9A=84=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/table/MsTable.vue       |   4 +-
 .../track/case/components/ShowMoreBtn.vue     | 134 +++++++++---------
 2 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index 9f3cf83e1c..dbbb52763c 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -307,7 +307,9 @@ export default {
     initData(){
       //初始化数据是否显示提示块
       if(this.data && this.data.length > 0){
-        this.data[0].showBatchTip = true;
+        this.$nextTick(() => {
+          this.data[0].showBatchTip = true;
+        });
       }
     },
     // 批量操作提示, 第一次勾选提示, 之后不提示
diff --git a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
index 85ff560faf..210c1a7b1c 100644
--- a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
+++ b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
@@ -1,18 +1,20 @@
 <template>
-  <div v-if="isShow">
-<!--  <div :style="isShow? {} : {display: 'none'}">-->
+  <div>
     <el-dropdown placement="bottom" trigger="click" size="medium">
       <div @click.stop class="show-more-btn">
-        <el-tooltip popper-class="batch-popper" :value="true && !hasShowed" effect="dark" :content="$t('test_track.case.batch_operate')"
+        <el-tooltip v-if="isShow"
+                    :value="!hasShowed"
+                    effect="dark"
+                    :content="$t('test_track.case.batch_operate')"
                     placement="top-start">
           <i class="el-icon-more ms-icon-more table-more-icon"/>
         </el-tooltip>
       </div>
       <el-dropdown-menu slot="dropdown" class="dropdown-menu-class">
-        <div class="show-more-btn-title">{{$t('test_track.case.batch_handle', [size])}}</div>
-        <span  v-for="(btn,index) in buttons" :key="index">
-          <el-dropdown-item :disabled="isDisable(btn)" v-if="isXPack(btn)"  @click.native.stop="click(btn)">
-           {{btn.name}}
+        <div class="show-more-btn-title">{{ $t('test_track.case.batch_handle', [size]) }}</div>
+        <span v-for="(btn,index) in buttons" :key="index">
+          <el-dropdown-item :disabled="isDisable(btn)" v-if="isXPack(btn)" @click.native.stop="click(btn)">
+           {{ btn.name }}
           </el-dropdown-item>
         </span>
       </el-dropdown-menu>
@@ -23,80 +25,78 @@
 <script>
 import {hasLicense, hasPermissions} from "@/common/js/utils";
 
-  export default {
-    name: "ShowMoreBtn",
-    data() {
-      return {
-        disabled: false,
-      };
+export default {
+  name: "ShowMoreBtn",
+  data() {
+    return {
+      disabled: false,
+    };
+  },
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false
     },
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false
-      },
-      buttons: Array,
-      row: Object,
-      size: Number,
-      hasShowed: Boolean
-    },
-    created() {
-      if (this.trashEnable) {
-        this.buttons.splice(1, 1);
+    buttons: Array,
+    row: Object,
+    size: Number,
+    hasShowed: Boolean
+  },
+  created() {
+    if (this.trashEnable) {
+      this.buttons.splice(1, 1);
+    }
+  },
+  methods: {
+    click(btn) {
+      if (btn.handleClick instanceof Function) {
+        btn.handleClick();
       }
     },
-    methods: {
-      click(btn) {
-        if (btn.handleClick instanceof Function) {
-          btn.handleClick();
-        }
-      },
-      isDisable(item) {
-        if (item.isDisable) {
-          if (item.isDisable instanceof Function) {
-            console.log(item.isDisable());
-            return item.isDisable();
-          } else {
-            return item.isDisable;
-          }
-        }
-        if (item.permissions && item.permissions.length > 0) {
-          return !hasPermissions(...item.permissions);
-        }
-        return false;
-      },
-      isXPack(item) {
-        if (item.isXPack) {
-          return hasLicense();
+    isDisable(item) {
+      if (item.isDisable) {
+        if (item.isDisable instanceof Function) {
+          console.log(item.isDisable());
+          return item.isDisable();
         } else {
-          return true;
+          return item.isDisable;
         }
       }
+      if (item.permissions && item.permissions.length > 0) {
+        return !hasPermissions(...item.permissions);
+      }
+      return false;
+    },
+    isXPack(item) {
+      if (item.isXPack) {
+        return hasLicense();
+      } else {
+        return true;
+      }
     }
   }
+};
 </script>
 
 <style scoped>
-  .ms-icon-more {
-    transform: rotate(90deg);
-  }
+.ms-icon-more {
+  transform: rotate(90deg);
+}
 
-  .show-more-btn {
-    width: 20px;
-    height: 25px;
-    line-height: 25px;
-  }
+.show-more-btn {
+  width: 20px;
+}
 
-  .show-more-btn-title {
-    color: #696969;
-    background-color: #e2e2e2;
-    padding: 5px;
-  }
+.show-more-btn-title {
+  color: #696969;
+  background-color: #e2e2e2;
+  padding: 5px;
+}
 
-  .dropdown-menu-class {
-    padding: 1px 0;
-    text-align: center;
-  }
+.dropdown-menu-class {
+  padding: 1px 0;
+  text-align: center;
+}
 </style>
 <style>
 .batch-popper {