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

Merge branch 'main' of https://github.com/metersphere/metersphere

This commit is contained in:
liqiang-fit2cloud 2022-12-29 14:10:51 +08:00
parent 179644acde 5d573053bb
commit 43e18e0c11
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
View File

@ -131,7 +131,8 @@ public class MsScenario extends MsTestElement {
scenarioTree.add(valueSupposeMock);
}
}
if (BooleanUtils.isTrue(this.variableEnable) || BooleanUtils.isTrue(this.mixEnable)) {
if ((this.variableEnable == null && this.mixEnable == null)
|| BooleanUtils.isTrue(this.variableEnable) || BooleanUtils.isTrue(this.mixEnable)) {
ElementUtil.addCsvDataSet(scenarioTree, variables, this.isEnvironmentEnable() ? newConfig : config, "shareMode.group");
ElementUtil.addCounter(scenarioTree, variables);
ElementUtil.addRandom(scenarioTree, variables);

5
test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
View File

@ -1428,8 +1428,11 @@ public class IssuesService {
public List<PlatformStatusDTO> getPlatformStatus(PlatformIssueTypeRequest request) {
List<PlatformStatusDTO> platformStatusDTOS = new ArrayList<>();
Project project = baseProjectService.getProjectById(request.getProjectId());
String projectConfig = PlatformPluginService.getCompatibleProjectConfig(project);
String platform = project.getPlatform();
if (StringUtils.equals(platform, IssuesManagePlatform.Local.name())) {
return null;
}
String projectConfig = PlatformPluginService.getCompatibleProjectConfig(project);
if (PlatformPluginService.isPluginPlatform(platform)) {
return platformPluginService.getPlatform(platform)
.getStatusList(projectConfig)

3
test-track/backend/src/main/java/io/metersphere/service/PlatformPluginService.java
View File

@ -105,6 +105,9 @@ public class PlatformPluginService {
public static String getCompatibleProjectConfig(Project project) {
String issueConfig = project.getIssueConfig();
if (StringUtils.isBlank(issueConfig)) {
return StringUtils.EMPTY;
}
Map map = JSON.parseMap(issueConfig);
compatibleProjectKey(map, "jiraKey", project.getJiraKey());
compatibleProjectKey(map, "tapdId", project.getTapdId());

2
test-track/frontend/src/business/issue/IssueList.vue
View File

@ -311,9 +311,11 @@ export default {
}).then((r) => {
this.platformStatus = r.data;
this.platformStatusMap = new Map();
if (this.platformStatus) {
this.platformStatus.forEach(item => {
this.platformStatusMap.set(item.value, item.label);
});
}
});
},
computed: {