From b9e272d96140db18122c8fea753e99253195458f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 9 Jun 2021 16:03:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanMapper.xml     |  1 +
 .../track/dto/TestPlanDTOWithMetric.java      |  1 +
 .../track/plan/components/TestPlanList.vue    | 27 ++++++++-----------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 4a85f36d1b..a0a965787b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -99,6 +99,7 @@
     <select id="list" resultType="io.metersphere.track.dto.TestPlanDTOWithMetric"
             parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
         select DISTINCT test_plan.*, user.name as user_name, project.name as projectName,schedule.id as scheduleId,
+                        (select name from user where user.id = test_plan.creator) as createUser,
             IF(schedule.enable = true,true,false) as scheduleOpen
         from test_plan
         LEFT JOIN user ON user.id = test_plan.principal
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanDTOWithMetric.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanDTOWithMetric.java
index df3bd10fb3..ed0f79a8fe 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestPlanDTOWithMetric.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanDTOWithMetric.java
@@ -11,4 +11,5 @@ public class TestPlanDTOWithMetric extends TestPlanDTO {
     private Integer passed;
     private Integer tested;
     private Integer total;
+    private String createUser;
 }
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index b107f6ed9d..1a87f998f8 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card class="table-card" v-loading="result.loading">
+  <el-card class="table-card" v-loading="cardResult.loading">
     <template v-slot:header>
       <ms-table-header :create-permission="['PROJECT_TRACK_PLAN:READ+CREATE']" :condition.sync="condition"
                        @search="initTableData" @create="testPlanCreate"
@@ -16,6 +16,7 @@
       @filter-change="filter"
       @sort-change="sort"
       :height="screenHeight"
+      v-loading="result.loading"
       @row-click="intoPlan">
       <template v-for="(item, index) in tableLabel">
         <el-table-column
@@ -34,17 +35,10 @@
         </el-table-column>
         <el-table-column
           v-if="item.id == 'createUser'"
-          prop="creator"
+          prop="createUser"
           :label="$t('commons.create_user')"
           show-overflow-tooltip
           :key="index">
-          <template slot-scope="scope">
-            <span
-              :value="item.creator"
-            >
-              {{ scope.row.createUser }}
-            </span>
-          </template>
         </el-table-column>
         <el-table-column
           v-if="item.id == 'status'"
@@ -275,6 +269,7 @@ export default {
       headerItems: Test_Plan_List,
       tableLabel: [],
       result: {},
+      cardResult: {},
       enableDeleteTip: false,
       queryPath: "/test/plan/list",
       deletePath: "/test/plan/delete",
@@ -333,7 +328,7 @@ export default {
       if (!this.projectId) {
         return;
       }
-      this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
+      this.cardResult = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
         let data = response.data;
         this.total = data.itemCount;
         this.tableData = data.listObject;
@@ -342,12 +337,12 @@ export default {
             item.tags = JSON.parse(item.tags);
           }
           item.passRate = item.passRate + '%';
-          if (item.creator) {
-            this.$get("user/info/" + item.creator, response => {
-              let name = response.data.name;
-              item.createUser = name;
-            });
-          }
+          // if (item.creator) {
+          //   this.$get("user/info/" + item.creator, response => {
+          //     let name = response.data.name;
+          //     item.createUser = name;
+          //   });
+          // }
         });
       });
       getLabel(this, TEST_PLAN_LIST);