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/dev' into dev

This commit is contained in:
wenyann 2020-06-02 16:54:42 +08:00
parent 1c671aed3c 1a15ebae4e
commit 7849e771e5
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
View File

@ -37,12 +37,12 @@ public class EngineFactory {
public static Engine createEngine(LoadTestWithBLOBs loadTest) {
String resourcePoolId = loadTest.getTestResourcePoolId();
if (StringUtils.isBlank(resourcePoolId)) {
MSException.throwException("Resource Pool ID is empty.");
MSException.throwException(Translator.get("test_resource_pool_id_is_null"));
}
TestResourcePool resourcePool = testResourcePoolService.getResourcePool(resourcePoolId);
if (resourcePool == null) {
MSException.throwException("Resource Pool is empty.");
MSException.throwException(Translator.get("test_resource_pool_id_is_null"));
}
final ResourcePoolTypeEnum type = ResourcePoolTypeEnum.valueOf(resourcePool.getType());

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -36,6 +36,7 @@ workspace_name_already_exists=The workspace name already exists
workspace_does_not_belong_to_user=The current workspace does not belong to the current user
workspace_not_exists=Workspace is not exists
#test resource pool
test_resource_pool_id_is_null=Test Resource Pool ID cannot be null
test_resource_pool_name_is_null=Test Resource Pool name cannot be null
test_resource_pool_name_already_exists=The test resource pool name already exists
#project

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -36,6 +36,7 @@ workspace_name_already_exists=工作空间名已存在
workspace_does_not_belong_to_user=当前工作空间不属于当前用户
workspace_not_exists=工作空间不存在
#test resource pool
test_resource_pool_id_is_null=资源池ID不能为空
test_resource_pool_name_is_null=资源池名称不能为空
test_resource_pool_name_already_exists=资源池名称已存在
#project

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -36,6 +36,7 @@ workspace_name_already_exists=工作空間名已存在
workspace_does_not_belong_to_user=當前工作空間不屬於當前用戶
workspace_not_exists=工作空間不存在
#test resource pool
test_resource_pool_id_is_null=資源池ID不能為空
test_resource_pool_name_is_null=資源池名稱不能為空
test_resource_pool_name_already_exists=資源池名稱已存在
#project

13
frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
View File

@ -32,7 +32,7 @@
<performance-basic-config :test-plan="testPlan" ref="basicConfig"/>
</el-tab-pane>
<el-tab-pane :label="$t('load_test.pressure_config')">
<performance-pressure-config :test-plan="testPlan" :test-id="testId" ref="pressureConfig"/>
<performance-pressure-config :test-plan="testPlan" :test-id="testId" ref="pressureConfig" @changeActive="changeTabActive"/>
</el-tab-pane>
<el-tab-pane :label="$t('load_test.advanced_config')" class="advanced-config">
<performance-advanced-config :test-id="testId" ref="advancedConfig"/>
@ -156,9 +156,9 @@
});
},
saveAndRun() {
// if (!this.validTestPlan()) {
// return;
// }
if (!this.validTestPlan()) {
return;
}
let options = this.getSaveOption();
@ -239,6 +239,11 @@
/// todo: 其他校验
return true;
},
changeTabActive(activeName) {
this.$nextTick(()=> {
this.active = activeName;
});
}
}
}

2
frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
View File

@ -299,6 +299,8 @@
validConfig() {
if (!this.resourcePool) {
this.$warning(this.$t('load_test.resource_pool_is_null'));
// 资源池为空，设置参数为资源池所在Tab的name
this.$emit('changeActive', '1');
return false;
}