diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java index 28c45863cb..f51fa0370e 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java @@ -160,6 +160,9 @@ public class ApiAutomationController { public void runDebug(@RequestPart("request") RunDefinitionRequest request, @RequestPart(value = "bodyFiles", required = false) List bodyFiles, @RequestPart(value = "scenarioFiles", required = false) List scenarioFiles) { request.setExecuteType(ExecuteType.Debug.name()); + if (request.isSaved()) { + request.setExecuteType(ExecuteType.Saved.name()); + } apiAutomationService.debugRun(request, bodyFiles, scenarioFiles); } @@ -245,6 +248,7 @@ public class ApiAutomationController { public List batchGenPerformanceTestJmx(@RequestBody ApiScenarioBatchRequest request) { return apiAutomationService.batchGenPerformanceTestJmx(request); } + @PostMapping("/batchCopy") public void batchCopy(@RequestBody ApiScenarioBatchRequest request) { apiAutomationService.batchCopy(request); diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java index db655caa72..8b2759141d 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java @@ -17,6 +17,8 @@ public class RunDefinitionRequest { private String reportId; + private boolean saved; + private String requestId; private String name; diff --git a/frontend/src/business/components/api/automation/scenario/DebugRun.vue b/frontend/src/business/components/api/automation/scenario/DebugRun.vue index b94ccd5461..e47d2a724d 100644 --- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue +++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue @@ -14,6 +14,7 @@ import {saveScenario} from "@/business/components/api/automation/api-automation" debug: Boolean, reportId: String, runData: Object, + saved: Boolean, }, data() { return { @@ -42,7 +43,7 @@ import {saveScenario} from "@/business/components/api/automation/api-automation" this.runData.projectId = getCurrentProjectID(); threadGroup.hashTree.push(this.runData); testPlan.hashTree.push(threadGroup); - let reqObj = {id: this.reportId, reportId: this.reportId, scenarioName: this.runData.name, + let reqObj = {id: this.reportId, reportId: this.reportId, scenarioName: this.runData.name,saved:this.saved, scenarioId: this.runData.id, testElement: testPlan, projectId: getCurrentProjectID(), environmentMap: strMapToObj(map)}; saveScenario('/api/automation/run/debug', reqObj, this.runData.hashTree, (response) => { this.runId = response.data; diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue index 61e9c36059..33d6e02716 100644 --- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue +++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue @@ -146,7 +146,7 @@ {{ $t('api_test.request.debug') }} - {{ $t('test_track.case.steps') }} + {{ $t('api_test.automation.generate_report') }} 执行中 @@ -235,13 +235,13 @@ - - + diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue index 6a68d52e81..f6df1d7e78 100644 --- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue +++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue @@ -19,7 +19,7 @@
共享cookie - 失败继续 + {{$t('commons.failure_continues')}} {{ $t('api_test.request.debug') }} - {{ $t('test_track.case.steps') }} + {{ $t('api_test.automation.generate_report') }} 执行中 diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 973ab2efed..2113b27f66 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -930,6 +930,7 @@ export default { request_total: "request", request_success: "success", request_error: "error", + generate_report: "Generate report", }, environment: { create: 'Create environment', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index fc201d33ca..dec844a605 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -929,6 +929,7 @@ export default { request_total: "请求", request_success: "成功", request_error: "失败", + generate_report: "生成报告", }, environment: { create: '创建环境', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 593d4a3fce..21210537fd 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -930,6 +930,7 @@ export default { request_total: "請求", request_success: "成功", request_error: "失敗", + generate_report: "生成報告", }, environment: { create: '創建環境',