From cf669ea36bad860f7a17efa117d8ecb218f557f7 Mon Sep 17 00:00:00 2001
From: AnAngle <1323481023@qq.com>
Date: Sun, 10 Apr 2022 16:52:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20UI=E5=BE=AA=E7=8E=AF=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=99=A8=E6=8A=A5=E5=91=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ApiScenarioReportResultService.java    |  3 +++
 .../service/ApiScenarioReportStructureService.java |  2 +-
 backend/src/main/java/io/metersphere/xpack         |  2 +-
 .../report/components/ScenarioResult.vue           | 14 +++++++-------
 .../report/components/UiCommandResult.vue          |  2 +-
 frontend/src/business/components/xpack             |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
index 606470ed14..34edcbbc71 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
+++ b/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)));
                     }
                 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
index 1d05e7fe7f..301b7fecc1 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
+++ b/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) {
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 834c40852b..a5f0c6dd21 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 834c40852b02d76d789714ac2d6032a9a16d321e
+Subproject commit a5f0c6dd21dae86ebc232c5a3f6615a09d5d4dd3
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 75965ba5de..8dbfc3095b 100644
--- a/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
+++ b/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'">
-      <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
+    <div v-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"
diff --git a/frontend/src/business/components/api/automation/report/components/UiCommandResult.vue b/frontend/src/business/components/api/automation/report/components/UiCommandResult.vue
index d8805d935f..101dcc746c 100644
--- a/frontend/src/business/components/api/automation/report/components/UiCommandResult.vue
+++ b/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';
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 6580a41c58..67ee9baecc 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 6580a41c58fe3ad8dd38e53c3e15b5a83fc71de9
+Subproject commit 67ee9baecc13df8f37f097bfba292cb004443b67