github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #87 from QingWei-Li/feat/next-fix-table 

Feat/next fix table
pull/2/head
FuryBean 2016-08-22 16:41:20 +08:00 committed by GitHub
parent a0a3c57eec 699d288ec1
commit 07b9e00fa5
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/steps/src/step.vue
View File

@ -110,7 +110,7 @@ export default {
if (parent.direction === 'horizontal') { if (parent.direction === 'horizontal') {
this.style = { width: space }; this.style = { width: space };
this.mainOffset = -this.$refs.title.getBoundingClientRect().width / 2 + 16 + 'px'; // this.mainOffset = -this.$refs.title.getBoundingClientRect().width / 2 + 16 + 'px';
} else { } else {
this.style = { height: space }; this.style = { height: space };
} }

2
packages/table/src/table-header.js
View File

@ -45,7 +45,7 @@ export default {
class="gutter" class="gutter"
style={{ style={{
width: (this.$parent.showVScrollBar width: (this.$parent.showVScrollBar
? this.$parent.gutterWidth ? this.$parent.currentGutterWidth
: 0 : 0
) + 'px' ) + 'px'
}}>&nbsp;</th>) }}>&nbsp;</th>)

13
packages/table/src/table.vue
View File

@ -5,7 +5,7 @@
<table-header :columns="columns" :all-selected="allSelected" @allselectedchange="handleAllSelectedChange" :selection="selection" :style="{ width: bodyWidth ? bodyWidth + 'px' : '' }" :border="border"></table-header> <table-header :columns="columns" :all-selected="allSelected" @allselectedchange="handleAllSelectedChange" :selection="selection" :style="{ width: bodyWidth ? bodyWidth + 'px' : '' }" :border="border"></table-header>
</div> </div>
<div class="el-table__body-wrapper"> <div class="el-table__body-wrapper">
<table-body :columns="columns" :selection="selection" :data="filterData" :style="{ width: bodyWidth ? bodyWidth - (showVScrollBar ? gutterWidth : 0 ) + 'px' : '' }"></table-body> <table-body :columns="columns" :selection="selection" :data="filterData" :style="{ width: bodyWidth ? bodyWidth - (showVScrollBar ? currentGutterWidth : 0 ) + 'px' : '' }"></table-body>
</div> </div>
<div class="el-table__fixed" :style="{ width: fixedBodyWidth ? fixedBodyWidth + 'px' : '' }" ref="fixed"> <div class="el-table__fixed" :style="{ width: fixedBodyWidth ? fixedBodyWidth + 'px' : '' }" ref="fixed">
<div class="el-table__fixed-header-wrapper" v-if="fixedColumnCount > 0"> <div class="el-table__fixed-header-wrapper" v-if="fixedColumnCount > 0">
@ -160,8 +160,8 @@
} }
}); });
if (bodyMinWidth < bodyWidth - this.gutterWidth) { // do not have scroll bar. if (bodyMinWidth < bodyWidth - this.currentGutterWidth) { // do not have scroll bar.
let flexWidthTotal = bodyWidth - this.gutterWidth - columns.length - bodyMinWidth; let flexWidthTotal = bodyWidth - this.currentGutterWidth - columns.length - bodyMinWidth;
let flexWidthPerColumn = Math.floor(flexWidthTotal / flexColumns.length); let flexWidthPerColumn = Math.floor(flexWidthTotal / flexColumns.length);
let flexWidthFirstColumn = flexWidthTotal - flexWidthPerColumn * flexColumns.length + flexWidthPerColumn; let flexWidthFirstColumn = flexWidthTotal - flexWidthPerColumn * flexColumns.length + flexWidthPerColumn;
@ -254,7 +254,7 @@
const fixedBodyWrapper = this.$el.querySelector('.el-table__fixed-body-wrapper'); const fixedBodyWrapper = this.$el.querySelector('.el-table__fixed-body-wrapper');
if (fixedBodyWrapper) { 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) { if (GUTTER_WIDTH === undefined) {
GUTTER_WIDTH = getScrollBarWidth(); GUTTER_WIDTH = getScrollBarWidth();
} }
this.gutterWidth = GUTTER_WIDTH; this.currentGutterWidth = GUTTER_WIDTH;
this.debouncedReRender = debounce(50, () => { this.debouncedReRender = debounce(50, () => {
this.doRender(); this.doRender();
@ -428,7 +428,8 @@
sortingColumn: null, sortingColumn: null,
sortingProperty: null, sortingProperty: null,
sortingDirection: 1, sortingDirection: 1,
visibleFilter: null visibleFilter: null,
currentGutterWidth: this.gutterWidth
}; };
} }
}; };

1
packages/theme-default/src/step.css
View File

@ -142,6 +142,7 @@
@e main { @e main {
white-space: normal; white-space: normal;
padding-right: 10px; padding-right: 10px;
text-align: left;
} }
@e title { @e title {

1
packages/theme-default/src/steps.css
View File

@ -3,7 +3,6 @@
@component-namespace el { @component-namespace el {
@b steps { @b steps {
overflow: hidden;
font-size: 0; font-size: 0;
> :last-child .el-step__line { > :last-child .el-step__line {