|
|
@@ -62,8 +62,8 @@
|
|
|
</div>
|
|
|
<!--列表--><!-- @header-dragend="handleHeaderDragend" 拖拽事件取消 -->
|
|
|
<el-table
|
|
|
+ v-if="!loading"
|
|
|
ref="elTable"
|
|
|
- v-loading="loading"
|
|
|
border
|
|
|
:data="ibpsData"
|
|
|
:height="tableHeight"
|
|
|
@@ -123,6 +123,11 @@
|
|
|
</el-table-column>
|
|
|
<!--操作列end-->
|
|
|
</el-table>
|
|
|
+ <div
|
|
|
+ v-if="loading"
|
|
|
+ v-loading="loading"
|
|
|
+ :style="{ height: tableHeight + 'px' }"
|
|
|
+ />
|
|
|
<!--分页 或底部 自定义底部-->
|
|
|
<div
|
|
|
v-if="isShowPagination"
|
|
|
@@ -156,6 +161,7 @@
|
|
|
<script>
|
|
|
import { debounce } from 'lodash'
|
|
|
import { searchPagePermission, savePagePermission } from '@/api/permission/page'
|
|
|
+import height from '@/mixins/height'
|
|
|
export default {
|
|
|
name: 'board-list',
|
|
|
data() {
|
|
|
@@ -392,14 +398,6 @@ export default {
|
|
|
if (!this.tableHeight || this.tableHeight <= 0) {
|
|
|
// 页面加载完成后设置高度
|
|
|
debounce(this.handleTableHeight, 100)()
|
|
|
- } else {
|
|
|
- if (showToolbar) {
|
|
|
- if (this.showToolbar) {
|
|
|
- this.tableHeight -= this.toolbarBoxHeight
|
|
|
- } else {
|
|
|
- this.tableHeight += this.toolbarBoxHeight
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
if (this.$refs.elTable) {
|
|
|
this.$refs.elTable.doLayout()
|