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/v1.7' into v1.7

This commit is contained in:
wenyann 2021-01-29 11:54:27 +08:00
parent 5ad5d1c702 481d9b0964
commit f90778db22
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
View File

@ -256,25 +256,21 @@ public abstract class MsTestElement {
return getRootParent(element.getParent()); return getRootParent(element.getParent());
} }
protected String getParentName(MsTestElement element, ParameterConfig config) { protected String getParentName(MsTestElement parent, ParameterConfig config) {
if (element != null) { if (parent != null) {
MsTestElement parent = this.getRootParent(element); if (MsTestElementConstants.LoopController.name().equals(parent.getType())) {
if (parent != null) { MsLoopController loopController = (MsLoopController) parent;
if (MsTestElementConstants.LoopController.name().equals(parent.getType())) { if (StringUtils.equals(loopController.getLoopType(), LoopConstants.WHILE.name()) && loopController.getWhileController() != null) {
MsLoopController loopController = (MsLoopController) parent; return "While 循环-" + "${LoopCounterConfigXXX}";
if (StringUtils.equals(loopController.getLoopType(), LoopConstants.WHILE.name()) && loopController.getWhileController() != null) { }
return "While 循环-" + "${LoopCounterConfigXXX}"; if (StringUtils.equals(loopController.getLoopType(), LoopConstants.FOREACH.name()) && loopController.getForEachController() != null) {
} return "ForEach 循环-" + "${LoopCounterConfigXXX}";
if (StringUtils.equals(loopController.getLoopType(), LoopConstants.FOREACH.name()) && loopController.getForEachController() != null) { }
return "ForEach 循环-" + "${LoopCounterConfigXXX}"; if (StringUtils.equals(loopController.getLoopType(), LoopConstants.LOOP_COUNT.name()) && loopController.getCountController() != null) {
} return "次数循环-" + "${LoopCounterConfigXXX}";
if (StringUtils.equals(loopController.getLoopType(), LoopConstants.LOOP_COUNT.name()) && loopController.getCountController() != null) {
return "次数循环-" + "${LoopCounterConfigXXX}";
}
} }
return parent.getName();
} }
return element.getName(); return parent.getName();
} else if (config != null && StringUtils.isNotEmpty(config.getStep())) { } else if (config != null && StringUtils.isNotEmpty(config.getStep())) {
if (MsTestElementConstants.SCENARIO.name().equals(config.getStepType())) { if (MsTestElementConstants.SCENARIO.name().equals(config.getStepType())) {
return config.getStep(); return config.getStep();