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

fix(xpack): 修复license数量显示为0 问题

This commit is contained in:
fit2-zhao 2021-02-18 14:23:31 +08:00
parent bdf11d09aa
commit 09b39ca249
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
View File

@ -102,7 +102,7 @@ public class MsLoopController extends MsTestElement {
return counterConfig; return counterConfig;
} }
private LoopController loopController() { private LoopController initLoopController() {
LoopController loopController = new LoopController(); LoopController loopController = new LoopController();
loopController.setEnabled(true); loopController.setEnabled(true);
loopController.setName("LoopController"); loopController.setName("LoopController");
@ -113,7 +113,7 @@ public class MsLoopController extends MsTestElement {
return loopController; return loopController;
} }
public String getCondition() { private String getCondition() {
String variable = "\"" + this.whileController.getVariable() + "\""; String variable = "\"" + this.whileController.getVariable() + "\"";
String operator = this.whileController.getOperator(); String operator = this.whileController.getOperator();
String value = "\"" + this.whileController.getValue() + "\""; String value = "\"" + this.whileController.getValue() + "\"";
@ -136,7 +136,7 @@ public class MsLoopController extends MsTestElement {
return "${__jexl3(" + variable + operator + value + ")}"; return "${__jexl3(" + variable + operator + value + ")}";
} }
private WhileController whileController() { private WhileController initWhileController() {
String condition = getCondition(); String condition = getCondition();
if (StringUtils.isEmpty(condition)) { if (StringUtils.isEmpty(condition)) {
return null; return null;
@ -150,7 +150,7 @@ public class MsLoopController extends MsTestElement {
return controller; return controller;
} }
private ForeachController foreachController() { private ForeachController initForeachController() {
ForeachController controller = new ForeachController(); ForeachController controller = new ForeachController();
controller.setEnabled(true); controller.setEnabled(true);
controller.setName("ForeachController"); controller.setName("ForeachController");
@ -175,13 +175,13 @@ public class MsLoopController extends MsTestElement {
runTime.setRuntime(timeout); runTime.setRuntime(timeout);
// 添加超时处理，防止死循环 // 添加超时处理，防止死循环
HashTree hashTree = tree.add(runTime); HashTree hashTree = tree.add(runTime);
return hashTree.add(whileController()); return hashTree.add(initWhileController());
} }
if (StringUtils.equals(this.loopType, LoopConstants.FOREACH.name()) && this.forEachController != null) { if (StringUtils.equals(this.loopType, LoopConstants.FOREACH.name()) && this.forEachController != null) {
return tree.add(foreachController()); return tree.add(initForeachController());
} }
if (StringUtils.equals(this.loopType, LoopConstants.LOOP_COUNT.name()) && this.countController != null) { if (StringUtils.equals(this.loopType, LoopConstants.LOOP_COUNT.name()) && this.countController != null) {
return tree.add(loopController()); return tree.add(initLoopController());
} }
return null; return null;
} }

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

@ -1 +1 @@
Subproject commit b35af517d888268abd3a8f2b58d6ea94335138a5 Subproject commit 5e0b365f1080197e84055e80071165787e2e79c5

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit a3d469fd18f663d11e5c1c49f71ced6e3e4b292f Subproject commit 4cc8926bad84083f675a262d6766a92bb09a890a