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

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

This commit is contained in:
fit2-zhao 2021-03-25 17:23:45 +08:00
parent f0492e1346 24c9b5d0a1
commit 5379c8b763
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,7 +433,7 @@
this.result.loading = false; this.result.loading = false;
this.unSelection = data.listObject.map(s => s.id); this.unSelection = data.listObject.map(s => s.id);
if (this.$refs.scenarioTable) { if (this.$refs.scenarioTable) {
this.$refs.scenarioTable.doLayout() setTimeout(this.$refs.scenarioTable.doLayout,500)
} }
}); });
} }

8
frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
View File

@ -643,7 +643,7 @@ export default {
if(lastIndex < this.currentApiIndexInApiShowArray){ if(lastIndex < this.currentApiIndexInApiShowArray){
//上移 //上移
if(this.needAsyncSelect){ // if(this.needAsyncSelect){
//进行判断：是否还需要为apiShowArray 增加数据。 由于在当前数据前后最多展现2条数据， //进行判断：是否还需要为apiShowArray 增加数据。 由于在当前数据前后最多展现2条数据，
//可得： apiStepIndex-1- 2 < apiInfoArray，需要添加数据 //可得： apiStepIndex-1- 2 < apiInfoArray，需要添加数据
let dataIndex = this.apiStepIndex -3; let dataIndex = this.apiStepIndex -3;
@ -657,11 +657,11 @@ export default {
if(this.apiShowArray.length > (this.currentApiIndexInApiShowArray+3)){ if(this.apiShowArray.length > (this.currentApiIndexInApiShowArray+3)){
this.apiShowArray.pop(); this.apiShowArray.pop();
} }
} // }
this.apiStepIndex --; this.apiStepIndex --;
}else if(lastIndex > this.currentApiIndexInApiShowArray){ }else if(lastIndex > this.currentApiIndexInApiShowArray){
//下滚 //下滚
if(this.needAsyncSelect){ // if(this.needAsyncSelect){
//进行判断：是否还需要为apiShowArray 增加数据。 由于在当前数据前后最多展现2条数据， //进行判断：是否还需要为apiShowArray 增加数据。 由于在当前数据前后最多展现2条数据，
//可得： apiStepIndex+1+ 2 < apiInfoArray，需要添加数据 //可得： apiStepIndex+1+ 2 < apiInfoArray，需要添加数据
let dataIndex = this.apiStepIndex +3; let dataIndex = this.apiStepIndex +3;
@ -678,7 +678,7 @@ export default {
let itemHeight = this.$refs.apiDocInfoDivItem[0].offsetHeight+10; let itemHeight = this.$refs.apiDocInfoDivItem[0].offsetHeight+10;
this.$refs.apiDocInfoDiv.scrollTop = (apiDocDivScrollTop-itemHeight); this.$refs.apiDocInfoDiv.scrollTop = (apiDocDivScrollTop-itemHeight);
} }
} // }
this.apiStepIndex ++; this.apiStepIndex ++;
} }
} }

2
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -340,7 +340,7 @@ export default {
} }
}) })
if (this.$refs.caseTable) { if (this.$refs.caseTable) {
this.$refs.caseTable.doLayout() setTimeout(this.$refs.caseTable.doLayout,500)
} }
}); });
} }

2
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -464,7 +464,7 @@
} }
}) })
if (this.$refs.apiDefinitionTable) { if (this.$refs.apiDefinitionTable) {
this.$refs.apiDefinitionTable.doLayout() setTimeout(this.$refs.apiDefinitionTable.doLayout, 500)
} }
}); });

2
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -399,7 +399,7 @@ export default {
item.tags = JSON.parse(item.tags); item.tags = JSON.parse(item.tags);
}) })
if (this.$refs.table) { if (this.$refs.table) {
this.$refs.table.doLayout() setTimeout(this.$refs.table.doLayout,500)
} }
}); });

2
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
View File

@ -477,7 +477,7 @@ export default {
} }
this.selectRows.clear(); this.selectRows.clear();
if (this.$refs.table) { if (this.$refs.table) {
this.$refs.table.doLayout() setTimeout(this.$refs.table.doLayout,500)
} }
}); });
} }