diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue index 3abdc02222..9f1fcbda0d 100644 --- a/frontend/src/business/components/api/definition/ApiDefinition.vue +++ b/frontend/src/business/components/api/definition/ApiDefinition.vue @@ -392,8 +392,8 @@ } }, runTest(data) { - this.setTabTitle(data); this.handleTabsEdit(this.$t("commons.api"), "TEST", data); + this.setTabTitle(data); }, saveApi(data) { this.setTabTitle(data); diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue index 734419b84f..3ef992d3e9 100644 --- a/frontend/src/business/components/api/definition/components/Run.vue +++ b/frontend/src/business/components/api/definition/components/Run.vue @@ -58,22 +58,26 @@ } }, run() { - let testPlan = new TestPlan(); - let threadGroup = new ThreadGroup(); - threadGroup.hashTree = []; - testPlan.hashTree = [threadGroup]; - this.runData.forEach(item => { - threadGroup.hashTree.push(item); - }) - - let projectId = ""; + let projectId = this.$store.state.projectId; // 如果envMap不存在,是单接口调用 if (!this.envMap || this.envMap.size === 0) { projectId = this.$store.state.projectId; } else { // 场景步骤下接口调用 - projectId = this.runData.projectId; + if(this.runData.projectId){ + projectId = this.runData.projectId; + } } + + let testPlan = new TestPlan(); + let threadGroup = new ThreadGroup(); + threadGroup.hashTree = []; + testPlan.hashTree = [threadGroup]; + this.runData.forEach(item => { + item.projectId = projectId; + threadGroup.hashTree.push(item); + }) + let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId: projectId, environmentMap: strMapToObj(this.envMap)}; let bodyFiles = getBodyUploadFiles(reqObj, this.runData); let url = ""; diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue index d1e3834198..a6db51ab96 100644 --- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue +++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue @@ -306,6 +306,8 @@ this.$warning(this.$t('api_test.environment.select_environment')); return; } + this.envMap = new Map(); + this.envMap.set(this.$store.state.projectId,this.environment); this.runData = []; this.batchLoadingIds = []; this.selectdCases = [];