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:
wxg0103 2024-06-19 19:29:28 +08:00 committed by Craftsman
parent 3fa5a7dc6e
commit f2318eb253
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/services/test-plan/src/main/java/io/metersphere/plan/service/PlanRunTestPlanApiCaseService.java
View File

@ -13,7 +13,10 @@ import io.metersphere.api.service.definition.ApiTestCaseBatchRunService;
import io.metersphere.api.service.definition.ApiTestCaseService; import io.metersphere.api.service.definition.ApiTestCaseService;
import io.metersphere.api.service.queue.ApiExecutionQueueService; import io.metersphere.api.service.queue.ApiExecutionQueueService;
import io.metersphere.api.service.queue.ApiExecutionSetService; import io.metersphere.api.service.queue.ApiExecutionSetService;
import io.metersphere.plan.domain.*; import io.metersphere.plan.domain.TestPlan;
import io.metersphere.plan.domain.TestPlanCollection;
import io.metersphere.plan.domain.TestPlanReportApiCase;
import io.metersphere.plan.domain.TestPlanReportApiCaseExample;
import io.metersphere.plan.mapper.ExtTestPlanReportApiCaseMapper; import io.metersphere.plan.mapper.ExtTestPlanReportApiCaseMapper;
import io.metersphere.plan.mapper.TestPlanMapper; import io.metersphere.plan.mapper.TestPlanMapper;
import io.metersphere.plan.mapper.TestPlanReportApiCaseMapper; import io.metersphere.plan.mapper.TestPlanReportApiCaseMapper;
@ -70,6 +73,7 @@ public class PlanRunTestPlanApiCaseService {
/** /**
* 串行批量执行 * 串行批量执行
*
* @Return 是否执行完毕 * @Return 是否执行完毕
*/ */
public boolean serialExecute(TestPlanExecutionQueue testPlanExecutionQueue) { public boolean serialExecute(TestPlanExecutionQueue testPlanExecutionQueue) {
@ -97,6 +101,7 @@ public class PlanRunTestPlanApiCaseService {
/** /**
* 并行批量执行 * 并行批量执行
*
* @return 是否执行完毕 * @return 是否执行完毕
*/ */
public boolean parallelExecute(TestPlanExecutionQueue testPlanExecutionQueue) { public boolean parallelExecute(TestPlanExecutionQueue testPlanExecutionQueue) {
@ -238,7 +243,7 @@ public class PlanRunTestPlanApiCaseService {
private ApiReport getApiReport(ApiRunModeConfigDTO runModeConfig, TestPlanReportApiCase testPlanReportApiCase, ApiTestCase apiTestCase, String userId) { private ApiReport getApiReport(ApiRunModeConfigDTO runModeConfig, TestPlanReportApiCase testPlanReportApiCase, ApiTestCase apiTestCase, String userId) {
ApiReport apiReport = apiTestCaseBatchRunService.getApiReport(runModeConfig, apiTestCase, userId); ApiReport apiReport = apiTestCaseBatchRunService.getApiReport(runModeConfig, apiTestCase, userId);
apiReport.setEnvironmentId(apiBatchRunBaseService.getEnvId(runModeConfig, testPlanReportApiCase.getEnvironmentId())); apiReport.setEnvironmentId(apiBatchRunBaseService.getEnvId(runModeConfig, testPlanReportApiCase.getEnvironmentId()));
apiReport.setTestPlanCaseId(testPlanReportApiCase.getApiCaseId()); apiReport.setTestPlanCaseId(testPlanReportApiCase.getTestPlanApiCaseId());
return apiReport; return apiReport;
} }

2
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java
View File

@ -723,7 +723,7 @@ public class TestPlanApiCaseService extends TestPlanResourceService {
// 初始化报告 // 初始化报告
ApiReport apiReport = apiTestCaseService.getApiReport(apiTestCase, reportId, runModeConfig.getPoolId(), userId); ApiReport apiReport = apiTestCaseService.getApiReport(apiTestCase, reportId, runModeConfig.getPoolId(), userId);
apiReport.setEnvironmentId(runModeConfig.getEnvironmentId()); apiReport.setEnvironmentId(runModeConfig.getEnvironmentId());
apiReport.setTestPlanCaseId(testPlanApiCase.getTestPlanId()); apiReport.setTestPlanCaseId(testPlanApiCase.getId());
// 创建报告和用例的关联关系 // 创建报告和用例的关联关系
ApiTestCaseRecord apiTestCaseRecord = apiTestCaseService.getApiTestCaseRecord(apiTestCase, apiReport); ApiTestCaseRecord apiTestCaseRecord = apiTestCaseService.getApiTestCaseRecord(apiTestCase, apiReport);

2
frontend/src/views/api-test/scenario/components/executeHistory.vue
View File

@ -123,7 +123,7 @@
dataIndex: 'id', dataIndex: 'id',
slotName: 'num', slotName: 'num',
fixed: 'left', fixed: 'left',
width: 180, width: 280,
}, },
{ {
title: 'apiScenario.executeHistory.execution.triggerMode', title: 'apiScenario.executeHistory.execution.triggerMode',

2
frontend/src/views/setting/organization/project/locale/zh-CN.ts
View File

@ -55,7 +55,7 @@ export default {
'system.project.endTitle': '结束项目', 'system.project.endTitle': '结束项目',
'system.project.enableContent': '开启后的项目展示在项目切换列表', 'system.project.enableContent': '开启后的项目展示在项目切换列表',
'system.project.endContent': '结束后的项目不展示在项目切换列表', 'system.project.endContent': '结束后的项目不展示在项目切换列表',
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复', 'system.project.projectNamePlaceholder': '请输入项目名称，不可与其他项目名称重复',
'system.project.updateProject': '更新项目', 'system.project.updateProject': '更新项目',
'system.project.createProject': '创建项目', 'system.project.createProject': '创建项目',
'system.project.affiliatedOrg': '所属组织', 'system.project.affiliatedOrg': '所属组织',

2
frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
View File

@ -57,7 +57,7 @@ export default {
'system.project.endTitle': '结束项目', 'system.project.endTitle': '结束项目',
'system.project.enableContent': '开启后的项目展示在项目切换列表', 'system.project.enableContent': '开启后的项目展示在项目切换列表',
'system.project.endContent': '结束后的项目不展示在项目切换列表', 'system.project.endContent': '结束后的项目不展示在项目切换列表',
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复', 'system.project.projectNamePlaceholder': '请输入项目名称，不可与其他项目名称重复',
'system.project.updateProject': '更新项目', 'system.project.updateProject': '更新项目',
'system.project.createProject': '创建项目', 'system.project.createProject': '创建项目',
'system.project.affiliatedOrg': '所属组织', 'system.project.affiliatedOrg': '所属组织',