fix(UI自动化): 修复执行生成报告，报告顺序问题

--bug=1014053 --user=刘瑶 【UI测试】UI报告，循环里套循环的时候，报告显示顺序不是循环的顺序 https://www.tapd.cn/55049933/s/1186470

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit 4ac3f8294a9b432398dce7c3e84be2fcacb07d7c
+Subproject commit 952b8ba44820b5ae7b604b6505d66fe89401ec44

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

@@ -127,6 +127,7 @@ export default {
       messageWebSocket: {},
       websocket: {},
       stepFilter: new STEP,
+      tempResult: [],
     }
   },
   activated() {
@@ -315,7 +316,18 @@ export default {
           this.content.success = (this.content.total - this.content.error - this.content.errorCode - this.content.unExecute);
           this.totalTime = this.content.totalTime;
           this.resetLabel(this.content.steps);
-          this.fullTreeNodes = this.content.steps
+          if(this.report.reportType === "UI_INDEPENDENT"){
+            this.tempResult = this.content.steps;
+            //校对执行次序
+            try{
+              this.checkOrder(this.tempResult);
+              this.fullTreeNodes = this.tempResult;
+            }catch(e){
+              this.fullTreeNodes = this.content.steps;
+            }
+          }else{
+            this.fullTreeNodes = this.content.steps;
+          }
           this.recursiveSorting(this.fullTreeNodes);
           this.reload();
         }
@@ -324,6 +336,62 @@ export default {
         }
       });
     },
+    checkOrder(origin){
+      if(!origin){
+        return;
+      }
+      if(Array.isArray(origin)){
+        this.sortChildren(origin);
+        origin.forEach(v => {
+          if(v.children){
+            this.checkOrder(v.children)
+          }
+        })
+      }
+    },
+    sortChildren(source){
+      if(!source){
+        return;
+      }
+      source.forEach( item =>{
+        let children = item.children;
+        if(children && children.length > 0){
+          let tempArr = new Array(children.length);
+          let tempMap = new Map();
+
+          for(let i = 0; i < children.length; i++){
+            if(!children[i].value || !children[i].value.startTime || children[i].value.startTime === 0){
+              //若没有value或未执行的，则step留在当前位置
+              tempArr[i] = children[i];
+              //进行标识
+              tempMap.set(children[i].stepId, children[i])
+            }
+          }
+
+          //过滤出还没有指定好位置的step
+          let arr = children.filter(m => {
+            return !tempMap.get(m.stepId);
+          }).sort((m, n) => {
+            //按时间排序
+            return m.value.startTime - n.value.startTime;
+          });
+
+          //找出arr(已经有序，从头取即可)中时间最小的插入 tempArr 可用位置
+          for(let j = 0, i = 0; j < tempArr.length; j++){
+            if(!tempArr[j]){
+              //占位
+              tempArr[j] = arr[i];
+              i++;
+            }
+            //重新排序
+            tempArr[j].index = j + 1;
+          }
+
+          //赋值
+          item.children = tempArr;
+        }
+      })
+    },
     runningNodeChild(arr, resourceId) {
       arr.forEach(item => {
         if (resourceId === item.resId) {

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit b6a9ea1cac4be67f8fc64cc75b9994827f381e09
+Subproject commit 218a3cadaf6715d318e8cd4a4b3f6502070a5453