From 1df2920f4f448292f5e459e52dae00cae2e2b05b Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Mon, 22 Aug 2016 15:17:32 +0800 Subject: [PATCH] fix table prop bug --- packages/table/src/table-header.js | 2 +- packages/table/src/table.vue | 13 +++++++------ packages/theme-default/src/step.css | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js index 2d220fbce..a935f60c8 100644 --- a/packages/table/src/table-header.js +++ b/packages/table/src/table-header.js @@ -45,7 +45,7 @@ export default { class="gutter" style={{ width: (this.$parent.showVScrollBar - ? this.$parent.gutterWidth + ? this.$parent.currentGutterWidth : 0 ) + 'px' }}> ) diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue index d311f75a3..dc1a309a6 100644 --- a/packages/table/src/table.vue +++ b/packages/table/src/table.vue @@ -5,7 +5,7 @@
- +
@@ -160,8 +160,8 @@ } }); - if (bodyMinWidth < bodyWidth - this.gutterWidth) { // do not have scroll bar. - let flexWidthTotal = bodyWidth - this.gutterWidth - columns.length - bodyMinWidth; + if (bodyMinWidth < bodyWidth - this.currentGutterWidth) { // do not have scroll bar. + let flexWidthTotal = bodyWidth - this.currentGutterWidth - columns.length - bodyMinWidth; let flexWidthPerColumn = Math.floor(flexWidthTotal / flexColumns.length); let flexWidthFirstColumn = flexWidthTotal - flexWidthPerColumn * flexColumns.length + flexWidthPerColumn; @@ -254,7 +254,7 @@ const fixedBodyWrapper = this.$el.querySelector('.el-table__fixed-body-wrapper'); if (fixedBodyWrapper) { - fixedBodyWrapper.style.height = (this.showHScrollBar ? gridWrapper.offsetHeight - this.gutterWidth : gridWrapper.offsetHeight) + 'px'; + fixedBodyWrapper.style.height = (this.showHScrollBar ? gridWrapper.offsetHeight - this.currentGutterWidth : gridWrapper.offsetHeight) + 'px'; } } }, @@ -317,7 +317,7 @@ if (GUTTER_WIDTH === undefined) { GUTTER_WIDTH = getScrollBarWidth(); } - this.gutterWidth = GUTTER_WIDTH; + this.currentGutterWidth = GUTTER_WIDTH; this.debouncedReRender = debounce(50, () => { this.doRender(); @@ -428,7 +428,8 @@ sortingColumn: null, sortingProperty: null, sortingDirection: 1, - visibleFilter: null + visibleFilter: null, + currentGutterWidth: this.gutterWidth }; } }; diff --git a/packages/theme-default/src/step.css b/packages/theme-default/src/step.css index 9a6b5bf1d..80c83a198 100644 --- a/packages/theme-default/src/step.css +++ b/packages/theme-default/src/step.css @@ -142,6 +142,7 @@ @e main { white-space: normal; padding-right: 10px; + text-align: left; } @e title {