Commit 13242356 authored by fit2-zhao's avatar fit2-zhao
Browse files

Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8

parents d90daa49 22463ee6
Showing with 15 additions and 9 deletions
+15 -9
......@@ -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);
......
......@@ -58,22 +58,26 @@
}
},
run() {
let projectId = this.$store.state.projectId;
// 如果envMap不存在,是单接口调用
if (!this.envMap || this.envMap.size === 0) {
projectId = this.$store.state.projectId;
} else {
// 场景步骤下接口调用
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 projectId = "";
// 如果envMap不存在,是单接口调用
if (!this.envMap || this.envMap.size === 0) {
projectId = this.$store.state.projectId;
} else {
// 场景步骤下接口调用
projectId = this.runData.projectId;
}
let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId: projectId, environmentMap: strMapToObj(this.envMap)};
let bodyFiles = getBodyUploadFiles(reqObj, this.runData);
let url = "";
......
......@@ -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 = [];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment