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

fix(接口测试): 修复执行历史没有去重的缺陷

This commit is contained in:
wxg0103 2024-04-07 20:57:32 +08:00 committed by Craftsman
parent 0db63d9db3
commit f8cd30f6d4
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
View File

@ -239,7 +239,7 @@
</select> </select>
<select id="getExecuteList" resultType="io.metersphere.api.dto.definition.ExecuteReportDTO"> <select id="getExecuteList" resultType="io.metersphere.api.dto.definition.ExecuteReportDTO">
select select
api_report.id, distinct api_report.id,
api_report.name, api_report.name,
api_report.status, api_report.status,
api_report.start_time, api_report.start_time,

3
backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
View File

@ -200,7 +200,8 @@ public class ApiScenarioReportService {
//只处理请求的 //只处理请求的
List<String> stepTypes = Arrays.asList(ApiScenarioStepType.API_CASE.name(), List<String> stepTypes = Arrays.asList(ApiScenarioStepType.API_CASE.name(),
ApiScenarioStepType.API.name(), ApiScenarioStepType.API.name(),
ApiScenarioStepType.CUSTOM_REQUEST.name()); ApiScenarioStepType.CUSTOM_REQUEST.name(),
ApiScenarioStepType.SCRIPT.name());
scenarioReportSteps.parallelStream().forEach(step -> { scenarioReportSteps.parallelStream().forEach(step -> {
if (stepTypes.contains(step.getStepType())) { if (stepTypes.contains(step.getStepType())) {
List<ApiScenarioReportStepDTO> details = detailMap.get(step.getStepId()); List<ApiScenarioReportStepDTO> details = detailMap.get(step.getStepId());

7
frontend/src/views/api-test/components/requestComposition/response/result/index.vue
View File

@ -261,7 +261,12 @@
}); });
const loading = ref<boolean>(false); const loading = ref<boolean>(false);
const showApiType = ref<string[]>([ScenarioStepType.API, ScenarioStepType.API_CASE, ScenarioStepType.CUSTOM_REQUEST]); const showApiType = ref<string[]>([
ScenarioStepType.API,
ScenarioStepType.API_CASE,
ScenarioStepType.CUSTOM_REQUEST,
ScenarioStepType.SCRIPT,
]);
// 获取详情 // 获取详情
async function getStepDetail(stepId: string) { async function getStepDetail(stepId: string) {
try { try {

7
frontend/src/views/api-test/report/component/step/stepTree.vue
View File

@ -238,7 +238,12 @@
const innerExpandedKeys = defineModel<(string | number)[]>('expandedKeys', { const innerExpandedKeys = defineModel<(string | number)[]>('expandedKeys', {
required: false, required: false,
}); });
const showApiType = ref<string[]>([ScenarioStepType.API, ScenarioStepType.API_CASE, ScenarioStepType.CUSTOM_REQUEST]); const showApiType = ref<string[]>([
ScenarioStepType.API,
ScenarioStepType.API_CASE,
ScenarioStepType.CUSTOM_REQUEST,
ScenarioStepType.SCRIPT,
]);
const innerNumber = ref<number>(0); const innerNumber = ref<number>(0);