diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java index 2593fd31d3..c409627fc8 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java @@ -59,8 +59,8 @@ public class ApiAutomationController { } @PostMapping("/reduction") - public void reduction(@RequestBody List ids) { - apiAutomationService.reduction(ids); + public void reduction(@RequestBody List requests) { + apiAutomationService.reduction(requests); } @GetMapping("/getApiScenario/{id}") diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java index 6f2b5eca02..22f85b30f6 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java @@ -63,8 +63,8 @@ public class ApiDefinitionController { } @PostMapping("/reduction") - public void reduction(@RequestBody List ids) { - apiDefinitionService.reduction(ids); + public void reduction(@RequestBody List requests) { + apiDefinitionService.reduction(requests); } @GetMapping("/get/{id}") diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java index ac36de0aca..d2d741c4ba 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java @@ -179,7 +179,12 @@ public class ApiAutomationService { extApiScenarioMapper.removeToGc(apiIds); } - public void reduction(List apiIds) { + public void reduction(List requests) { + List apiIds = new ArrayList<>(); + requests.forEach(item->{ + checkNameExist(item); + apiIds.add(item.getId()); + }); extApiScenarioMapper.reduction(apiIds); } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java index 0bfb01ea35..c708e19d9c 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -158,7 +158,12 @@ public class ApiDefinitionService { extApiDefinitionMapper.removeToGc(apiIds); } - public void reduction(List apiIds) { + public void reduction(List requests) { + List apiIds = new ArrayList<>(); + requests.forEach(item -> { + checkNameExist(item); + apiIds.add(item.getId()); + }); extApiDefinitionMapper.reduction(apiIds); } @@ -386,6 +391,7 @@ public class ApiDefinitionService { /** * 数据统计-接口类型 + * * @param projectId 项目ID * @return */ @@ -395,6 +401,7 @@ public class ApiDefinitionService { /** * 统计本周创建的数据总量 + * * @param projectId * @return */ @@ -404,10 +411,10 @@ public class ApiDefinitionService { Date firstTime = startAndEndDateInWeek.get("firstTime"); Date lastTime = startAndEndDateInWeek.get("lastTime"); - if(firstTime==null || lastTime == null){ - return 0; - }else { - return extApiDefinitionMapper.countByProjectIDAndCreateInThisWeek(projectId,firstTime.getTime(),lastTime.getTime()); + if (firstTime == null || lastTime == null) { + return 0; + } else { + return extApiDefinitionMapper.countByProjectIDAndCreateInThisWeek(projectId, firstTime.getTime(), lastTime.getTime()); } } } diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index efb49c9b4b..61397c1672 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f +Subproject commit 61397c16728a63493507679f7e0940d9099f337f diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 9f89ad79fd..af86b9bf19 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -219,8 +219,9 @@ this.$emit('edit', row); }, reductionApi(row) { - let obj = [row.id]; - this.$post("/api/automation/reduction", obj, response => { + row.scenarioDefinition = null; + let rows = [row]; + this.$post("/api/automation/reduction", rows, response => { this.$success(this.$t('commons.save_success')); this.search(); }) diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue index b0049dfbb4..1bc15ad069 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue @@ -6,10 +6,10 @@ + border + :data="tableData" row-key="id" class="test-content adjust-table" + @select-all="handleSelectAll" + @select="handleSelect" :height="screenHeight">