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

fix(接口测试): 修复场景步骤最大化移动顺序后调试不显示结果问题 

--bug=1013836 --user=赵勇 [接口测试]-新建场景-关联接口case-全屏-选环境-拖拽第一个用例到其他位置-调试没结果 https://www.tapd.cn/55049933/s/1175024
This commit is contained in:
fit2-zhao 2022-06-07 15:26:28 +08:00 committed by fit2-zhao
parent 4e9d9630f4
commit b2caf9d799
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -728,42 +728,46 @@ public class ApiAutomationService {
Boolean enable = request.getEnvironmentEnable();
String scenarioDefinition = request.getDefinition();
JSONObject element = JSON.parseObject(scenarioDefinition, Feature.DisableSpecialKeyDetect);
Map<String, String> environmentMap = new HashMap<>();
if (BooleanUtils.isFalse(enable)) {
String envType = request.getEnvironmentType();
String envGroupId = request.getEnvironmentGroupId();
if (StringUtils.equals(envType, EnvironmentType.GROUP.name())) {
environmentMap = environmentGroupProjectService.getEnvMap(envGroupId);
} else if (StringUtils.equals(envType, EnvironmentType.JSON.name())) {
environmentMap = request.getEnvironmentMap();
}
} else {
String scenarioId = request.getId();
ApiScenarioDTO scenario = getNewApiScenario(scenarioId);
if (scenario != null) {
String referenced = element.getString("referenced");
if (StringUtils.equalsIgnoreCase("REF", referenced)) {
JSONObject source = JSON.parseObject(scenario.getScenarioDefinition(), Feature.DisableSpecialKeyDetect);
element = jsonMerge(source, element);
try {
Map<String, String> environmentMap = new HashMap<>();
if (BooleanUtils.isFalse(enable)) {
String envType = request.getEnvironmentType();
String envGroupId = request.getEnvironmentGroupId();
if (StringUtils.equals(envType, EnvironmentType.GROUP.name())) {
environmentMap = environmentGroupProjectService.getEnvMap(envGroupId);
} else if (StringUtils.equals(envType, EnvironmentType.JSON.name())) {
environmentMap = request.getEnvironmentMap();
}
element.put("referenced", referenced);
String environmentType = scenario.getEnvironmentType();
String environmentGroupId = scenario.getEnvironmentGroupId();
String environmentJson = scenario.getEnvironmentJson();
if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name())) {
environmentMap = environmentGroupProjectService.getEnvMap(environmentGroupId);
} else if (StringUtils.equals(environmentType, EnvironmentType.JSON.name())) {
environmentMap = JSON.parseObject(environmentJson, Map.class);
} else {
String scenarioId = request.getId();
ApiScenarioDTO scenario = getNewApiScenario(scenarioId);
if (scenario != null) {
String referenced = element.getString("referenced");
if (StringUtils.equalsIgnoreCase("REF", referenced)) {
JSONObject source = JSON.parseObject(scenario.getScenarioDefinition(), Feature.DisableSpecialKeyDetect);
element = jsonMerge(source, element);
}
element.put("referenced", referenced);
String environmentType = scenario.getEnvironmentType();
String environmentGroupId = scenario.getEnvironmentGroupId();
String environmentJson = scenario.getEnvironmentJson();
if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name())) {
environmentMap = environmentGroupProjectService.getEnvMap(environmentGroupId);
} else if (StringUtils.equals(environmentType, EnvironmentType.JSON.name())) {
environmentMap = JSON.parseObject(environmentJson, Map.class);
}
}
}
}
ParameterConfig config = new ParameterConfig();
apiScenarioEnvService.setEnvConfig(environmentMap, config);
if (config.getConfig() != null && !config.getConfig().isEmpty()) {
ElementUtil.dataSetDomain(element.getJSONArray("hashTree"), config);
ParameterConfig config = new ParameterConfig();
apiScenarioEnvService.setEnvConfig(environmentMap, config);
if (config.getConfig() != null && !config.getConfig().isEmpty()) {
ElementUtil.dataSetDomain(element.getJSONArray("hashTree"), config);
}
return JSON.toJSONString(element);
} catch (Exception e) {
return scenarioDefinition;
}
return JSON.toJSONString(element);
}
@ -813,7 +817,7 @@ public class ApiAutomationService {
config.setOperating(true);
config.getExcludeScenarioIds().add(apiScenario.getId());
try {
MsScenario scenario = JSONObject.parseObject(apiScenario.getScenarioDefinition(), MsScenario.class,Feature.DisableSpecialKeyDetect);
MsScenario scenario = JSONObject.parseObject(apiScenario.getScenarioDefinition(), MsScenario.class, Feature.DisableSpecialKeyDetect);
if (scenario == null) {
return null;
}
@ -823,7 +827,7 @@ public class ApiAutomationService {
String environmentJson = apiScenario.getEnvironmentJson();
String environmentGroupId = apiScenario.getEnvironmentGroupId();
if (StringUtils.equals(environmentType, EnvironmentType.JSON.name()) && StringUtils.isNotBlank(environmentJson)) {
scenario.setEnvironmentMap(JSON.parseObject(environmentJson, Map.class,Feature.DisableSpecialKeyDetect));
scenario.setEnvironmentMap(JSON.parseObject(environmentJson, Map.class, Feature.DisableSpecialKeyDetect));
} else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(environmentGroupId)) {
Map<String, String> envMap = environmentGroupProjectService.getEnvMap(environmentGroupId);
scenario.setEnvironmentMap(envMap);

1
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -336,6 +336,7 @@
@setCookieShare="setCookieShare"
@setSampleError="setSampleError"
@stop="stop"
@sort="sort"
@openScenario="openScenario"
@runScenario="runDebug"
@stopScenario="stop"

3
frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -737,9 +737,10 @@ export default {
},
allowDrag(draggingNode, dropNode, dropType) {
if (dropNode && draggingNode && dropType) {
this.sort();
this.$emit("sort");
this.forceRerender();
this.cancelBatchProcessing();
}
},
nodeExpand(data) {