Browse Source

表格滚动极大优化

master
guy 8 years ago
parent
commit
43d8ff77dd
  1. 58
      bi/base.js
  2. 8
      bi/core.js
  3. 58
      docs/base.js
  4. 8
      docs/core.js
  5. 21
      src/base/collection/collection.js
  6. 21
      src/base/grid/grid.js
  7. 8
      src/base/table/table.collection.js
  8. 8
      src/base/table/table.grid.js
  9. 8
      src/core/widget.js

58
bi/base.js

@ -2511,15 +2511,15 @@ BI.Canvas = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("bi.canvas", BI.Canvas);/** BI.shortcut("bi.canvas", BI.Canvas);/**
* Collection * CollectionView
* *
* Created by GUY on 2016/1/15. * Created by GUY on 2016/1/15.
* @class BI.Collection * @class BI.CollectionView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.Collection = BI.inherit(BI.Widget, { BI.CollectionView = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.Collection.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.CollectionView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-collection", baseCls: "bi-collection",
width: 400, width: 400,
height: 300, height: 300,
@ -2535,7 +2535,7 @@ BI.Collection = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.Collection.superclass._init.apply(this, arguments); BI.CollectionView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
@ -2554,7 +2554,7 @@ BI.Collection = BI.inherit(BI.Widget, {
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = self.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._calculateChildrenToRender(); self._calculateChildrenToRender();
self.fireEvent(BI.Collection.EVENT_SCROLL, { self.fireEvent(BI.CollectionView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop scrollTop: o.scrollTop
}); });
@ -2742,13 +2742,16 @@ BI.Collection = BI.inherit(BI.Widget, {
deleteArray.push(i); deleteArray.push(i);
}); });
BI.each(deleteArray, function (i, index) { BI.each(deleteArray, function (i, index) {
self.renderedCells[index].el.destroy(); //性能优化,不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy();
}); });
var addedItems = []; var addedItems = [];
BI.each(addSet, function (index) { BI.each(addSet, function (index) {
addedItems.push(renderedCells[index]) addedItems.push(renderedCells[index])
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
//拦截父子级关系
this.container._children = renderedCells;
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
@ -2859,8 +2862,8 @@ BI.Collection = BI.inherit(BI.Widget, {
this._populate(); this._populate();
} }
}); });
BI.Collection.EVENT_SCROLL = "EVENT_SCROLL"; BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut('bi.collection_view', BI.Collection);/** BI.shortcut('bi.collection_view', BI.CollectionView);/**
* @class BI.Combo * @class BI.Combo
* @extends BI.Widget * @extends BI.Widget
*/ */
@ -14646,15 +14649,15 @@ $.extend(BI, {
}; };
}() }()
});/** });/**
* Grid * GridView
* *
* Created by GUY on 2016/1/11. * Created by GUY on 2016/1/11.
* @class BI.Grid * @class BI.GridView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.Grid = BI.inherit(BI.Widget, { BI.GridView = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.Grid.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.GridView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-grid-view", baseCls: "bi-grid-view",
width: 400, width: 400,
height: 300, height: 300,
@ -14673,7 +14676,7 @@ BI.Grid = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.Grid.superclass._init.apply(this, arguments); BI.GridView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
@ -14692,7 +14695,7 @@ BI.Grid = BI.inherit(BI.Widget, {
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = self.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._calculateChildrenToRender(); self._calculateChildrenToRender();
self.fireEvent(BI.Grid.EVENT_SCROLL, { self.fireEvent(BI.GridView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop scrollTop: o.scrollTop
}); });
@ -14840,13 +14843,16 @@ BI.Grid = BI.inherit(BI.Widget, {
deleteArray.push(i); deleteArray.push(i);
}); });
BI.each(deleteArray, function (i, index) { BI.each(deleteArray, function (i, index) {
self.renderedCells[index].el.destroy(); //性能优化,不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy();
}); });
var addedItems = []; var addedItems = [];
BI.each(addSet, function (index) { BI.each(addSet, function (index) {
addedItems.push(renderedCells[index]) addedItems.push(renderedCells[index])
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
//拦截父子级关系
this.container._children = renderedCells;
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY}; this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY};
@ -14965,8 +14971,8 @@ BI.Grid = BI.inherit(BI.Widget, {
this._populate(); this._populate();
} }
}); });
BI.Grid.EVENT_SCROLL = "EVENT_SCROLL"; BI.GridView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut('bi.grid_view', BI.Grid);/** BI.shortcut('bi.grid_view', BI.GridView);/**
* floatBox弹出层 * floatBox弹出层
* @class BI.FloatBox * @class BI.FloatBox
* @extends BI.Widget * @extends BI.Widget
@ -28603,7 +28609,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.topLeftItems[index]; return self.topLeftItems[index];
} }
}); });
this.topLeftCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.topLeftCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomLeftCollection.setScrollLeft(scroll.scrollLeft); self.bottomLeftCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -28614,7 +28620,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.topRightItems[index]; return self.topRightItems[index];
} }
}); });
this.topRightCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.topRightCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomRightCollection.setScrollLeft(scroll.scrollLeft); self.bottomRightCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -28625,7 +28631,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.bottomLeftItems[index]; return self.bottomLeftItems[index];
} }
}); });
this.bottomLeftCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.bottomLeftCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomRightCollection.setScrollTop(scroll.scrollTop); self.bottomRightCollection.setScrollTop(scroll.scrollTop);
self.topLeftCollection.setScrollLeft(scroll.scrollLeft); self.topLeftCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -28637,7 +28643,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.bottomRightItems[index]; return self.bottomRightItems[index];
} }
}); });
this.bottomRightCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.bottomRightCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomLeftCollection.setScrollTop(scroll.scrollTop); self.bottomLeftCollection.setScrollTop(scroll.scrollTop);
self.topRightCollection.setScrollLeft(scroll.scrollLeft); self.topRightCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -29386,7 +29392,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnLeftWidthGetter, columnWidthGetter: columnLeftWidthGetter,
}); });
this.topLeftGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.topLeftGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomLeftGrid.setScrollLeft(scroll.scrollLeft); self.bottomLeftGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -29396,7 +29402,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnRightWidthGetter, columnWidthGetter: columnRightWidthGetter,
}); });
this.topRightGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.topRightGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomRightGrid.setScrollLeft(scroll.scrollLeft); self.bottomRightGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -29406,7 +29412,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnLeftWidthGetter, columnWidthGetter: columnLeftWidthGetter,
}); });
this.bottomLeftGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.bottomLeftGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomRightGrid.setScrollTop(scroll.scrollTop); self.bottomRightGrid.setScrollTop(scroll.scrollTop);
self.topLeftGrid.setScrollLeft(scroll.scrollLeft); self.topLeftGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -29417,7 +29423,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnRightWidthGetter, columnWidthGetter: columnRightWidthGetter,
}); });
this.bottomRightGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.bottomRightGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomLeftGrid.setScrollTop(scroll.scrollTop); self.bottomLeftGrid.setScrollTop(scroll.scrollTop);
self.topRightGrid.setScrollLeft(scroll.scrollLeft); self.topRightGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();

8
bi/core.js

@ -4587,7 +4587,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
getWidgetByName: function (name) { getWidgetByName: function (name) {
if (!BI.isKey(name) || name == this.getName()) { if (!BI.isKey(name) || name === this.getName()) {
return this; return this;
} }
name = name + ""; name = name + "";
@ -4702,7 +4702,7 @@ BI.Widget = BI.inherit(BI.OB, {
this.element.empty(); this.element.empty();
}, },
destroy: function () { _destroy: function(){
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
@ -4711,6 +4711,10 @@ BI.Widget = BI.inherit(BI.OB, {
this._isMounted = false; this._isMounted = false;
this.destroyed && this.destroyed(); this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
},
destroy: function () {
this._destroy();
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this.purgeListeners(); this.purgeListeners();
} }

58
docs/base.js

@ -2511,15 +2511,15 @@ BI.Canvas = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("bi.canvas", BI.Canvas);/** BI.shortcut("bi.canvas", BI.Canvas);/**
* Collection * CollectionView
* *
* Created by GUY on 2016/1/15. * Created by GUY on 2016/1/15.
* @class BI.Collection * @class BI.CollectionView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.Collection = BI.inherit(BI.Widget, { BI.CollectionView = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.Collection.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.CollectionView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-collection", baseCls: "bi-collection",
width: 400, width: 400,
height: 300, height: 300,
@ -2535,7 +2535,7 @@ BI.Collection = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.Collection.superclass._init.apply(this, arguments); BI.CollectionView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
@ -2554,7 +2554,7 @@ BI.Collection = BI.inherit(BI.Widget, {
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = self.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._calculateChildrenToRender(); self._calculateChildrenToRender();
self.fireEvent(BI.Collection.EVENT_SCROLL, { self.fireEvent(BI.CollectionView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop scrollTop: o.scrollTop
}); });
@ -2742,13 +2742,16 @@ BI.Collection = BI.inherit(BI.Widget, {
deleteArray.push(i); deleteArray.push(i);
}); });
BI.each(deleteArray, function (i, index) { BI.each(deleteArray, function (i, index) {
self.renderedCells[index].el.destroy(); //性能优化,不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy();
}); });
var addedItems = []; var addedItems = [];
BI.each(addSet, function (index) { BI.each(addSet, function (index) {
addedItems.push(renderedCells[index]) addedItems.push(renderedCells[index])
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
//拦截父子级关系
this.container._children = renderedCells;
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
@ -2859,8 +2862,8 @@ BI.Collection = BI.inherit(BI.Widget, {
this._populate(); this._populate();
} }
}); });
BI.Collection.EVENT_SCROLL = "EVENT_SCROLL"; BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut('bi.collection_view', BI.Collection);/** BI.shortcut('bi.collection_view', BI.CollectionView);/**
* @class BI.Combo * @class BI.Combo
* @extends BI.Widget * @extends BI.Widget
*/ */
@ -14646,15 +14649,15 @@ $.extend(BI, {
}; };
}() }()
});/** });/**
* Grid * GridView
* *
* Created by GUY on 2016/1/11. * Created by GUY on 2016/1/11.
* @class BI.Grid * @class BI.GridView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.Grid = BI.inherit(BI.Widget, { BI.GridView = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.Grid.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.GridView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-grid-view", baseCls: "bi-grid-view",
width: 400, width: 400,
height: 300, height: 300,
@ -14673,7 +14676,7 @@ BI.Grid = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.Grid.superclass._init.apply(this, arguments); BI.GridView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
@ -14692,7 +14695,7 @@ BI.Grid = BI.inherit(BI.Widget, {
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = self.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._calculateChildrenToRender(); self._calculateChildrenToRender();
self.fireEvent(BI.Grid.EVENT_SCROLL, { self.fireEvent(BI.GridView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop scrollTop: o.scrollTop
}); });
@ -14840,13 +14843,16 @@ BI.Grid = BI.inherit(BI.Widget, {
deleteArray.push(i); deleteArray.push(i);
}); });
BI.each(deleteArray, function (i, index) { BI.each(deleteArray, function (i, index) {
self.renderedCells[index].el.destroy(); //性能优化,不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy();
}); });
var addedItems = []; var addedItems = [];
BI.each(addSet, function (index) { BI.each(addSet, function (index) {
addedItems.push(renderedCells[index]) addedItems.push(renderedCells[index])
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
//拦截父子级关系
this.container._children = renderedCells;
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY}; this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY};
@ -14965,8 +14971,8 @@ BI.Grid = BI.inherit(BI.Widget, {
this._populate(); this._populate();
} }
}); });
BI.Grid.EVENT_SCROLL = "EVENT_SCROLL"; BI.GridView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut('bi.grid_view', BI.Grid);/** BI.shortcut('bi.grid_view', BI.GridView);/**
* floatBox弹出层 * floatBox弹出层
* @class BI.FloatBox * @class BI.FloatBox
* @extends BI.Widget * @extends BI.Widget
@ -28603,7 +28609,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.topLeftItems[index]; return self.topLeftItems[index];
} }
}); });
this.topLeftCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.topLeftCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomLeftCollection.setScrollLeft(scroll.scrollLeft); self.bottomLeftCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -28614,7 +28620,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.topRightItems[index]; return self.topRightItems[index];
} }
}); });
this.topRightCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.topRightCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomRightCollection.setScrollLeft(scroll.scrollLeft); self.bottomRightCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -28625,7 +28631,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.bottomLeftItems[index]; return self.bottomLeftItems[index];
} }
}); });
this.bottomLeftCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.bottomLeftCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomRightCollection.setScrollTop(scroll.scrollTop); self.bottomRightCollection.setScrollTop(scroll.scrollTop);
self.topLeftCollection.setScrollLeft(scroll.scrollLeft); self.topLeftCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -28637,7 +28643,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.bottomRightItems[index]; return self.bottomRightItems[index];
} }
}); });
this.bottomRightCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.bottomRightCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomLeftCollection.setScrollTop(scroll.scrollTop); self.bottomLeftCollection.setScrollTop(scroll.scrollTop);
self.topRightCollection.setScrollLeft(scroll.scrollLeft); self.topRightCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -29386,7 +29392,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnLeftWidthGetter, columnWidthGetter: columnLeftWidthGetter,
}); });
this.topLeftGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.topLeftGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomLeftGrid.setScrollLeft(scroll.scrollLeft); self.bottomLeftGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -29396,7 +29402,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnRightWidthGetter, columnWidthGetter: columnRightWidthGetter,
}); });
this.topRightGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.topRightGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomRightGrid.setScrollLeft(scroll.scrollLeft); self.bottomRightGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -29406,7 +29412,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnLeftWidthGetter, columnWidthGetter: columnLeftWidthGetter,
}); });
this.bottomLeftGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.bottomLeftGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomRightGrid.setScrollTop(scroll.scrollTop); self.bottomRightGrid.setScrollTop(scroll.scrollTop);
self.topLeftGrid.setScrollLeft(scroll.scrollLeft); self.topLeftGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -29417,7 +29423,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnRightWidthGetter, columnWidthGetter: columnRightWidthGetter,
}); });
this.bottomRightGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.bottomRightGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomLeftGrid.setScrollTop(scroll.scrollTop); self.bottomLeftGrid.setScrollTop(scroll.scrollTop);
self.topRightGrid.setScrollLeft(scroll.scrollLeft); self.topRightGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();

8
docs/core.js

@ -14582,7 +14582,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
getWidgetByName: function (name) { getWidgetByName: function (name) {
if (!BI.isKey(name) || name == this.getName()) { if (!BI.isKey(name) || name === this.getName()) {
return this; return this;
} }
name = name + ""; name = name + "";
@ -14697,7 +14697,7 @@ BI.Widget = BI.inherit(BI.OB, {
this.element.empty(); this.element.empty();
}, },
destroy: function () { _destroy: function(){
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
@ -14706,6 +14706,10 @@ BI.Widget = BI.inherit(BI.OB, {
this._isMounted = false; this._isMounted = false;
this.destroyed && this.destroyed(); this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
},
destroy: function () {
this._destroy();
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this.purgeListeners(); this.purgeListeners();
} }

21
src/base/collection/collection.js

@ -1,13 +1,13 @@
/** /**
* Collection * CollectionView
* *
* Created by GUY on 2016/1/15. * Created by GUY on 2016/1/15.
* @class BI.Collection * @class BI.CollectionView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.Collection = BI.inherit(BI.Widget, { BI.CollectionView = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.Collection.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.CollectionView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-collection", baseCls: "bi-collection",
width: 400, width: 400,
height: 300, height: 300,
@ -23,7 +23,7 @@ BI.Collection = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.Collection.superclass._init.apply(this, arguments); BI.CollectionView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
@ -42,7 +42,7 @@ BI.Collection = BI.inherit(BI.Widget, {
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = self.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._calculateChildrenToRender(); self._calculateChildrenToRender();
self.fireEvent(BI.Collection.EVENT_SCROLL, { self.fireEvent(BI.CollectionView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop scrollTop: o.scrollTop
}); });
@ -230,13 +230,16 @@ BI.Collection = BI.inherit(BI.Widget, {
deleteArray.push(i); deleteArray.push(i);
}); });
BI.each(deleteArray, function (i, index) { BI.each(deleteArray, function (i, index) {
self.renderedCells[index].el.destroy(); //性能优化,不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy();
}); });
var addedItems = []; var addedItems = [];
BI.each(addSet, function (index) { BI.each(addSet, function (index) {
addedItems.push(renderedCells[index]) addedItems.push(renderedCells[index])
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
//拦截父子级关系
this.container._children = renderedCells;
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
@ -347,5 +350,5 @@ BI.Collection = BI.inherit(BI.Widget, {
this._populate(); this._populate();
} }
}); });
BI.Collection.EVENT_SCROLL = "EVENT_SCROLL"; BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut('bi.collection_view', BI.Collection); BI.shortcut('bi.collection_view', BI.CollectionView);

21
src/base/grid/grid.js

@ -1,13 +1,13 @@
/** /**
* Grid * GridView
* *
* Created by GUY on 2016/1/11. * Created by GUY on 2016/1/11.
* @class BI.Grid * @class BI.GridView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.Grid = BI.inherit(BI.Widget, { BI.GridView = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.Grid.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.GridView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-grid-view", baseCls: "bi-grid-view",
width: 400, width: 400,
height: 300, height: 300,
@ -26,7 +26,7 @@ BI.Grid = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.Grid.superclass._init.apply(this, arguments); BI.GridView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
@ -45,7 +45,7 @@ BI.Grid = BI.inherit(BI.Widget, {
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = self.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._calculateChildrenToRender(); self._calculateChildrenToRender();
self.fireEvent(BI.Grid.EVENT_SCROLL, { self.fireEvent(BI.GridView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop scrollTop: o.scrollTop
}); });
@ -193,13 +193,16 @@ BI.Grid = BI.inherit(BI.Widget, {
deleteArray.push(i); deleteArray.push(i);
}); });
BI.each(deleteArray, function (i, index) { BI.each(deleteArray, function (i, index) {
self.renderedCells[index].el.destroy(); //性能优化,不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy();
}); });
var addedItems = []; var addedItems = [];
BI.each(addSet, function (index) { BI.each(addSet, function (index) {
addedItems.push(renderedCells[index]) addedItems.push(renderedCells[index])
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
//拦截父子级关系
this.container._children = renderedCells;
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY}; this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY};
@ -318,5 +321,5 @@ BI.Grid = BI.inherit(BI.Widget, {
this._populate(); this._populate();
} }
}); });
BI.Grid.EVENT_SCROLL = "EVENT_SCROLL"; BI.GridView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut('bi.grid_view', BI.Grid); BI.shortcut('bi.grid_view', BI.GridView);

8
src/base/table/table.collection.js

@ -34,7 +34,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.topLeftItems[index]; return self.topLeftItems[index];
} }
}); });
this.topLeftCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.topLeftCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomLeftCollection.setScrollLeft(scroll.scrollLeft); self.bottomLeftCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -45,7 +45,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.topRightItems[index]; return self.topRightItems[index];
} }
}); });
this.topRightCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.topRightCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomRightCollection.setScrollLeft(scroll.scrollLeft); self.bottomRightCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -56,7 +56,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.bottomLeftItems[index]; return self.bottomLeftItems[index];
} }
}); });
this.bottomLeftCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.bottomLeftCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomRightCollection.setScrollTop(scroll.scrollTop); self.bottomRightCollection.setScrollTop(scroll.scrollTop);
self.topLeftCollection.setScrollLeft(scroll.scrollLeft); self.topLeftCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -68,7 +68,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
return self.bottomRightItems[index]; return self.bottomRightItems[index];
} }
}); });
this.bottomRightCollection.on(BI.Collection.EVENT_SCROLL, function (scroll) { this.bottomRightCollection.on(BI.CollectionView.EVENT_SCROLL, function (scroll) {
self.bottomLeftCollection.setScrollTop(scroll.scrollTop); self.bottomLeftCollection.setScrollTop(scroll.scrollTop);
self.topRightCollection.setScrollLeft(scroll.scrollLeft); self.topRightCollection.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();

8
src/base/table/table.grid.js

@ -39,7 +39,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnLeftWidthGetter, columnWidthGetter: columnLeftWidthGetter,
}); });
this.topLeftGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.topLeftGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomLeftGrid.setScrollLeft(scroll.scrollLeft); self.bottomLeftGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -49,7 +49,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnRightWidthGetter, columnWidthGetter: columnRightWidthGetter,
}); });
this.topRightGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.topRightGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomRightGrid.setScrollLeft(scroll.scrollLeft); self.bottomRightGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments);
@ -59,7 +59,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnLeftWidthGetter, columnWidthGetter: columnLeftWidthGetter,
}); });
this.bottomLeftGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.bottomLeftGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomRightGrid.setScrollTop(scroll.scrollTop); self.bottomRightGrid.setScrollTop(scroll.scrollTop);
self.topLeftGrid.setScrollLeft(scroll.scrollLeft); self.topLeftGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();
@ -70,7 +70,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
rowHeightGetter: rowHeightGetter, rowHeightGetter: rowHeightGetter,
columnWidthGetter: columnRightWidthGetter, columnWidthGetter: columnRightWidthGetter,
}); });
this.bottomRightGrid.on(BI.Grid.EVENT_SCROLL, function (scroll) { this.bottomRightGrid.on(BI.GridView.EVENT_SCROLL, function (scroll) {
self.bottomLeftGrid.setScrollTop(scroll.scrollTop); self.bottomLeftGrid.setScrollTop(scroll.scrollTop);
self.topRightGrid.setScrollLeft(scroll.scrollLeft); self.topRightGrid.setScrollLeft(scroll.scrollLeft);
self._populateScrollbar(); self._populateScrollbar();

8
src/core/widget.js

@ -260,7 +260,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
getWidgetByName: function (name) { getWidgetByName: function (name) {
if (!BI.isKey(name) || name == this.getName()) { if (!BI.isKey(name) || name === this.getName()) {
return this; return this;
} }
name = name + ""; name = name + "";
@ -375,7 +375,7 @@ BI.Widget = BI.inherit(BI.OB, {
this.element.empty(); this.element.empty();
}, },
destroy: function () { _destroy: function(){
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
@ -384,6 +384,10 @@ BI.Widget = BI.inherit(BI.OB, {
this._isMounted = false; this._isMounted = false;
this.destroyed && this.destroyed(); this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
},
destroy: function () {
this._destroy();
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this.purgeListeners(); this.purgeListeners();
} }

Loading…
Cancel
Save