From d2b65e104ee3be18cbb1e398a14da3302fcf80d8 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 23 Apr 2020 17:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E8=A1=A8=E6=A0=BC=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsTableOperator.vue     | 35 +++++++++++++++++++
 .../components/MsTableOperatorButton.vue      | 34 ++++++++++++++++++
 .../business/components/project/MsProject.vue |  6 ++--
 .../track/case/components/TestCaseList.vue    |  5 +--
 .../track/plan/components/TestPlanList.vue    | 12 +++----
 .../view/comonents/TestPlanTestCaseList.vue   |  5 +--
 6 files changed, 83 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/business/components/common/components/MsTableOperator.vue
 create mode 100644 frontend/src/business/components/common/components/MsTableOperatorButton.vue

diff --git a/frontend/src/business/components/common/components/MsTableOperator.vue b/frontend/src/business/components/common/components/MsTableOperator.vue
new file mode 100644
index 0000000000..64e24bbed2
--- /dev/null
+++ b/frontend/src/business/components/common/components/MsTableOperator.vue
@@ -0,0 +1,35 @@
+<template>
+  <span>
+    <ms-table-operator-button icon="el-icon-edit"
+                              @click="editClick" @click.stop="editClickStop"/>
+    <ms-table-operator-button icon="el-icon-delete" type="danger"
+                              @click="deletClick" @click.stop="deleteClickStop"/>
+  </span>
+
+</template>
+
+<script>
+    import MsTableOperatorButton from "./MsTableOperatorButton";
+    export default {
+      name: "MsTableOperator",
+      components: {MsTableOperatorButton},
+      methods: {
+        editClick() {
+          this.$emit('editClick');
+        },
+        editClickStop() {
+          this.$emit('editClickStop');
+        },
+        deletClick() {
+          this.$emit('deleteClick');
+        },
+        deleteClickStop() {
+          this.$emit('deleteClickStop');
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/common/components/MsTableOperatorButton.vue b/frontend/src/business/components/common/components/MsTableOperatorButton.vue
new file mode 100644
index 0000000000..6822549330
--- /dev/null
+++ b/frontend/src/business/components/common/components/MsTableOperatorButton.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-button @click="click"
+             @click.stop="clickStop" :type="type"
+             :icon="icon" size="mini" circle/>
+</template>
+
+<script>
+  import MsTableButton from "./MsTableButton";
+  export default {
+    name: "MsTableOperatorButton",
+    components: {MsTableButton},
+    props: {
+      icon: {
+        type: String,
+        default: 'el-icon-question'
+      },
+      type: {
+        type: String,
+        default: 'primary'
+      }
+    },
+    methods: {
+      click() {
+        this.$emit('click');
+      },
+      clickStop() {
+        this.$emit('clickStop');
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index edf405de6b..72c012e6df 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -12,8 +12,7 @@
           <el-table-column prop="workspaceName" label="所属工作空间"/>
           <el-table-column>
             <template v-slot:default="scope">
-              <el-button @click="edit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
-              <el-button @click="del(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
+              <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -48,10 +47,11 @@
   import {TokenKey} from "../../../common/js/constants";
   import MsTablePagination from "../common/pagination/TablePagination";
   import MsTableHeader from "../common/components/MsTableHeader";
+  import MsTableOperator from "../common/components/MsTableOperator";
 
   export default {
     name: "MsProject",
-    components: {MsCreateBox, MsTablePagination, MsTableHeader},
+    components: {MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader},
     data() {
       return {
         createVisible: false,
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 758dc100ad..dd9fd93de5 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -79,8 +79,7 @@
         <el-table-column
           :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <el-button @click="handleEdit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
-            <el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
+            <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -103,10 +102,12 @@
   import PriorityTableItem from "../../common/TableItems/PriorityTableItem";
   import TypeTableItem from "../../common/TableItems/TypeTableItem";
   import MethodTableItem from "../../common/TableItems/MethodTableItem";
+  import MsTableOperator from "../../../common/components/MsTableOperator";
 
   export default {
     name: "TestCaseList",
     components: {
+      MsTableOperator,
       MethodTableItem,
       TypeTableItem,
       PriorityTableItem,
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index b1cc80be66..41cc875c10 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -63,12 +63,7 @@
           <el-table-column
             :label="$t('commons.operating')">
             <template v-slot:default="scope">
-              <el-button @click="handleEdit(scope.row)"
-                         @click.stop="deleteVisible = true" type="primary"
-                         icon="el-icon-edit" size="mini" circle/>
-              <el-button @click="handleDelete(scope.row)"
-                         @click.stop="deleteVisible = true" type="danger"
-                         icon="el-icon-delete" size="mini" circle/>
+              <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -85,10 +80,13 @@
   import MsCreateBox from '../../../settings/CreateBox';
   import MsTablePagination from '../../../../components/common/pagination/TablePagination';
   import MsTableHeader from "../../../common/components/MsTableHeader";
+  import MsDialogFooter from "../../../common/components/MsDialogFooter";
+  import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
+  import MsTableOperator from "../../../common/components/MsTableOperator";
 
   export default {
       name: "TestPlanList",
-      components: {MsTableHeader, MsCreateBox, MsTablePagination},
+      components: {MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsCreateBox, MsTablePagination},
       data() {
         return {
           result: {},
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
index 046d1d5c33..727b83222a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
@@ -89,8 +89,7 @@
         <el-table-column
           :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <el-button @click="handleEdit(scope.row, scope.$index)" type="primary" icon="el-icon-edit" size="mini" circle/>
-            <el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-unlock" size="mini" circle/>
+            <ms-table-operator @editClick="handleEdit(scope.row, scope.$index)" @deleteClick="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -122,10 +121,12 @@
   import StatusTableItem from "../../../common/TableItems/StatusTableItem";
   import TypeTableItem from "../../../common/TableItems/TypeTableItem";
   import MethodTableItem from "../../../common/TableItems/MethodTableItem";
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
 
   export default {
       name: "TestPlanTestCaseList",
       components: {
+        MsTableOperator,
         MethodTableItem,
         TypeTableItem,
         StatusTableItem,