test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
AnAngle 2022-04-10 16:52:13 +08:00 committed by zhangdahai112
parent 2465587992
commit cf669ea36b
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
View File

@ -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)));
}
}

2
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
View File

@ -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) {

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

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

14
frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
View File

@ -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"

2
frontend/src/business/components/api/automation/report/components/UiCommandResult.vue
View File

@ -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';

2
frontend/src/business/components/xpack

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