drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update Table

Browse source 
update Table
This commit is contained in:
梁灏 2017-01-05 13:15:26 +08:00
parent f23d6ba1ac
commit 3d6fa54b39
5 changed files with 288 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/table/mixin.js
View file

@ -11,15 +11,22 @@ export default {
isPopperShow (column) {
return column.filters && ((!this.fixed && !column.fixed) || (this.fixed === 'left' && column.fixed === 'left') || (this.fixed === 'right' && column.fixed === 'right'));
},
setCellWidth (column) {
// return column.width ? column.width : this.columnsWidth[index];
setCellWidth (column, index, top) {
let width = '';
if (column.width) {
width = column.width;
} else if (this.columnsWidth[column._index]) {
width = this.columnsWidth[column._index].width;
}
// return this.columnsWidth[column._index] ? this.columnsWidth[column._index].width : '';
// when browser has scrollBar,set a width to resolve scroll position bug
if (this.columns.length === index + 1 && top) {
width += this.$parent.scrollBarWidth;
}
// when fixed type,reset first right fixed column's width
if (this.fixed === 'right') {
const firstFixedIndex = this.columns.findIndex((col) => col.fixed === 'right');
if (firstFixedIndex === index) width += this.$parent.scrollBarWidth;
}
return width;
}
}

2
src/components/table/table-body.vue
View file

@ -1,7 +1,7 @@
<template>
<table cellspacing="0" cellpadding="0" border="0" :style="style">
<colgroup>
<col v-for="column in columns" :width="setCellWidth(column, $index)">
<col v-for="column in columns" :width="setCellWidth(column, $index, false)">
</colgroup>
<tbody :class="[prefixCls + '-tbody']">
<tr

2
src/components/table/table-head.vue
View file

@ -1,7 +1,7 @@
<template>
<table cellspacing="0" cellpadding="0" border="0" :style="style">
<colgroup>
<col v-for="column in columns" :width="setCellWidth(column, $index)">
<col v-for="column in columns" :width="setCellWidth(column, $index, true)">
</colgroup>
<thead>
<tr>

30
src/components/table/table.vue
View file

@ -85,7 +85,7 @@
<script>
import tableHead from './table-head.vue';
import tableBody from './table-body.vue';
import { oneOf, getStyle, deepCopy } from '../../utils/assist';
import { oneOf, getStyle, deepCopy, getScrollBarSize } from '../../utils/assist';
import Csv from '../../utils/csv';
import ExportCsv from './export-csv';
const prefixCls = 'ivu-table';
@ -143,11 +143,11 @@
},
noDataText: {
type: String,
default: '无数据'
default: '暂无数据'
},
noFilteredDataText: {
type: String,
default: '无筛选结果'
default: '暂无筛选结果'
}
},
data () {
@ -162,7 +162,8 @@
cloneColumns: this.makeColumns(),
showSlotHeader: true,
showSlotFooter: true,
bodyHeight: 0
bodyHeight: 0,
scrollBarWidth: getScrollBarSize()
};
},
computed: {
@ -189,13 +190,19 @@
},
styles () {
let style = {};
if (this.height) style.height = `${this.height}px`;
if (this.height) {
const height = (this.isLeftFixed || this.isRightFixed) ? parseInt(this.height) + this.scrollBarWidth : parseInt(this.height);
style.height = `${height}px`;
}
if (this.width) style.width = `${this.width}px`;
return style;
},
tableStyle () {
let style = {};
if (this.tableWidth !== 0) style.width = `${this.tableWidth}px`;
if (this.tableWidth !== 0) {
const width = this.bodyHeight === 0 ? this.tableWidth : this.tableWidth - this.scrollBarWidth;
style.width = `${width}px`;
}
return style;
},
fixedTableStyle () {
@ -213,17 +220,24 @@
this.rightFixedColumns.forEach((col) => {
if (col.fixed && col.fixed === 'right') width += col._width;
});
width += this.scrollBarWidth;
style.width = `${width}px`;
return style;
},
bodyStyle () {
let style = {};
if (this.bodyHeight !== 0) style.height = `${this.bodyHeight}px`;
if (this.bodyHeight !== 0) {
// add a height to resolve scroll bug when browser has a scrollBar in fixed type and height prop
const height = (this.isLeftFixed || this.isRightFixed) ? this.bodyHeight + this.scrollBarWidth : this.bodyHeight;
style.height = `${height}px`;
}
return style;
},
fixedBodyStyle () {
let style = {};
if (this.bodyHeight !== 0) style.height = `${this.bodyHeight - 1}px`;
if (this.bodyHeight !== 0) {
style.height = this.scrollBarWidth > 0 ? `${this.bodyHeight}px` : `${this.bodyHeight - 1}px`;
}
return style;
},
leftFixedColumns () {