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-30 18:32:39 +08:00
parent 5ed35abe59 5a205b9c1f
commit c23a31400e
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,18 +454,18 @@
item.tags = JSON.parse(item.tags);
}
})
// if (this.$refs.apiDefinitionTable) {
// setTimeout(() => {
// this.$refs.apiDefinitionTable.doLayout();
// this.result.loading = false;
// }, 500)
// }
// nexttick:表格加载完成之后触发。判断是否需要勾选行
this.$nextTick(function(){
if (this.$refs.apiDefinitionTable) {
if (this.$refs.apiDefinitionTable) {
setTimeout(() => {
this.$refs.apiDefinitionTable.doLayout();
this.result.loading = false;
}
}, 500)
}
// nexttick:表格加载完成之后触发。判断是否需要勾选行
this.$nextTick(function(){
// if (this.$refs.apiDefinitionTable) {
// this.$refs.apiDefinitionTable.doLayout();
// this.result.loading = false;
// }
this.checkTableRowIsSelect();
})
});

6
frontend/src/business/components/common/components/MsTabButton.vue
View File

@ -102,9 +102,9 @@ export default {
<style scoped>
.active {
border: solid 1px #6d317c;
background-color: var(--primary_color);
color: #FFFFFF;
border: solid 1px #6d317c!important;
background-color: var(--primary_color)!important;
color: #FFFFFF!important;
}
.case-button {

4
frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
View File

@ -263,6 +263,8 @@ export default {
if (response.data.filter(p => p.id === this.resourcePool).length === 0) {
this.resourcePool = null;
}
this.resourcePoolChange();
})
},
getLoadConfig() {
@ -354,7 +356,7 @@ export default {
result[0].resources.forEach(resource => {
threadNumber += JSON.parse(resource.configuration).maxConcurrency;
})
this.maxThreadNumbers = threadNumber;
this.$set(this, 'maxThreadNumbers', threadNumber);
this.threadGroups.forEach(tg => {
if (tg.threadNumber > threadNumber) {
this.$set(tg, "threadNumber", threadNumber);