From f6f142d7ba63fc20f390d537b76cf9918dbeade7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 23 Dec 2020 17:21:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=8C=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  4 ++--
 .../TestResultAdvanceChartComponent.vue       | 22 +++----------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index de4d698114..1a0a98a4bd 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -122,13 +122,13 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
-        test_case.type,test_case.test_id as testId,
+        test_case.type,test_case.test_id as testId,test_case.node_id,
         test_case.node_path, test_case.method, test_case.num, test_plan_test_case.executor, test_plan_test_case.status,
         test_plan_test_case.update_time, test_case_node.name as model, project.name as projectName,
         test_plan_test_case.plan_id as planId
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id
-        left join test_case_node on test_case_node.id=test_case.node_id
+        left join test_case_node on test_case_node.id = test_case.node_id
         inner join project on project.id = test_case.project_id
         <where>
             <if test="request.combine != null">
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue
index 1412d990a7..6ded785208 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue
@@ -2,8 +2,7 @@
 
   <common-component :title="$t('test_track.plan_view.result_statistics')">
 
-    <div :class="{'show-one': isShowOne}">
-
+    <div class="char-component">
       <div class="char-item" v-if="showFunctional">
         <ms-pie-chart v-if="isShow" :text="'功能测试用例'"
                       :name="$t('test_track.plan_view.test_result')" :data="functionalCharData"/>
@@ -18,8 +17,6 @@
         <ms-pie-chart v-if="isShow" :text="'场景测试用例'"
                       :name="$t('test_track.plan_view.test_result')" :data="scenarioCharData"/>
       </div>
-
-
     </div>
 
   </common-component>
@@ -85,19 +82,6 @@
        },
        showScenario() {
          return this.executeResult.scenarioResult.length > 0;
-       },
-       isShowOne() {
-         let count = 0;
-         if (this.showFunctional) {
-           count++;
-         }
-         if (this.showApi) {
-           count++;
-         }
-         if (this.showScenario) {
-           count++;
-         }
-         return count === 1;
        }
      },
       watch: {
@@ -165,8 +149,8 @@
     display: inline-block;
   }
 
-  .show-one .char-item {
-    display: block;
+  .char-component {
+    text-align: center;
   }
 
 </style>

From 22cd448b0f7c94a3bc6da61f3999389d98df825d Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 23 Dec 2020 17:46:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=97=E8=A1=A8=E5=88=87=E6=8D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/list/ApiListContainer.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue b/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue
index f61ce8a783..dba4492dac 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiListContainer.vue
@@ -1,9 +1,18 @@
 <template>
   <el-card class="card-content" v-if="isShow">
+
     <el-button-group v-if="isShowChangeButton">
-      <el-button plain size="small" icon="el-icon-tickets" :class="{active: isApiListEnable}" @click="apiChange('api')"></el-button>
-      <el-button plain class="case-button" size="small" icon="el-icon-paperclip" :class="{active: !isApiListEnable}" @click="caseChange('case')"></el-button>
+
+      <el-tooltip class="item" effect="dark" content="接口列表" placement="left">
+        <el-button plain size="small" icon="el-icon-tickets" :class="{active: isApiListEnable}" @click="apiChange('api')"></el-button>
+      </el-tooltip>
+
+      <el-tooltip class="item" effect="dark" content="用例列表" placement="right">
+        <el-button plain class="case-button" size="small" icon="el-icon-paperclip" :class="{active: !isApiListEnable}" @click="caseChange('case')"></el-button>
+      </el-tooltip>
+
     </el-button-group>
+
     <template v-slot:header>
       <slot name="header"></slot>
     </template>