refactor(测试计划): 调整测试计划保存属性以及扫码登陆配置去掉回调域名的设置
This commit is contained in:
parent
57a2f866cb
commit
0d06dbdb06
|
@ -126,6 +126,6 @@ test_plan.mind.test_plan=Test plan
|
||||||
test_plan.mind.serial=Serial
|
test_plan.mind.serial=Serial
|
||||||
test_plan.mind.parallel=Parallel
|
test_plan.mind.parallel=Parallel
|
||||||
test_plan.mind.strip=Strip
|
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.environment=Environment
|
||||||
test_plan.mind.test_resource_pool=Resource pool
|
test_plan.mind.test_resource_pool=Resource pool
|
|
@ -35,7 +35,7 @@ public class TestPlanCollectionMinderEditDTO implements Serializable {
|
||||||
|
|
||||||
@Schema(description = "测试集类型(功能:FUNCTIONAL/接口用例:API/场景:SCENARIO)", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "测试集类型(功能:FUNCTIONAL/接口用例:API/场景:SCENARIO)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotBlank(message = "{test_plan_collection_minder_edit.collection_type.not_blank}")
|
@NotBlank(message = "{test_plan_collection_minder_edit.collection_type.not_blank}")
|
||||||
private String collectionType;
|
private String type;
|
||||||
|
|
||||||
@Schema(description = "是否继承", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "是否继承", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "{test_plan_collection.extended.not_blank}")
|
@NotNull(message = "{test_plan_collection.extended.not_blank}")
|
||||||
|
|
|
@ -302,8 +302,8 @@ public class TestPlanCollectionMinderService {
|
||||||
BeanUtils.copyBean(testPlanCollection, testPlanCollectionMinderEditDTO);
|
BeanUtils.copyBean(testPlanCollection, testPlanCollectionMinderEditDTO);
|
||||||
testPlanCollection.setId(testPlanCollectionMinderEditDTO.getId());
|
testPlanCollection.setId(testPlanCollectionMinderEditDTO.getId());
|
||||||
testPlanCollection.setTestPlanId(request.getPlanId());
|
testPlanCollection.setTestPlanId(request.getPlanId());
|
||||||
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getCollectionType());
|
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getType());
|
||||||
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getCollectionType()).get(0);
|
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getType()).get(0);
|
||||||
if (StringUtils.equalsIgnoreCase(parent.getId(), testPlanCollectionMinderEditDTO.getId())) {
|
if (StringUtils.equalsIgnoreCase(parent.getId(), testPlanCollectionMinderEditDTO.getId())) {
|
||||||
testPlanCollection.setParentId(parent.getParentId());
|
testPlanCollection.setParentId(parent.getParentId());
|
||||||
} else {
|
} else {
|
||||||
|
@ -322,8 +322,8 @@ public class TestPlanCollectionMinderService {
|
||||||
BeanUtils.copyBean(testPlanCollection, testPlanCollectionMinderEditDTO);
|
BeanUtils.copyBean(testPlanCollection, testPlanCollectionMinderEditDTO);
|
||||||
testPlanCollection.setId(IDGenerator.nextStr());
|
testPlanCollection.setId(IDGenerator.nextStr());
|
||||||
testPlanCollection.setTestPlanId(request.getPlanId());
|
testPlanCollection.setTestPlanId(request.getPlanId());
|
||||||
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getCollectionType());
|
testPlanCollection.setType(testPlanCollectionMinderEditDTO.getType());
|
||||||
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getCollectionType()).get(0);
|
TestPlanCollection parent = parentMap.get(testPlanCollectionMinderEditDTO.getType()).get(0);
|
||||||
testPlanCollection.setParentId(parent.getId());
|
testPlanCollection.setParentId(parent.getId());
|
||||||
testPlanCollection.setCreateUser(userId);
|
testPlanCollection.setCreateUser(userId);
|
||||||
testPlanCollection.setCreateTime(System.currentTimeMillis());
|
testPlanCollection.setCreateTime(System.currentTimeMillis());
|
||||||
|
|
|
@ -63,7 +63,7 @@ public class TestPlanCollectionMinderControllerTests extends BaseTest {
|
||||||
testPlanCollectionMinderEditDTO.setName("更新名称");
|
testPlanCollectionMinderEditDTO.setName("更新名称");
|
||||||
testPlanCollectionMinderEditDTO.setNum(500L);
|
testPlanCollectionMinderEditDTO.setNum(500L);
|
||||||
testPlanCollectionMinderEditDTO.setExecuteMethod("PARALLEL");
|
testPlanCollectionMinderEditDTO.setExecuteMethod("PARALLEL");
|
||||||
testPlanCollectionMinderEditDTO.setCollectionType("API");
|
testPlanCollectionMinderEditDTO.setType("API");
|
||||||
testPlanCollectionMinderEditDTO.setExtended(false);
|
testPlanCollectionMinderEditDTO.setExtended(false);
|
||||||
testPlanCollectionMinderEditDTO.setGrouped(false);
|
testPlanCollectionMinderEditDTO.setGrouped(false);
|
||||||
testPlanCollectionMinderEditDTO.setEnvironmentId("gyq_123");
|
testPlanCollectionMinderEditDTO.setEnvironmentId("gyq_123");
|
||||||
|
@ -91,7 +91,7 @@ public class TestPlanCollectionMinderControllerTests extends BaseTest {
|
||||||
testPlanCollectionMinderEditDTO.setName("新建名称");
|
testPlanCollectionMinderEditDTO.setName("新建名称");
|
||||||
testPlanCollectionMinderEditDTO.setNum(500L);
|
testPlanCollectionMinderEditDTO.setNum(500L);
|
||||||
testPlanCollectionMinderEditDTO.setExecuteMethod("PARALLEL");
|
testPlanCollectionMinderEditDTO.setExecuteMethod("PARALLEL");
|
||||||
testPlanCollectionMinderEditDTO.setCollectionType("API");
|
testPlanCollectionMinderEditDTO.setType("API");
|
||||||
testPlanCollectionMinderEditDTO.setExtended(false);
|
testPlanCollectionMinderEditDTO.setExtended(false);
|
||||||
testPlanCollectionMinderEditDTO.setGrouped(false);
|
testPlanCollectionMinderEditDTO.setGrouped(false);
|
||||||
testPlanCollectionMinderEditDTO.setEnvironmentId("gyq_123");
|
testPlanCollectionMinderEditDTO.setEnvironmentId("gyq_123");
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<a-radio-group v-model:active-key="activeName" type="button" class="tabPlatform" @change="handleClick">
|
<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) }}
|
{{ t('project.messageManagement.' + item.value) }}
|
||||||
</a-radio>
|
</a-radio>
|
||||||
<!-- <a-tab-pane key="lark" :title="t('project.messageManagement.LARK')"></a-tab-pane>
|
<!-- <a-tab-pane key="lark" :title="t('project.messageManagement.LARK')"></a-tab-pane>
|
||||||
|
@ -45,7 +51,7 @@
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const activeName = ref('');
|
const activeName = ref('WE_COM');
|
||||||
|
|
||||||
interface qrOption {
|
interface qrOption {
|
||||||
value: string;
|
value: string;
|
||||||
|
|
Loading…
Reference in New Issue