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

Merge pull request #61 from spademan/master 

Table : 解决固定某一列的时候滚动条在冻结列不能被拖动的问题
pull/69/head
杨奕 2016-09-12 09:06:50 -05:00 committed by GitHub
parent b79691c89e 8e45ee8544
commit 1568f7c4f6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,6 @@
if (this.fixedColumnCount > 0) { if (this.fixedColumnCount > 0) {
let fixedBodyWidth = 0; let fixedBodyWidth = 0;
let fixedColumnCount = this.fixedColumnCount; let fixedColumnCount = this.fixedColumnCount;
columns.forEach(function(column, index) { columns.forEach(function(column, index) {
if (index < fixedColumnCount) { if (index < fixedColumnCount) {
fixedBodyWidth += column.realWidth; fixedBodyWidth += column.realWidth;
@ -252,7 +251,6 @@
const bodyHeight = (height - headerHeight); const bodyHeight = (height - headerHeight);
const gridWrapper = this.$el.querySelector('.el-table__body-wrapper'); const gridWrapper = this.$el.querySelector('.el-table__body-wrapper');
gridWrapper.style.height = bodyHeight + 'px'; gridWrapper.style.height = bodyHeight + 'px';
this.$el.style.height = height + 'px'; this.$el.style.height = height + 'px';
if (this.$refs.fixed) { if (this.$refs.fixed) {
this.$refs.fixed.style.height = height + 'px'; this.$refs.fixed.style.height = height + 'px';
@ -420,8 +418,9 @@
this.$nextTick(() => { this.$nextTick(() => {
const style = this.$refs.fixed.style; const style = this.$refs.fixed.style;
if (!style) return; if (!style) return;
style.height = this.$el.clientHeight + 'px'; // style.height = this.$el.clientHeight + 'px';
// 存在横向滚动条的时候应该要减去滚动条的高度
style.height = (this.showHScrollBar ? this.$el.clientHeight - this.currentGutterWidth : this.$el.clientHeight) + 'px';
// 若非固定列中的某行内容被撑高, 需要固定列中对应行高度与其保持一致 // 若非固定列中的某行内容被撑高, 需要固定列中对应行高度与其保持一致
let bodyHeight = this.$el.querySelector('.el-table__body-wrapper').offsetHeight; let bodyHeight = this.$el.querySelector('.el-table__body-wrapper').offsetHeight;
let fixedBodyHeight = this.$el.querySelector('.el-table__fixed-body-wrapper').offsetHeight; let fixedBodyHeight = this.$el.querySelector('.el-table__fixed-body-wrapper').offsetHeight;