From 7d99ac3e8b2f288044e283e3a10e2986972750a7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 23 Apr 2020 12:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/case/TestCase.vue        |  2 +-
 .../track/case/components/TestCaseImport.vue  | 10 ++++---
 .../track/case/components/TestCaseList.vue    | 28 ++++++++-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index e0b4e9f14c..d6c42790e7 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -31,7 +31,7 @@
         </el-container>
 
         <test-case-edit
-          @refresh="refreshTable"
+          @refresh="refresh"
           :tree-nodes="treeNodes"
           ref="testCaseEditDialog">
         </test-case-edit>
diff --git a/frontend/src/business/components/track/case/components/TestCaseImport.vue b/frontend/src/business/components/track/case/components/TestCaseImport.vue
index 6dc796dda9..c2e21574f6 100644
--- a/frontend/src/business/components/track/case/components/TestCaseImport.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseImport.vue
@@ -1,9 +1,8 @@
 <template>
 
   <div>
-    <el-tooltip class="item" effect="dark" :content="$t('test_track.case.import.import')" placement="right">
-      <el-button type="info" icon="el-icon-upload2" size="mini" circle
-        @click="dialogVisible = true"></el-button></el-tooltip>
+
+    <ms-table-button icon="el-icon-upload2" :content="$t('test_track.case.import.import')" @click="dialogVisible = true"/>
 
     <el-dialog width="30%" :title="$t('test_track.case.import.case_import')" :visible.sync="dialogVisible"
                @close="init">
@@ -48,9 +47,12 @@
 
 <script>
     import ElUploadList from "element-ui/packages/upload/src/upload-list";
+    import MsTableButton from '../../../../components/common/components/MsTableButton';
+
+
     export default {
       name: "TestCaseImport",
-      components: {ElUploadList},
+      components: {ElUploadList, MsTableButton},
       data() {
         return {
           dialogVisible: false,
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index b8a24b8e2d..2e53459a85 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -3,22 +3,18 @@
   <div>
     <el-card v-loading="result.loading">
       <template v-slot:header>
-        <div>
-          <el-row type="flex" justify="space-between" align="middle">
 
-            <node-breadcrumb
-              :node-names="selectNodeNames"
-              @refresh="refresh"/>
+        <ms-table-header :condition.sync="condition" @search="initTableData"
+                         :create-tip="$t('test_track.case.create')" @create="testCaseCreate">
+          <template v-slot:title>
+            <node-breadcrumb class="table-title" :node-names="selectNodeNames" @refresh="refresh"/>
+          </template>
+          <template v-slot:button>
+            <test-case-import :projectId="currentProject == null? null : currentProject.id" @refresh="refresh"/>
+            <!--<test-case-export/>-->
+          </template>
+        </ms-table-header>
 
-            <span class="operate-button">
-              <ms-create-box :tips="$t('test_track.case.create')" :exec="testCaseCreate"/>
-              <test-case-import :projectId="currentProject == null? null : currentProject.id"
-                                @refresh="refresh"/>
-              <test-case-export/>
-              <ms-table-search-bar :condition.sync="condition" @change="initTableData"/>
-            </span>
-          </el-row>
-        </div>
       </template>
 
       <el-table
@@ -92,12 +88,12 @@
   import TestCaseImport from '../components/TestCaseImport';
   import TestCaseExport from '../components/TestCaseExport';
   import MsTablePagination from '../../../../components/common/pagination/TablePagination';
-  import MsTableSearchBar from '../../../../components/common/components/MsTableSearchBar';
   import NodeBreadcrumb from '../../common/NodeBreadcrumb';
+  import MsTableHeader from '../../../../components/common/components/MsTableHeader';
 
   export default {
     name: "TestCaseList",
-    components: {MsCreateBox, TestCaseImport, TestCaseExport, MsTablePagination, NodeBreadcrumb, MsTableSearchBar},
+    components: {MsCreateBox, TestCaseImport, TestCaseExport, MsTablePagination, NodeBreadcrumb, MsTableHeader},
     data() {
       return {
         result: {},