Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/api/controller/APIReportController.java

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

backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java

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

frontend/src/business/components/api/automation/ApiAutomation.vue

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

frontend/src/business/components/api/automation/scenario/EditApiScenario.vue

@@ -606,7 +606,8 @@
         if (dropType != "inner") {
           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 false;