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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
q4speed 2020-12-23 10:57:59 +08:00
parent f1dcd2191a abda6aa758
commit fec5cf30f0
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/controller/APIReportController.java
View File

@ -60,6 +60,7 @@ public class APIReportController {
} }
@PostMapping("/delete") @PostMapping("/delete")
@RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER}, logical = Logical.OR)
public void delete(@RequestBody DeleteAPIReportRequest request) { public void delete(@RequestBody DeleteAPIReportRequest request) {
apiReportService.delete(request); apiReportService.delete(request);
} }
@ -70,6 +71,7 @@ public class APIReportController {
} }
@PostMapping("/batch/delete") @PostMapping("/batch/delete")
@RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER}, logical = Logical.OR)
public void deleteAPIReportBatch(@RequestBody DeleteAPIReportRequest reportRequest) { public void deleteAPIReportBatch(@RequestBody DeleteAPIReportRequest reportRequest) {
apiReportService.deleteAPIReportBatch(reportRequest); apiReportService.deleteAPIReportBatch(reportRequest);
} }

2
backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
View File

@ -53,6 +53,7 @@ public class PerformanceReportController {
} }
@PostMapping("/delete/{reportId}") @PostMapping("/delete/{reportId}")
@RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER}, logical = Logical.OR)
public void deleteReport(@PathVariable String reportId) { public void deleteReport(@PathVariable String reportId) {
reportService.deleteReport(reportId); reportService.deleteReport(reportId);
} }
@ -130,6 +131,7 @@ public class PerformanceReportController {
} }
@PostMapping("/batch/delete") @PostMapping("/batch/delete")
@RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER}, logical = Logical.OR)
public void deleteReportBatch(@RequestBody DeleteReportRequest reportRequest) { public void deleteReportBatch(@RequestBody DeleteReportRequest reportRequest) {
reportService.deleteReportBatch(reportRequest); reportService.deleteReportBatch(reportRequest);
} }

16
frontend/src/business/components/api/automation/ApiAutomation.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<ms-container> <ms-container>
<ms-aside-container> <ms-aside-container>
<ms-api-scenario-module <ms-api-scenario-module
@nodeSelectEvent="nodeChange" @nodeSelectEvent="nodeChange"
@refreshTable="refresh" @refreshTable="refresh"
@saveAsEdit="editScenario" @saveAsEdit="editScenario"
@setModuleOptions="setModuleOptions" @setModuleOptions="setModuleOptions"
@enableTrash="enableTrash" @enableTrash="enableTrash"
:type="'edit'" :type="'edit'"
ref="nodeTree"/> ref="nodeTree"/>
</ms-aside-container> </ms-aside-container>
<ms-main-container> <ms-main-container>

3
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -606,7 +606,8 @@
if (dropType != "inner") { if (dropType != "inner") {
return true; return true;
} }
else if (dropType === "inner" && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) { else if (dropType === "inner" && dropNode.data.referenced != 'REF' && dropNode.data.referenced != 'Deleted'
&& ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
return true; return true;
} }
return false; return false;