test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
song.tianyang 2021-03-24 14:27:45 +08:00
parent 9ff5446b68 792a5afa7d
commit 04ae742252
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
View File

@ -218,6 +218,10 @@
default: false,
},
selectNodeIds: Array,
selectProjectId: {
type: String,
default: ""
},
trashEnable: {
type: Boolean,
default: false,
@ -342,7 +346,7 @@
},
watch: {
selectNodeIds() {
this.search();
this.selectProjectId ? this.search(this.selectProjectId) : this.search();
},
trashEnable() {
if (this.trashEnable) {

2
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -585,7 +585,7 @@
arr[i].projectId = scenarioProjectId ? scenarioProjectId : this.projectId;
}
if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
this.recursiveSorting(arr[i].hashTree);
this.recursiveSorting(arr[i].hashTree, arr[i].projectId);
}
// 添加debug结果
if (this.debugResult && this.debugResult.get(arr[i].id)) {

2
frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
View File

@ -16,6 +16,7 @@
<ms-api-scenario-list
:select-node-ids="selectNodeIds"
:select-project-id="projectId"
:referenced="true"
:trash-enable="false"
@selection="setData"
@ -131,6 +132,7 @@
},
setProject(projectId) {
this.projectId = projectId;
this.selectNodeIds = [];
},
}
}

2
frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -500,7 +500,7 @@
arr[i].projectId = scenarioProjectId ? scenarioProjectId : this.projectId;
}
if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
this.recursiveSorting(arr[i].hashTree);
this.recursiveSorting(arr[i].hashTree, arr[i].projectId);
}
// 添加debug结果
if (this.debugResult && this.debugResult.get(arr[i].id)) {

28
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
View File

@ -491,7 +491,7 @@ export default {
}
this.testCase = item;
this.getRelatedTest();
this.initTest();
// this.initTest();
this.getIssues(item.caseId);
this.stepResultChange();
this.getFileMetaData(item);
@ -519,19 +519,19 @@ export default {
listenGoBack(this.handleClose);
this.initData(testCase);
},
initTest() {
this.$nextTick(() => {
if (this.testCase.testId && this.testCase.testId !== 'other') {
if (this.testCase.method === 'auto') {
if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
this.$refs.apiTestDetail.init();
} else if (this.testCase.type === 'performance') {
this.$refs.performanceTestDetail.init();
}
}
}
});
},
// initTest() {
// this.$nextTick(() => {
// if (this.testCase.testId && this.testCase.testId !== 'other') {
// if (this.testCase.method === 'auto') {
// if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
// this.$refs.apiTestDetail.init();
// } else if (this.testCase.type === 'performance') {
// this.$refs.performanceTestDetail.init();
// }
// }
// }
// });
// },
testRun(reportId) {
this.testCase.reportId = reportId;
this.saveReport(reportId);