feat: UI循环控制器报告处理

backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java

@@ -82,6 +82,9 @@ public class ApiScenarioReportResultService {
                 if (StringUtils.isNoneBlank(header)) {
                     JSONObject jsonObject = JSONObject.parseObject(header);
                     for (String resourceId : jsonObject.keySet()) {
+                        if (resourceId.length() > 36) {
+                            resourceId = resourceId.substring(0, 36);
+                        }
                         apiScenarioReportResultMapper.insert(this.newUiScenarioReportResult(reportId, resourceId, jsonObject.getJSONObject(resourceId)));
                     }
                 }

backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java

@@ -48,7 +48,7 @@ public class ApiScenarioReportStructureService {
     @Resource
     private ExtApiScenarioReportResultMapper extApiScenarioReportResultMapper;
 
-    private static final List<String> requests = Arrays.asList("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler", "MsUiCommand");
+    private static final List<String> requests = Arrays.asList("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler");
     private static final List<String> controls = Arrays.asList("Assertions", "IfController", "ConstantTimer");
 
     public void save(List<ApiScenarioWithBLOBs> apiScenarios, String reportId, String reportType) {

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

@@ -1 +1 @@
-Subproject commit 834c40852b02d76d789714ac2d6032a9a16d321e
+Subproject commit a5f0c6dd21dae86ebc232c5a3f6615a09d5d4dd3

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

@@ -1,12 +1,6 @@
 <template>
   <div class="scenario-result">
-    <div v-if="node.type === 'MsUiCommand'">
+    <div v-if="(node.children && node.children.length >0) || node.unsolicited
-      <ui-command-result
-        :index-number="node.index"
-        :command="node"
-        :result="node.value"/>
-    </div>
-    <div v-else-if="(node.children && node.children.length >0) || node.unsolicited
     || (node.type && this.stepFilter.get('AllSamplerProxy').indexOf(node.type) === -1)">
       <el-card class="ms-card">
         <div class="el-step__icon is-text ms-api-col">
@@ -19,6 +13,12 @@
         </el-tooltip>
       </el-card>
     </div>
+    <div v-else-if="node.type === 'MsUiCommand'">
+      <ui-command-result
+        :index-number="node.index"
+        :command="node"
+        :result="node.value"/>
+    </div>
     <div v-else>
       <ms-request-result
         :step-id="node.stepId"

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

@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     label() {
-      return this.command.label && atomicCommandDefinition[this.command.label] ? atomicCommandDefinition[this.command.label].cnName : '';
+      return this.command.label;
     },
     isUnexecute() {
       return this.result && this.result.status === 'unexecute';

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 6580a41c58fe3ad8dd38e53c3e15b5a83fc71de9
+Subproject commit 67ee9baecc13df8f37f097bfba292cb004443b67