fix(UI自动化): 修复UI报告,循环嵌套循环时报告显示顺序错误
--bug=1014053 --user=刘瑶 【UI测试】UI报告,循环里套循环的时候,报告显示顺序不是循环的顺序 https://www.tapd.cn/55049933/s/1182950
This commit is contained in:
parent
dac8d7c0ec
commit
8e0e42775c
|
@ -1 +1 @@
|
||||||
Subproject commit e9dee3df2b87f216afdbd647c5a3e9e257c9f0e9
|
Subproject commit f25adf66433ef097f110b09af9e5f9e25933a212
|
|
@ -121,6 +121,7 @@ export default {
|
||||||
fullTreeNodes: [],
|
fullTreeNodes: [],
|
||||||
stepFilter: new STEP,
|
stepFilter: new STEP,
|
||||||
exportReportIsOk: false,
|
exportReportIsOk: false,
|
||||||
|
tempResult: [],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
activated() {
|
activated() {
|
||||||
|
@ -408,7 +409,14 @@ export default {
|
||||||
if (data.content) {
|
if (data.content) {
|
||||||
let report = JSON.parse(data.content);
|
let report = JSON.parse(data.content);
|
||||||
this.content = report;
|
this.content = report;
|
||||||
this.fullTreeNodes = report.steps;
|
if(data.reportType === "UI_INDEPENDENT"){
|
||||||
|
this.tempResult = report.steps;
|
||||||
|
//校对执行次序
|
||||||
|
this.checkOrder(this.tempResult);
|
||||||
|
this.fullTreeNodes = this.tempResult;
|
||||||
|
}else{
|
||||||
|
this.fullTreeNodes = report.steps;
|
||||||
|
}
|
||||||
this.content.console = report.console;
|
this.content.console = report.console;
|
||||||
this.content.error = report.error;
|
this.content.error = report.error;
|
||||||
let successCount = (report.total - report.error - report.errorCode - report.unExecute);
|
let successCount = (report.total - report.error - report.errorCode - report.unExecute);
|
||||||
|
@ -425,6 +433,23 @@ export default {
|
||||||
this.$warning(this.$t('commons.report_delete'));
|
this.$warning(this.$t('commons.report_delete'));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
checkOrder(origin){
|
||||||
|
if(!origin){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(origin.children && Array.isArray(origin.children)){
|
||||||
|
origin.children.sort((m,n)=>{
|
||||||
|
let mTime = m.value ? m.value.startTime ? m.value.startTime : 0 : 0;
|
||||||
|
let nTime = m.value ? n.value.startTime ? n.value.startTime : 0 : 0;
|
||||||
|
return mTime <= nTime;
|
||||||
|
})
|
||||||
|
origin.children.forEach(v => {
|
||||||
|
if(v.children){
|
||||||
|
this.checkOrder(v.children)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
buildReport() {
|
buildReport() {
|
||||||
if (this.report) {
|
if (this.report) {
|
||||||
if (this.isNotRunning) {
|
if (this.isNotRunning) {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a0ae979196ee8c9d152130b415df403ae80cae08
|
Subproject commit 9a499be8ea905306f4aae866ee94a05d9f150293
|
Loading…
Reference in New Issue