Merge branch 'v1.8'

# Conflicts:
#	frontend/src/business/components/api/automation/report/ApiReportDetail.vue
#	frontend/src/business/components/api/automation/report/components/RequestResult.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/common/components/MsModuleMinder.vue
#	frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue

frontend/src/business/components/api/automation/report/ApiReportDetail.vue

@@ -29,7 +29,6 @@
 </template>
 
 <script>
-
   import MsRequestResult from "./components/RequestResult";
   import MsRequestResultTail from "./components/RequestResultTail";
   import MsScenarioResult from "./components/ScenarioResult";
@@ -41,7 +40,6 @@
   import MsApiReportViewHeader from "./ApiReportViewHeader";
   import {RequestFactory} from "../../definition/model/ApiTestModel";
   import {windowPrint} from "@/common/js/utils";
-
   export default {
     name: "MsApiReport",
     components: {
@@ -119,6 +117,61 @@
         this.sort(this.fullTreeNodes);
         this.$emit('refresh', resMap);
       },
+      formatTree(array, tree) {
+        array.map((item) => {
+          let key = item.name;
+          let nodeArray = key.split('^@~@^');
+          let children = tree;
+          // 循环构建子节点
+          for (let i in nodeArray) {
+            let node = {
+              label: nodeArray[i],
+              value: item,
+            };
+            if (i != nodeArray.length) {
+              node.children = [];
+            }
+            if (children.length == 0) {
+              children.push(node);
+            }
+            let isExist = false;
+            for (let j in children) {
+              if (children[j].label == node.label) {
+                if (i != nodeArray.length - 1 && !children[j].children) {
+                  children[j].children = [];
+                }
+                children = (i == nodeArray.length - 1 ? children : children[j].children);
+                isExist = true;
+                break;
+              }
+            }
+            if (!isExist) {
+              children.push(node);
+              if (i != nodeArray.length - 1 && !children[children.length - 1].children) {
+                children[children.length - 1].children = [];
+              }
+              children = (i == nodeArray.length - 1 ? children : children[children.length - 1].children);
+            }
+          }
+        })
+      },
+      recursiveSorting(arr) {
+        for (let i in arr) {
+          arr[i].index = Number(i) + 1;
+          if (arr[i].children != undefined && arr[i].children.length > 0) {
+            this.recursiveSorting(arr[i].children);
+          }
+        }
+      },
+      sort(scenarioDefinition) {
+        for (let i in scenarioDefinition) {
+          // 排序
+          scenarioDefinition[i].index = Number(i) + 1;
+          if (scenarioDefinition[i].children != undefined && scenarioDefinition[i].children.length > 0) {
+            this.recursiveSorting(scenarioDefinition[i].children);
+          }
+        }
+      },
       getReport() {
         this.init();
         if (this.reportId) {
@@ -165,6 +218,7 @@
                   if (!request.success) {
                     let failRequest = Object.assign({}, request);
                     failScenario.requestResults.push(failRequest);
+                    array.push(request)
                   }
                 })
               }
@@ -234,11 +288,9 @@
         this.$router.go(0);
       }
     },
-
     created() {
       this.getReport();
     },
-
     computed: {
       path() {
         return "/api/test/edit?id=" + this.report.testId;
@@ -259,38 +311,30 @@
 </style>
 
 <style scoped>
-
   .report-container {
     height: calc(100vh - 155px);
     min-height: 600px;
     overflow-y: auto;
   }
-
   .report-header {
     font-size: 15px;
   }
-
   .report-header a {
     text-decoration: none;
   }
-
   .report-header .time {
     color: #909399;
     margin-left: 10px;
   }
-
   .report-container .fail {
     color: #F56C6C;
   }
-
   .report-container .is-active .fail {
     color: inherit;
   }
-
   .export-button {
     float: right;
   }
-
   .scenario-result .icon.is-active {
     transform: rotate(90deg);
   }