From 86b19b68fc395d88995a80ab73e81bccc783ae61 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 12 Jan 2021 11:16:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=8A=A5=E5=91=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/jmeter/TestResult.java | 18 ++++++++++------
 .../api/service/ApiAutomationService.java     |  1 +
 .../api/automation/report/ApiReportDetail.vue | 21 ++++++++++++-------
 .../report/components/ScenarioResult.vue      |  2 +-
 .../api/definition/components/ApiVariable.vue |  2 +-
 .../definition/components/body/ApiBody.vue    | 19 +++++++----------
 .../common/json-schema/JsonSchemaEditor.vue   |  4 ++--
 7 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java b/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
index b66d4212c0..925ff066c2 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
@@ -40,20 +40,26 @@ public class TestResult {
         this.passAssertions += count;
     }
 
+    private static final String separator = "<->";
+
     public void addScenario(ScenarioResult result) {
         Map<String, List<RequestResult>> requestResultMap = new LinkedHashMap<>();
         if (result != null && CollectionUtils.isNotEmpty(result.getRequestResults())) {
             result.getRequestResults().forEach(item -> {
-                if (StringUtils.isNotEmpty(item.getName()) && item.getName().indexOf("<->") != -1) {
-                    String array[] = item.getName().split("<->");
-                    item.setName(array[0]);
-                    if (requestResultMap.containsKey(array[1])) {
-                        requestResultMap.get(array[1]).add(item);
+                if (StringUtils.isNotEmpty(item.getName()) && item.getName().indexOf(separator) != -1) {
+                    String array[] = item.getName().split(separator);
+                    String scenarioName = array[array.length - 1];
+                    item.setName(item.getName().replace(separator + scenarioName, ""));
+                    if (requestResultMap.containsKey(scenarioName)) {
+                        requestResultMap.get(scenarioName).add(item);
                     } else {
                         List<RequestResult> requestResults = new LinkedList<>();
                         requestResults.add(item);
-                        requestResultMap.put(array[1], requestResults);
+                        requestResultMap.put(scenarioName, requestResults);
                     }
+                    item.getSubRequestResults().forEach(subItem -> {
+                        subItem.setName(item.getName());
+                    });
                 }
             });
         }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 10a92ada82..3e33bdc4d4 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -441,6 +441,7 @@ public class ApiAutomationService {
         ParameterConfig config = new ParameterConfig();
         config.setConfig(envConfig);
         HashTree hashTree = request.getTestElement().generateHashTree(config);
+
         // 调用执行方法
         createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
                 SessionUtils.getUserId());
diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
index 9711a728ac..ed6453e2a0 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
@@ -9,14 +9,21 @@
           <main v-if="this.isNotRunning">
             <ms-metric-chart :content="content" :totalTime="totalTime"/>
             <div>
-              <ms-scenario-results :scenarios="content.scenarios" v-on:requestResult="requestResult"/>
+              <!--<ms-scenario-results :scenarios="content.scenarios" v-on:requestResult="requestResult"/>-->
+
+              <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tab-pane :label="$t('api_report.total')" name="total">
+                  <ms-scenario-results :scenarios="content.scenarios" v-on:requestResult="requestResult"/>
+                </el-tab-pane>
+                <el-tab-pane name="fail">
+                  <template slot="label">
+                    <span class="fail">{{ $t('api_report.fail') }}</span>
+                  </template>
+                  <ms-scenario-results v-on:requestResult="requestResult" :scenarios="fails"/>
+                </el-tab-pane>
+              </el-tabs>
+
             </div>
-            <!--<el-collapse-transition>-->
-            <!--<div v-show="isActive" style="width: 99%">-->
-            <!--<ms-request-result-tail v-if="isRequestResult" :request-type="requestType" :request="request"-->
-            <!--:scenario-name="scenarioName"/>-->
-            <!--</div>-->
-            <!--</el-collapse-transition>-->
             <ms-api-report-export v-if="reportExportVisible" id="apiTestReport" :title="report.testName"
                                   :content="content" :total-time="totalTime"/>
           </main>
diff --git a/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue b/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
index a380bdca36..664507e874 100644
--- a/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="scenario-result">
+  <div class="scenario-result" v-if="scenario && scenario.requestResults && scenario.requestResults.length>0">
 
     <div @click="active">
       <el-row :gutter="10" type="flex" align="middle" class="info">
diff --git a/frontend/src/business/components/api/definition/components/ApiVariable.vue b/frontend/src/business/components/api/definition/components/ApiVariable.vue
index 5d2d77614b..bfc7423322 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariable.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariable.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="min-width: 1200px;margin-bottom: 20px">
+  <div style="margin-bottom: 20px">
     <span class="kv-description" v-if="description">
       {{ description }}
     </span>
diff --git a/frontend/src/business/components/api/definition/components/body/ApiBody.vue b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
index f442f28b21..33b4e7db71 100644
--- a/frontend/src/business/components/api/definition/components/body/ApiBody.vue
+++ b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
@@ -28,18 +28,15 @@
     <el-row v-if="body.type == 'Form Data' || body.type == 'WWW_FORM'">
       <el-link class="ms-el-link" @click="batchAdd"> {{$t("commons.batch_add")}}</el-link>
     </el-row>
+    <div style="min-width: 1200px;" v-if="body.type == 'Form Data' || body.type == 'WWW_FORM'">
+      <ms-api-variable :is-read-only="isReadOnly"
+                       :parameters="body.kvs"
+                       :isShowEnable="isShowEnable" type="body" v-if="body.type == 'Form Data'"/>
 
-    <ms-api-variable :is-read-only="isReadOnly"
-                     :parameters="body.kvs"
-                     :isShowEnable="isShowEnable"
-                     type="body"
-                     v-if="body.type == 'Form Data'"/>
-
-    <ms-api-from-url-variable :is-read-only="isReadOnly"
-                              :parameters="body.kvs"
-                              type="body"
-                              v-if="body.type == 'WWW_FORM'"/>
-
+      <ms-api-from-url-variable :is-read-only="isReadOnly"
+                                :parameters="body.kvs"
+                                type="body" v-if="body.type == 'WWW_FORM'"/>
+    </div>
     <div v-if="body.type == 'JSON'">
       <div style="padding: 10px">
         <el-switch active-text="JSON-SCHEMA" v-model="body.format" active-value="JSON-SCHEMA"/>
diff --git a/frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue b/frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue
index 47fde0b36d..3e57f17998 100644
--- a/frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue
+++ b/frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue
@@ -3,12 +3,12 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="$t('organization.message.template')" name="apiTemplate">
         <el-button type="primary" size="mini" style="margin-left: 10px" @click="openOneClickOperation">导入</el-button>
-        <div style="min-height: 400px">
+        <div style="min-height: 200px">
           <json-schema-editor class="schema" :value="schema" lang="zh_CN" custom/>
         </div>
       </el-tab-pane>
       <el-tab-pane :label="$t('schema.preview')" name="preview">
-        <div style="min-height: 400px">
+        <div style="min-height: 200px">
           <pre>{{this.preview}}</pre>
         </div>
       </el-tab-pane>