diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 1b709f4..6784a60 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -57,7 +57,7 @@ $base-menu-item-height: 50px; //app-main的高度 $base-app-main-height: calc( 100vh - #{$base-nav-bar-height} - #{$base-tabs-bar-height} - #{$base-padding} - - #{$base-padding} - 55px - 30px + #{$base-padding} - 55px - 55px ); //纵向布局时左侧导航未折叠时的宽度 $base-left-menu-width: 240px; diff --git a/src/utils/vab.js b/src/utils/vab.js index 94feb20..e2e3d1d 100644 --- a/src/utils/vab.js +++ b/src/utils/vab.js @@ -132,7 +132,7 @@ const install = (Vue, opts = {}) => { const formHeight = 50 if (layout === 'vertical') { - paddingHeight = 340 + paddingHeight = 365 } if ('number' == typeof formType) { diff --git a/src/views/vab/table/index.vue b/src/views/vab/table/index.vue index 82bf96f..f634463 100644 --- a/src/views/vab/table/index.vue +++ b/src/views/vab/table/index.vue @@ -42,6 +42,7 @@ v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" + :height="height" @selection-change="setSelectRows" @sort-change="tableSortChange" > @@ -156,6 +157,12 @@ }, } }, + computed: { + height() { + alert(this.$baseTableHeight()) + return this.$baseTableHeight() + }, + }, created() { this.fetchData() },