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 2023-04-26 09:57:32 +08:00 committed by fit2-zhao
parent e9e0e54cf1
commit 38cab2f687
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-test/backend/src/main/java/io/metersphere/controller/definition/ApiTestCaseController.java
View File

@ -242,7 +242,6 @@ public class ApiTestCaseController {
@PostMapping("/list-execute-res/{goPage}/{pageSize}") @PostMapping("/list-execute-res/{goPage}/{pageSize}")
public Pager<List<ApiDefinitionExecResultExpand>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryAPIReportRequest request) { public Pager<List<ApiDefinitionExecResultExpand>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryAPIReportRequest request) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true); Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
request.setLimit("LIMIT " + (goPage - 1) * pageSize + "," + pageSize * 50);
return PageUtils.setPageInfo(page, apiDefinitionExecResultService.apiReportList(request)); return PageUtils.setPageInfo(page, apiDefinitionExecResultService.apiReportList(request));
} }

1
api-test/backend/src/main/java/io/metersphere/controller/scenario/ApiScenarioReportController.java
View File

@ -53,7 +53,6 @@ public class ApiScenarioReportController {
@PostMapping("/list/{goPage}/{pageSize}") @PostMapping("/list/{goPage}/{pageSize}")
public Pager<List<ApiScenarioReportResult>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryAPIReportRequest request) { public Pager<List<ApiScenarioReportResult>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryAPIReportRequest request) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true); Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
request.setLimit("LIMIT " + (goPage - 1) * pageSize + "," + pageSize * 50);
return PageUtils.setPageInfo(page, apiReportService.list(request)); return PageUtils.setPageInfo(page, apiReportService.list(request));
} }

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

@ -400,7 +400,7 @@ public class ApiScenarioReportStructureService {
list = list.stream().sorted(Comparator.comparing(x -> x.getValue().getStartTime())).collect(Collectors.toList()); list = list.stream().sorted(Comparator.comparing(x -> x.getValue().getStartTime())).collect(Collectors.toList());
unList = unList.stream().sorted(Comparator.comparing(x -> x.getIndex())).collect(Collectors.toList()); unList = unList.stream().sorted(Comparator.comparing(x -> x.getIndex())).collect(Collectors.toList());
unList.addAll(steps); unList.addAll(steps);
List<StepTreeDTO> mergeList = unList.stream().distinct().collect(Collectors.toList()); List<StepTreeDTO> mergeList = unList.stream().distinct().sorted(Comparator.comparing(StepTreeDTO::getIndex)).collect(Collectors.toList());
// 处理请求结果开始时间为0的数据 // 处理请求结果开始时间为0的数据
for (StepTreeDTO unListDTO : mergeList) { for (StepTreeDTO unListDTO : mergeList) {
int index = unListDTO.getIndex(); int index = unListDTO.getIndex();

5
api-test/frontend/src/business/automation/ApiAutomation.vue
View File

@ -312,9 +312,10 @@ export default {
addTab(tab) { addTab(tab) {
this.trashEnable = tab.name === 'trash'; this.trashEnable = tab.name === 'trash';
if (tab.name === 'default') { if (tab.name === 'default') {
this.$refs.nodeTree.list(this.projectId, tab); this.$refs.nodeTree.list(this.projectId);
} else if (tab.name === 'trash') { } else if (tab.name === 'trash') {
this.$refs.apiTrashScenarioList.search(); this.$refs.apiTrashScenarioList.search();
this.$refs.nodeTree.list(this.projectId, tab.name);
} }
if (!this.projectId) { if (!this.projectId) {
this.$warning(this.$t('commons.check_project_tip')); this.$warning(this.$t('commons.check_project_tip'));
@ -618,7 +619,7 @@ export default {
if (targetName === 'trash') { if (targetName === 'trash') {
this.selectNodeIds = []; this.selectNodeIds = [];
this.trashEnable = false; this.trashEnable = false;
this.$refs.nodeTree.list(this.projectId, targetName); this.$refs.nodeTree.list(this.projectId);
} else { } else {
let message = ''; let message = '';
this.tabs.forEach((tab) => { this.tabs.forEach((tab) => {

2
api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue
View File

@ -200,7 +200,7 @@ export default {
this.result = getModuleByRelevanceProjectId(this.relevanceProjectId).then((response) => { this.result = getModuleByRelevanceProjectId(this.relevanceProjectId).then((response) => {
this.setData(response); this.setData(response);
}); });
} else if (this.isTrashData && !targetName) { } else if (this.isTrashData && targetName === 'trash') {
this.result = postModuleByTrash(projectId ? projectId : this.projectId, this.param).then((response) => { this.result = postModuleByTrash(projectId ? projectId : this.projectId, this.param).then((response) => {
this.setData(response); this.setData(response);
}); });