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/v1.8' into v1.8

This commit is contained in:
Captain.B 2021-03-25 18:12:14 +08:00
parent 683430ec8d 5379c8b763
commit 1879984912
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/db/migration/V79__v1.8.1_release.sql Normal file
View File

@ -0,0 +1,2 @@
-- api_scenario_report modify column length
ALTER TABLE api_scenario_report MODIFY COLUMN name VARCHAR(300);

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 ++;
} }
} }