From a0c9e3db791be7e98bcca4da3e35464afea22915 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 15 Dec 2020 16:48:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E5=90=8C=E6=AD=A5=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 1fe20ba15a..61397c1672 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 1fe20ba15a7ca3fe9f77ddf866021e7c7dfe5969
+Subproject commit 61397c16728a63493507679f7e0940d9099f337f
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 29a8fc0960..332400be7c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836
+Subproject commit 332400be7c000a9e0e3d5e8052a74b4972e50951

From ff9ecf6ec31eb5ea7bfbb8cb159785a19b79a982 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 15 Dec 2020 17:43:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../report/components/RequestResult.vue       |   1 +
 .../report/components/RequestResultTail.vue   |   5 +-
 .../report/components/RequestSubResult.vue    | 144 ++++++++++++++++++
 .../automation/scenario/ApiScenarioModule.vue |   2 +-
 .../api/definition/model/JsonData.js          |   2 +-
 6 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/report/components/RequestSubResult.vue

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 61397c1672..1fe20ba15a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 61397c16728a63493507679f7e0940d9099f337f
+Subproject commit 1fe20ba15a7ca3fe9f77ddf866021e7c7dfe5969
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
index 81c067ed34..6631e69395 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
@@ -67,6 +67,7 @@
     methods: {
       active() {
         this.isActive = !this.isActive;
+        console.log(this.request)
         //this.$emit("requestResult", {request: this.request, scenarioName: this.scenarioName});
       }
     },
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
index 97ed21bb7b..cbc5a58c8f 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
@@ -41,7 +41,7 @@
       <div v-show="isActive">
         <el-tabs v-model="activeName" v-show="isActive" v-if="hasSub">
           <el-tab-pane :label="$t('api_report.sub_result')" name="sub">
-            <ms-request-result class="sub-result" v-for="(sub, index) in request.subRequestResults"
+            <ms-request-sub-result class="sub-result" v-for="(sub, index) in request.subRequestResults"
                                :key="index" :request="sub"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('api_report.request_result')" name="result">
@@ -68,10 +68,11 @@
   import MsRequestText from "./RequestText";
   import MsResponseText from "./ResponseText";
   import MsRequestResult from "./RequestResult";
+  import MsRequestSubResult from "./RequestSubResult";
 
   export default {
     name: "MsRequestResultTail",
-    components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric, MsRequestResult},
+    components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric, MsRequestResult,MsRequestSubResult},
     props: {
       request: Object,
       scenarioName: String,
diff --git a/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue b/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue
new file mode 100644
index 0000000000..b65bc1afd4
--- /dev/null
+++ b/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="request-result">
+    <p class="el-divider--horizontal"></p>
+    <div @click="active">
+      <el-row :gutter="10" type="flex" align="middle" class="info">
+        <el-col :span="14" v-if="indexNumber!=undefined">
+          <div class="method">
+            <div class="el-step__icon is-text ms-api-col" v-if="indexNumber%2 ==0">
+              <div class="el-step__icon-inner"> {{ indexNumber+1 }}</div>
+            </div>
+            <div class="el-step__icon is-text ms-api-col-create" v-else>
+              <div class="el-step__icon-inner"> {{ indexNumber+1 }}</div>
+            </div>
+            {{ request.name }}
+          </div>
+        </el-col>
+
+        <el-col :span="5">
+          <el-tooltip effect="dark" :content="request.responseResult.responseCode" placement="bottom" :open-delay="800">
+            <div class="url" style="color: #5daf34">{{ request.responseResult.responseCode }}</div>
+          </el-tooltip>
+        </el-col>
+        <el-col :span="3">
+          {{request.responseResult.responseTime}} ms
+        </el-col>
+
+        <el-col :span="2">
+          <div class="success">
+            <el-tag size="mini" type="success" v-if="request.success">
+              {{ $t('api_report.success') }}
+            </el-tag>
+            <el-tag size="mini" type="danger" v-else>
+              {{ $t('api_report.fail') }}
+            </el-tag>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import MsRequestMetric from "./RequestMetric";
+  import MsAssertionResults from "./AssertionResults";
+  import MsRequestText from "./RequestText";
+  import MsResponseText from "./ResponseText";
+
+  export default {
+    name: "MsRequestResult",
+    components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric},
+    props: {
+      request: Object,
+      scenarioName: String,
+      indexNumber: Number,
+    },
+    data() {
+      return {isActive: false, requestType: undefined,}
+    },
+    methods: {
+      active() {
+        this.isActive = !this.isActive;
+        console.log(this.request)
+        //this.$emit("requestResult", {request: this.request, scenarioName: this.scenarioName});
+      }
+    },
+  }
+</script>
+
+<style scoped>
+  .request-result {
+    width: 100%;
+    min-height: 40px;
+    padding: 2px 0;
+  }
+
+  .request-result .info {
+    margin-left: 20px;
+    cursor: pointer;
+  }
+
+  .request-result .method {
+    color: #1E90FF;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 40px;
+    padding-left: 5px;
+  }
+
+  .request-result .url {
+    color: #7f7f7f;
+    font-size: 12px;
+    font-weight: 400;
+    margin-top: 4px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+  }
+
+  .request-result .tab .el-tabs__header {
+    margin: 0;
+  }
+
+  .request-result .text {
+    height: 300px;
+    overflow-y: auto;
+  }
+
+  .sub-result .info {
+    background-color: #FFF;
+  }
+
+  .sub-result .method {
+    border-left: 5px solid #1E90FF;
+    padding-left: 20px;
+  }
+
+  .sub-result:last-child {
+    border-bottom: 1px solid #EBEEF5;
+  }
+
+  .ms-api-col {
+    background-color: #EFF0F0;
+    border-color: #EFF0F0;
+    margin-right: 10px;
+    font-size: 12px;
+    color: #64666A;
+  }
+
+  .ms-api-col-create {
+    background-color: #EBF2F2;
+    border-color: #008080;
+    margin-right: 10px;
+    font-size: 12px;
+    color: #008080;
+  }
+
+  .el-divider--horizontal {
+    margin: 2px 0;
+    background: 0 0;
+    border-top: 1px solid #e8eaec;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index edbd91f712..acb20511ca 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -99,7 +99,7 @@
           "children": [],
         }, {
           "id": "root",
-          "name": "默认模块",
+          "name": "全部模块",
           "level": 0,
           "children": [],
         }]
diff --git a/frontend/src/business/components/api/definition/model/JsonData.js b/frontend/src/business/components/api/definition/model/JsonData.js
index 60c3d8b8fb..9a1f8d2d1d 100644
--- a/frontend/src/business/components/api/definition/model/JsonData.js
+++ b/frontend/src/business/components/api/definition/model/JsonData.js
@@ -20,7 +20,7 @@ export const DEFAULT_DATA = [{
   "children": [],
 },{
   "id": "root",
-  "name": "默认模块",
+  "name": "全部模块",
   "level": 0,
   "children": [],
 }]