Browse Source

Pull request #2201: BI-94391 fix: grid populate空数组滚动条仍然存在

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '6b1c1305138e5edb7cb694636710d73352176992':
  更新
  BI-94391 fix: grid populate空数组滚动条仍然存在
es6
windy 3 years ago
parent
commit
656f323258
  1. 20
      src/base/collection/collection.js
  2. 22
      src/base/grid/grid.js

20
src/base/collection/collection.js

@ -276,19 +276,17 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.options.items = items;
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this._width);
this.container.setHeight(this._height);
this.container.setWidth(this._width);
this.container.setHeight(this._height);
this._debounceRelease();
// 元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
this._calculateChildrenToRender();
this._debounceRelease();
// 元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
this._calculateChildrenToRender();
},
setScrollLeft: function (scrollLeft) {

22
src/base/grid/grid.js

@ -262,19 +262,17 @@ BI.GridView = BI.inherit(BI.Widget, {
this.options.items = items;
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
// 元素未挂载时不能设置scrollTop
this._debounceRelease();
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
this._calculateChildrenToRender();
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
// 元素未挂载时不能设置scrollTop
this._debounceRelease();
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
this._calculateChildrenToRender();
},
setScrollLeft: function (scrollLeft) {

Loading…
Cancel
Save