From 12537966640726e719707cd172201976e0e4fa49 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Jun 2020 11:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/head/ApiHeaderMenus.vue    |  2 +-
 .../components/common/head/CreateTest.vue     |  3 +--
 .../head/PerformanceHeaderMenus.vue           |  2 +-
 .../performance/test/PerformanceTestPlan.vue  | 19 ++++++++-----------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index e59943b152..7246c6d84f 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -35,7 +35,7 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="center">
-          <ms-create-test v-permission="['test_manager','test_user']" :to="'/api/test/create'"/>
+          <ms-create-test :to="'/api/test/create'"/>
         </el-row>
       </el-col>
       <el-col :span="8"/>
diff --git a/frontend/src/business/components/common/head/CreateTest.vue b/frontend/src/business/components/common/head/CreateTest.vue
index 1c28a9f13d..c01577b02c 100644
--- a/frontend/src/business/components/common/head/CreateTest.vue
+++ b/frontend/src/business/components/common/head/CreateTest.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link v-if="this.show" class="create-test" :to="this.to" v-permission="this.permission">
+  <router-link class="create-test" :to="this.to" v-permission="this.permission">
     <el-button type="primary" size="small">{{this.title}}</el-button>
   </router-link>
 </template>
@@ -8,7 +8,6 @@
   export default {
     name: "MsCreateTest",
     props: {
-      show: Boolean,
       to: [String, Object],
       title: {
         type: String,
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 5813802675..cb0fc1c071 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -36,7 +36,7 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="center">
-          <ms-create-test v-permission="['test_manager','test_user']" :to="'/performance/test/create'"/>
+          <ms-create-test :to="'/performance/test/create'"/>
         </el-row>
       </el-col>
       <el-col :span="8"/>
diff --git a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
index 9e4419a759..68a5d12331 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
@@ -3,17 +3,9 @@
     <ms-main-container>
       <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <div>
-            <el-row type="flex" justify="space-between" align="middle">
-              <span class="title">{{$t('commons.test')}}</span>
-              <span class="search">
-            <el-input type="text" size="small" :placeholder="$t('load_test.search_by_name')"
-                      prefix-icon="el-icon-search"
-                      maxlength="60"
-                      v-model="condition.name" @change="search" clearable/>
-          </span>
-            </el-row>
-          </div>
+          <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search"
+                           :title="$t('commons.test')"
+                           @create="create" :createTip="$t('load_test.create')"/>
         </template>
 
         <el-table :data="tableData" class="test-content"
@@ -89,9 +81,11 @@
   import MsPerformanceTestStatus from "./PerformanceTestStatus";
   import MsTableOperators from "../../common/components/MsTableOperators";
   import {_filter, _sort} from "../../../../common/js/utils";
+  import MsTableHeader from "../../common/components/MsTableHeader";
 
   export default {
     components: {
+      MsTableHeader,
       MsPerformanceTestStatus,
       MsTablePagination,
       MsTableOperator,
@@ -210,6 +204,9 @@
         this.$router.push({
           path: '/performance/test/edit/' + row.id,
         })
+      },
+      create() {
+        this.$router.push('/performance/test/create');
       }
     }
   }