From f109a704792e0066fe6b05792a034a5839ba21d2 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Wed, 3 Aug 2022 10:32:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=20=E8=87=AA=E5=8A=A8=E5=8C=96):=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9C=AA=E6=89=A7=E8=A1=8C=E7=9A=84ui?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=9F=A5=E7=9C=8B=E5=AE=9E=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=B5=8B=E8=AF=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015635 --user=张大海 【UI 测试】关联未执行的ui场景查看实时报告不展示测试结果数据 https://www.tapd.cn/55049933/s/1218043
---
 .../metersphere/commons/utils/TestPlanUtils.java |  3 ++-
 .../comonents/report/detail/TestPlanUiReport.vue |  2 +-
 .../report/detail/component/UiResult.vue         | 16 ++++++++--------
 .../report/detail/component/UiScenarioResult.vue |  5 +++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
index 30b1378d07..a7495651c2 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
@@ -13,7 +13,8 @@ import java.util.Map;
 public class TestPlanUtils {
 
     public static void buildStatusResultMap(Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap, String result) {
-        if (StringUtils.isBlank(result)) {
+        // unexecute 存在于 ui 执行结果中
+        if (StringUtils.isBlank(result) || StringUtils.equals("UnExecute", result)) {
             result = TestPlanTestCaseStatus.Prepare.name();
         }
         TestCaseReportStatusResultDTO statusResult = reportStatusResultMap.get(result);
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanUiReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanUiReport.vue
index 1d733503c8..545c019046 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanUiReport.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanUiReport.vue
@@ -2,7 +2,7 @@
   <test-plan-report-container id="ui" :title="$t('test_track.report.analysis_ui')">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane v-if="resultEnable" :label="$t('test_track.report.test_result')" name="first">
-        <ui-result :api-result="report.uiResult"/>
+        <ui-result :ui-result="report.uiResult"/>
       </el-tab-pane>
       <el-tab-pane v-if="failureEnable" name="second">
         <template v-slot:label>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiResult.vue
index d14eb5fc75..dfa016e70c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiResult.vue
@@ -41,7 +41,7 @@ export default {
     }
   },
   props: {
-    apiResult: {
+    uiResult: {
       type: Object,
       default() {
         return {
@@ -52,7 +52,7 @@ export default {
     }
   },
   watch: {
-    apiResult() {
+    uiResult() {
       this.getCaseCharData();
     }
   },
@@ -62,8 +62,8 @@ export default {
   methods: {
     getCaseCharData() {
       let caseCharData = [];
-      if (this.apiResult.uiScenarioData) {
-        this.apiResult.uiScenarioData.forEach(item => {
+      if (this.uiResult.uiScenarioData) {
+        this.uiResult.uiScenarioData.forEach(item => {
           let data = this.getDataByStatus(item.status);
           data.value = item.count;
           caseCharData.push(data);
@@ -72,8 +72,8 @@ export default {
       this.caseCharData = caseCharData;
 
       let uiScenarioData = [];
-      if (this.apiResult.uiScenarioData) {
-        this.apiResult.uiScenarioData.forEach(item => {
+      if (this.uiResult.uiScenarioData) {
+        this.uiResult.uiScenarioData.forEach(item => {
           let data = this.getDataByStatus(item.status);
           data.value = item.count;
           uiScenarioData.push(data);
@@ -81,8 +81,8 @@ export default {
       }
 
       let stepCharData = [];
-      for (let i = 0; i < this.apiResult.uiScenarioStepData.length; i++) {
-        let stepItem = this.apiResult.uiScenarioStepData[i];
+      for (let i = 0; i < this.uiResult.uiScenarioStepData.length; i++) {
+        let stepItem = this.uiResult.uiScenarioStepData[i];
         let data = this.getDataByStatus(stepItem.status);
         data.value = stepItem.count;
         stepCharData.push(data);
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiScenarioResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiScenarioResult.vue
index a0c0d59c43..e6ebe9ad2c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiScenarioResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/UiScenarioResult.vue
@@ -41,7 +41,8 @@
                 :label="$t('test_track.plan_view.execute_result')"
                 prop="lastResult">
               <template v-slot:default="{row}">
-                <status-table-item :value="resultMap[row.lastResult]"/>
+                <status-table-item v-if="row.lastResult" :value="resultMap[row.lastResult]"/>
+                <status-table-item v-else :value="'Prepare'"/>
               </template>
             </ms-table-column>
           </ms-table>
@@ -108,7 +109,7 @@ export default {
         'Error' : 'Failure',
         'STOP' : 'STOP',
         'Running' : 'Running',
-        'UnExecute' : 'Prepare'
+        'UnExecute' : 'Prepare',
       }
     }
   },