Skip to content

Commit 263ebb0

Browse files
author
黄书伟
committed
fixed bug #34
1 parent 6d7e0cd commit 263ebb0

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

libs/v-table/src/drag-width-mixin.js

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,20 +147,35 @@ exports.default = {
147147
}
148148
}
149149

150-
var rightViewBody = this.$el.querySelector('.v-table-rightview .v-table-body');
150+
var rightViewBody = this.$el.querySelector('.v-table-rightview .v-table-body'),
151+
rightViewFooter = this.$el.querySelector('.v-table-rightview .v-table-footer'),
152+
hasTableFooter = this.hasTableFooter;
153+
151154
if (this.totalColumnsWidth < this.internalWidth) {
152155

153-
rightViewBody.style.overflowX = 'hidden';
156+
if (!hasTableFooter) {
157+
158+
rightViewBody.style.overflowX = 'hidden';
159+
160+
(0, _dom.removeClass)(rightViewBody, 'v-table-rightview-special-border');
161+
rightViewBody.classList.remove('v-table-rightview-special-border');
162+
} else {
154163

155-
(0, _dom.removeClass)(rightViewBody, 'v-table-rightview-special-border');
156-
rightViewBody.classList.remove('v-table-rightview-special-border');
164+
rightViewFooter.style.overflowX = 'hidden';
165+
}
157166
} else {
158167

159-
rightViewBody.style.overflowX = 'scroll';
168+
if (!hasTableFooter) {
169+
170+
rightViewBody.style.overflowX = 'scroll';
160171

161-
if (!this.hasFrozenColumn) {
172+
if (!this.hasFrozenColumn) {
173+
174+
(0, _dom.addClass)(rightViewBody, 'v-table-rightview-special-border');
175+
}
176+
} else {
162177

163-
(0, _dom.addClass)(rightViewBody, 'v-table-rightview-special-border');
178+
rightViewFooter.style.overflowX = 'scroll';
164179
}
165180
}
166181

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-easytable",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"description": "vue table component",
55
"main": "libs/index.js",
66
"author": "https://github.com/huangshuwei",

umd/js/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)