From af61afde13350349a00c592d1dbb5ae80e1584fa Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 29 Dec 2020 17:06:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=85=B3=E8=81=94=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/comonents/api/TestPlanApi.vue    |  5 +++++
 .../plan/view/comonents/api/TestPlanApiCaseList.vue  | 10 ++++++----
 .../view/comonents/api/TestPlanApiScenarioList.vue   | 12 ++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue
index 9946f3befa..7b685cebb9 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue
@@ -182,4 +182,9 @@
     margin: 5px 10px;
   }
 
+  /deep/ .run-button {
+    background-color: #409EFF;
+    border-color: #409EFF;
+  }
+
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index ab0e32236e..b959694497 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -81,8 +81,10 @@
 
         <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" align="center">
           <template v-slot:default="scope">
-            <el-button type="text" @click="singleRun(scope.row)">{{$t('api_test.run')}}</el-button>
-            <el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C">{{$t('commons.delete')}}</el-button>
+              <ms-table-operator-button class="run-button" :is-tester-permission="true" :tip="$t('api_test.run')" icon="el-icon-video-play"
+                                        @exec="singleRun(scope.row)" v-tester/>
+              <ms-table-operator-button :is-tester-permission="true" :tip="$t('test_track.plan_view.cancel_relevance')"
+                                        icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)" v-tester/>
           </template>
         </el-table-column>
 
@@ -334,7 +336,7 @@
                 this.selectRows.clear();
                 this.initTable();
                 this.$emit('refresh');
-                this.$success(this.$t('commons.delete_success'));
+                this.$success(this.$t('test_track.cancel_relevance_success'));
               });
             }
           }
@@ -414,7 +416,7 @@
       },
       handleDelete(apiCase) {
         this.$get('/test/plan/api/case/delete/' + this.planId + '/' + apiCase.id, () => {
-          this.$success(this.$t('commons.delete_success'));
+          this.$success(this.$t('test_track.cancel_relevance_success'));
           this.$emit('refresh');
           this.initTable();
         });
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index 8daa164741..797c67c839 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -51,8 +51,10 @@
                          show-overflow-tooltip/>
         <el-table-column :label="$t('commons.operating')" width="200px" v-if="!referenced">
           <template v-slot:default="{row}">
-            <el-button type="text" @click="execute(row)">{{ $t('api_test.automation.execute') }}</el-button>
-            <el-button type="text" @click="remove(row)">{{ $t('api_test.automation.remove') }}</el-button>
+            <ms-table-operator-button class="run-button" :is-tester-permission="true" :tip="$t('api_test.run')" icon="el-icon-video-play"
+                                      @exec="execute(row)" v-tester/>
+            <ms-table-operator-button :is-tester-permission="true" :tip="$t('test_track.plan_view.cancel_relevance')"
+                                      icon="el-icon-unlock" type="danger" @exec="remove(row)" v-tester/>
           </template>
         </el-table-column>
       </el-table>
@@ -81,10 +83,12 @@
   import MsTestPlanList from "../../../../../api/automation/scenario/testplan/TestPlanList";
   import TestPlanScenarioListHeader from "./TestPlanScenarioListHeader";
   import {_handleSelect, _handleSelectAll} from "../../../../../../../common/js/tableUtils";
+  import MsTableOperatorButton from "../../../../../common/components/MsTableOperatorButton";
 
   export default {
     name: "MsTestPlanApiScenarioList",
     components: {
+      MsTableOperatorButton,
       TestPlanScenarioListHeader,
       MsTablePagination, MsTableMoreBtn, ShowMoreBtn, MsTableHeader, MsTag, MsApiReportDetail, MsScenarioExtendButtons, MsTestPlanList},
     props: {
@@ -189,7 +193,7 @@
       },
       remove(row) {
         this.$get('/test/plan/scenario/case/delete/' + this.planId + '/' + row.id, () => {
-          this.$success(this.$t('commons.delete_success'));
+          this.$success(this.$t('test_track.cancel_relevance_success'));
           this.$emit('refresh');
           this.search();
         });
@@ -215,7 +219,7 @@
               this.$post('/test/plan/scenario/case/batch/delete', param, () => {
                 this.selectRows.clear();
                 this.search();
-                this.$success(this.$t('commons.delete_success'));
+                this.$success(this.$t('test_track.cancel_relevance_success'));
                 this.$emit('refresh');
               });
             }