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

refactor(测试计划): 调整测试计划保存属性以及扫码登陆配置去掉回调域名的设置

This commit is contained in:
guoyuqi 2024-06-13 14:46:55 +08:00 committed by 刘瑞斌
parent 57a2f866cb
commit 0d06dbdb06
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/framework/sdk/src/main/resources/i18n/plan_en_US.properties
View File

@ -126,6 +126,6 @@ test_plan.mind.test_plan=Test plan
test_plan.mind.serial=Serial
test_plan.mind.parallel=Parallel
test_plan.mind.strip=Strip
test_plan.mind.case_count=Count
test_plan.mind.case_count=Case count
test_plan.mind.environment=Environment
test_plan.mind.test_resource_pool=Resource pool

2
backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanCollectionMinderEditDTO.java
View File

@ -35,7 +35,7 @@ public class TestPlanCollectionMinderEditDTO implements Serializable {
@Schema(description = "测试集类型(功能：FUNCTIONAL/接口用例：API/场景：SCENARIO)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection_minder_edit.collection_type.not_blank}")
private String collectionType;
private String type;
@Schema(description = "是否继承", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.extended.not_blank}")

8
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanCollectionMinderService.java
View File

@ -302,8 +302,8 @@ public class TestPlanCollectionMinderService {
BeanUtils.copyBean(testPlanCollection, testPlanCollectionMinderEditDTO);
testPlanCollection.setId(testPlanCollectionMinderEditDTO.getId());
testPlanCollection.setTestPlanId(request.getPlanId());
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getCollectionType());
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getCollectionType()).get(0);
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getType());
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getType()).get(0);
if (StringUtils.equalsIgnoreCase(parent.getId(), testPlanCollectionMinderEditDTO.getId())) {
testPlanCollection.setParentId(parent.getParentId());
} else {
@ -322,8 +322,8 @@ public class TestPlanCollectionMinderService {
BeanUtils.copyBean(testPlanCollection, testPlanCollectionMinderEditDTO);
testPlanCollection.setId(IDGenerator.nextStr());
testPlanCollection.setTestPlanId(request.getPlanId());
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getCollectionType());
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getCollectionType()).get(0);
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getType());
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getType()).get(0);
testPlanCollection.setParentId(parent.getId());
testPlanCollection.setCreateUser(userId);
testPlanCollection.setCreateTime(System.currentTimeMillis());

4
backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCollectionMinderControllerTests.java
View File

@ -63,7 +63,7 @@ public class TestPlanCollectionMinderControllerTests extends BaseTest {
testPlanCollectionMinderEditDTO.setName("更新名称");
testPlanCollectionMinderEditDTO.setNum(500L);
testPlanCollectionMinderEditDTO.setExecuteMethod("PARALLEL");
testPlanCollectionMinderEditDTO.setCollectionType("API");
testPlanCollectionMinderEditDTO.setType("API");
testPlanCollectionMinderEditDTO.setExtended(false);
testPlanCollectionMinderEditDTO.setGrouped(false);
testPlanCollectionMinderEditDTO.setEnvironmentId("gyq_123");
@ -91,7 +91,7 @@ public class TestPlanCollectionMinderControllerTests extends BaseTest {
testPlanCollectionMinderEditDTO.setName("新建名称");
testPlanCollectionMinderEditDTO.setNum(500L);
testPlanCollectionMinderEditDTO.setExecuteMethod("PARALLEL");
testPlanCollectionMinderEditDTO.setCollectionType("API");
testPlanCollectionMinderEditDTO.setType("API");
testPlanCollectionMinderEditDTO.setExtended(false);
testPlanCollectionMinderEditDTO.setGrouped(false);
testPlanCollectionMinderEditDTO.setEnvironmentId("gyq_123");

10
frontend/src/views/login/components/tabQrCode.vue
View File

@ -1,6 +1,12 @@
<template>
<a-radio-group v-model:active-key="activeName" type="button" class="tabPlatform" @change="handleClick">
<a-radio v-for="item of orgOptions" :key="item.value" :value="item.value" :v-show="item.label">
<a-radio
v-for="item of orgOptions"
:key="item.value"
:value="item.value"
:v-show="item.label"
class="radioOneButton"
>
{{ t('project.messageManagement.' + item.value) }}
</a-radio>
<!-- <a-tab-pane key="lark" :title="t('project.messageManagement.LARK')"></a-tab-pane>
@ -45,7 +51,7 @@
const { t } = useI18n();
const activeName = ref('');
const activeName = ref('WE_COM');
interface qrOption {
value: string;