From 892fcdebe4ed2ed72d5877d0effa7fc2d9d06484 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 21 Oct 2020 18:29:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?= =?UTF-8?q?=20xmind=202020=20=E7=89=88=E6=9C=AC=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java | 2 +- backend/src/main/java/io/metersphere/xpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java index 1c765f8ae7..7406ffec73 100644 --- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java +++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java @@ -231,7 +231,7 @@ public class XmindCaseParser { JSONObject step = new JSONObject(true); step.put("num", i + 1); step.put("desc", attacheds.get(i).getTitle()); - if (attacheds.get(i).getChildren() != null && !attacheds.get(i).getChildren().getAttached().isEmpty()) { + if (attacheds.get(i) != null && attacheds.get(i).getChildren() != null && attacheds.get(i).getChildren().getAttached()!=null) { step.put("result", attacheds.get(i).getChildren().getAttached().get(0).getTitle()); } jsonArray.add(step); diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index cf6b065263..ee74568be0 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit cf6b06526324326a563d933e07118fac014a63b4 +Subproject commit ee74568be0beba46da19616f5832e83f9164c688 From 815fada03411bbb010a95693a8d02eff2d75edf0 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Wed, 21 Oct 2020 19:05:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=97=A0=E5=8F=8D=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/components/track/case/TestCase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue index a0b27b18a2..748faf85c0 100644 --- a/frontend/src/business/components/track/case/TestCase.vue +++ b/frontend/src/business/components/track/case/TestCase.vue @@ -111,7 +111,7 @@ } let caseId = this.$route.params.caseId; this.openRecentTestCaseEditDialog(caseId); - // this.$router.push('/track/case/all'); + this.$router.push('/track/case/all'); } else if (route.params.projectId){ this.getProjects(); this.getProjectById(route.params.projectId);