fix: 处理回收站的用例生成关系图的情况

backend/src/main/java/io/metersphere/dto/RelationshipGraphData.java

@@ -29,6 +29,7 @@ public class RelationshipGraphData {
         private Integer category; // 分组
         private Integer x;
         private Integer y;
+        private Boolean visited = false;
     }
 
     @Getter

backend/src/main/java/io/metersphere/track/controller/TestCaseController.java

@@ -302,7 +302,7 @@ public class TestCaseController {
     @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, target = "#targetClass.findByBatchRequest(#request)", targetClass = TestCaseService.class,
             event = NoticeConstants.Event.DELETE, mailTemplate = "track/TestCaseDelete", subject = "测试用例通知")
     public void deleteToGcBatch(@RequestBody TestCaseBatchRequest request) {
-        testCaseService.deleteToGcBatch(request);
+        testCaseService.deleteToGcBatch(request.getIds());
     }
 
     @PostMapping("/reduction")

backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java

@@ -259,7 +259,7 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
         List<String> testCaseIdList = this.selectCaseIdByNodeIds(nodeIds);
         TestCaseBatchRequest request = new TestCaseBatchRequest();
         request.setIds(testCaseIdList);
-        testCaseService.deleteToGcBatch(request);
+        testCaseService.deleteToGcBatch(request.getIds());
 
         TestCaseNodeExample testCaseNodeExample = new TestCaseNodeExample();
         testCaseNodeExample.createCriteria().andIdIn(nodeIds);

backend/src/main/java/io/metersphere/track/service/TestCaseService.java

@@ -1477,11 +1477,7 @@ public class TestCaseService {
             });
         }
         List<String> ids = request.getIds();
-        if (CollectionUtils.isNotEmpty(ids)) {
+        deleteToGcBatch(ids);
-            TestCaseBatchRequest deleteRequest = new TestCaseBatchRequest();
-            deleteRequest.setIds(ids);
-            deleteTestCaseBath(deleteRequest);
-        }
     }
 
     private void changeOrder(TestCaseMinderEditRequest.TestCaseMinderEditItem item, String projectId) {
@@ -1823,9 +1819,9 @@ public class TestCaseService {
         }
     }
 
-    public void deleteToGcBatch(TestCaseBatchRequest request) {
+    public void deleteToGcBatch(List<String> ids) {
-        if (CollectionUtils.isNotEmpty(request.getIds())) {
+        if (CollectionUtils.isNotEmpty(ids)) {
-            for (String id : request.getIds()) {
+            for (String id : ids) {
                 this.deleteTestCaseToGc(id);
             }
         }
@@ -1987,6 +1983,9 @@ public class TestCaseService {
                 } else {
                     testCase = caseMap.get(relationshipEdge.getSourceId());
                 }
+                if (testCase == null) {
+                    continue; // 用例可能在回收站
+                }
                 relationshipEdgeDTO.setTargetName(testCase.getName());
                 relationshipEdgeDTO.setCreator(testCase.getCreateUser());
                 relationshipEdgeDTO.setTargetNum(testCase.getNum());

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit a86e39275aae2a3e2e8aae705da5a4dddbd0089d
+Subproject commit a04a44ab83630eb73abeb0c22ff5e26833a3aa2f

frontend/src/business/components/track/case/components/TestCaseRelationshipList.vue

@@ -112,13 +112,15 @@ export default {
   computed: {
     isCustomNum() {
       let template = this.$store.state.testCaseTemplate;
-      template.customFields.forEach(item => {
+      if (template && template.customFields) {
-        if (item.name === '用例状态') {
+        template.customFields.forEach(item => {
-          for (let i = 0; i < item.options.length; i++) {
+          if (item.name === '用例状态') {
-            this.statusMap.set(item.options[i].value, item.options[i].text);
+            for (let i = 0; i < item.options.length; i++) {
+              this.statusMap.set(item.options[i].value, item.options[i].text);
+            }
           }
-        }
+        });
-      });
+      }
       return this.$store.state.currentProjectIsCustomNum;
     },
   },

frontend/src/business/components/track/issue/IssueList.vue

@@ -327,6 +327,9 @@ export default {
       });
     },
     btnDisable(row) {
+      if (this.issueTemplate.platform == "metersphere" && row.platform == 'Local') {
+        return false;
+      }
       if (this.issueTemplate.platform !== row.platform) {
         return true;
       }