diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 58ee9b51..71b86e16 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/components/table/mixin.js b/src/components/table/mixin.js
index 63566d6d..3422455f 100644
--- a/src/components/table/mixin.js
+++ b/src/components/table/mixin.js
@@ -17,37 +17,13 @@ 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, index, top) {
+ setCellWidth (column) {
let width = '';
if (column.width) {
width = column.width;
} else if (this.columnsWidth[column._index]) {
width = this.columnsWidth[column._index].width;
}
- // when browser has scrollBar,set a width to resolve scroll position bug
- if (width && this.columns.length === index + 1 && top && this.$parent.bodyHeight !== 0 && column.fixed!=='left' && !this.fixed) {
- let scrollBarWidth = this.$parent.scrollBarWidth;
- if (!this.$parent.showVerticalScrollBar) scrollBarWidth = 0;
- width += scrollBarWidth;
- }
- // when fixed type,reset first right fixed column's width
- if (this.fixed === 'right' && top ) {
- //const firstFixedIndex = this.columns.lastIndexOf((col) => col.fixed === 'right');
- let lastFixedIndex = -1;
- for(let i=0;i
-
+
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 9891db7a..4d7f3a8b 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -1,7 +1,8 @@
-
+
+
@@ -59,6 +60,8 @@
+
+ |
@@ -93,12 +96,7 @@
computed: {
styles () {
const style = Object.assign({}, this.styleObject);
- let scrollBarWidth = this.$parent.scrollBarWidth;
- if(!this.$parent.showVerticalScrollBar) scrollBarWidth = 0;
-
- let isLeftFixed = this.$el && this.$el.parentElement.className.indexOf('fixed-header')>0;
- if(isLeftFixed) scrollBarWidth = 0;
- const width = this.$parent.bodyHeight === 0 ? parseInt(this.styleObject.width) : parseInt(this.styleObject.width) + scrollBarWidth;
+ const width = parseInt(this.styleObject.width) ;
style.width = `${width}px`;
return style;
},
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 217b8fff..62d9a6f6 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -5,7 +5,7 @@