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

Merge branch 'master' of https://github.com/metersphere/server

This commit is contained in:
chenjianxing 2020-10-21 19:10:46 +08:00
parent e98755d38e 815fada034
commit 063b821de7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
View File

@ -231,7 +231,7 @@ public class XmindCaseParser {
JSONObject step = new JSONObject(true); JSONObject step = new JSONObject(true);
step.put("num", i + 1); step.put("num", i + 1);
step.put("desc", attacheds.get(i).getTitle()); 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()); step.put("result", attacheds.get(i).getChildren().getAttached().get(0).getTitle());
} }
jsonArray.add(step); jsonArray.add(step);

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

@ -1 +1 @@
Subproject commit cf6b06526324326a563d933e07118fac014a63b4 Subproject commit ee74568be0beba46da19616f5832e83f9164c688

2
frontend/src/business/components/track/case/TestCase.vue
View File

@ -111,7 +111,7 @@
} }
let caseId = this.$route.params.caseId; let caseId = this.$route.params.caseId;
this.openRecentTestCaseEditDialog(caseId); this.openRecentTestCaseEditDialog(caseId);
// this.$router.push('/track/case/all'); this.$router.push('/track/case/all');
} else if (route.params.projectId){ } else if (route.params.projectId){
this.getProjects(); this.getProjects();
this.getProjectById(route.params.projectId); this.getProjectById(route.params.projectId);