From 43d8ff77ddc8a160ae92022d54178f15418992aa Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 17 May 2017 02:20:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=BB=9A=E5=8A=A8=E6=9E=81?= =?UTF-8?q?=E5=A4=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/base.js | 58 ++++++++++++++++-------------- bi/core.js | 8 +++-- docs/base.js | 58 ++++++++++++++++-------------- docs/core.js | 8 +++-- src/base/collection/collection.js | 21 ++++++----- src/base/grid/grid.js | 21 ++++++----- src/base/table/table.collection.js | 8 ++--- src/base/table/table.grid.js | 8 ++--- src/core/widget.js | 8 +++-- 9 files changed, 114 insertions(+), 84 deletions(-) diff --git a/bi/base.js b/bi/base.js index 382be5a93..b9e75adb9 100644 --- a/bi/base.js +++ b/bi/base.js @@ -2511,15 +2511,15 @@ BI.Canvas = BI.inherit(BI.Widget, { } }); BI.shortcut("bi.canvas", BI.Canvas);/** - * Collection + * CollectionView * * Created by GUY on 2016/1/15. - * @class BI.Collection + * @class BI.CollectionView * @extends BI.Widget */ -BI.Collection = BI.inherit(BI.Widget, { +BI.CollectionView = BI.inherit(BI.Widget, { _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", width: 400, height: 300, @@ -2535,7 +2535,7 @@ BI.Collection = BI.inherit(BI.Widget, { }, _init: function () { - BI.Collection.superclass._init.apply(this, arguments); + BI.CollectionView.superclass._init.apply(this, arguments); var self = this, o = this.options; this.renderedCells = []; this.renderedKeys = []; @@ -2554,7 +2554,7 @@ BI.Collection = BI.inherit(BI.Widget, { o.scrollLeft = self.element.scrollLeft(); o.scrollTop = self.element.scrollTop(); self._calculateChildrenToRender(); - self.fireEvent(BI.Collection.EVENT_SCROLL, { + self.fireEvent(BI.CollectionView.EVENT_SCROLL, { scrollLeft: o.scrollLeft, scrollTop: o.scrollTop }); @@ -2742,13 +2742,16 @@ BI.Collection = BI.inherit(BI.Widget, { deleteArray.push(i); }); BI.each(deleteArray, function (i, index) { - self.renderedCells[index].el.destroy(); + //性能优化，不调用destroy方法防止触发destroy事件 + self.renderedCells[index].el._destroy(); }); var addedItems = []; BI.each(addSet, function (index) { addedItems.push(renderedCells[index]) }); this.container.addItems(addedItems); + //拦截父子级关系 + this.container._children = renderedCells; this.renderedCells = renderedCells; this.renderedKeys = renderedKeys; @@ -2859,8 +2862,8 @@ BI.Collection = BI.inherit(BI.Widget, { this._populate(); } }); -BI.Collection.EVENT_SCROLL = "EVENT_SCROLL"; -BI.shortcut('bi.collection_view', BI.Collection);/** +BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL"; +BI.shortcut('bi.collection_view', BI.CollectionView);/** * @class BI.Combo * @extends BI.Widget */ @@ -14646,15 +14649,15 @@ $.extend(BI, { }; }() });/** - * Grid + * GridView * * Created by GUY on 2016/1/11. - * @class BI.Grid + * @class BI.GridView * @extends BI.Widget */ -BI.Grid = BI.inherit(BI.Widget, { +BI.GridView = BI.inherit(BI.Widget, { _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", width: 400, height: 300, @@ -14673,7 +14676,7 @@ BI.Grid = BI.inherit(BI.Widget, { }, _init: function () { - BI.Grid.superclass._init.apply(this, arguments); + BI.GridView.superclass._init.apply(this, arguments); var self = this, o = this.options; this.renderedCells = []; this.renderedKeys = []; @@ -14692,7 +14695,7 @@ BI.Grid = BI.inherit(BI.Widget, { o.scrollLeft = self.element.scrollLeft(); o.scrollTop = self.element.scrollTop(); self._calculateChildrenToRender(); - self.fireEvent(BI.Grid.EVENT_SCROLL, { + self.fireEvent(BI.GridView.EVENT_SCROLL, { scrollLeft: o.scrollLeft, scrollTop: o.scrollTop }); @@ -14840,13 +14843,16 @@ BI.Grid = BI.inherit(BI.Widget, { deleteArray.push(i); }); BI.each(deleteArray, function (i, index) { - self.renderedCells[index].el.destroy(); + //性能优化，不调用destroy方法防止触发destroy事件 + self.renderedCells[index].el._destroy(); }); var addedItems = []; BI.each(addSet, function (index) { addedItems.push(renderedCells[index]) }); this.container.addItems(addedItems); + //拦截父子级关系 + this.container._children = renderedCells; this.renderedCells = renderedCells; this.renderedKeys = renderedKeys; this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY}; @@ -14965,8 +14971,8 @@ BI.Grid = BI.inherit(BI.Widget, { this._populate(); } }); -BI.Grid.EVENT_SCROLL = "EVENT_SCROLL"; -BI.shortcut('bi.grid_view', BI.Grid);/** +BI.GridView.EVENT_SCROLL = "EVENT_SCROLL"; +BI.shortcut('bi.grid_view', BI.GridView);/** * floatBox弹出层， * @class BI.FloatBox * @extends BI.Widget @@ -28603,7 +28609,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -28614,7 +28620,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -28625,7 +28631,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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.topLeftCollection.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -28637,7 +28643,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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.topRightCollection.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -29386,7 +29392,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -29396,7 +29402,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -29406,7 +29412,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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.topLeftGrid.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -29417,7 +29423,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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.topRightGrid.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); diff --git a/bi/core.js b/bi/core.js index 403f64443..978910858 100644 --- a/bi/core.js +++ b/bi/core.js @@ -4587,7 +4587,7 @@ BI.Widget = BI.inherit(BI.OB, { }, getWidgetByName: function (name) { - if (!BI.isKey(name) || name == this.getName()) { + if (!BI.isKey(name) || name === this.getName()) { return this; } name = name + ""; @@ -4702,7 +4702,7 @@ BI.Widget = BI.inherit(BI.OB, { this.element.empty(); }, - destroy: function () { + _destroy: function(){ BI.each(this._children, function (i, widget) { widget._unMount && widget._unMount(); }); @@ -4711,6 +4711,10 @@ BI.Widget = BI.inherit(BI.OB, { this._isMounted = false; this.destroyed && this.destroyed(); this.element.destroy(); + }, + + destroy: function () { + this._destroy(); this.fireEvent(BI.Events.DESTROY); this.purgeListeners(); } diff --git a/docs/base.js b/docs/base.js index 382be5a93..b9e75adb9 100644 --- a/docs/base.js +++ b/docs/base.js @@ -2511,15 +2511,15 @@ BI.Canvas = BI.inherit(BI.Widget, { } }); BI.shortcut("bi.canvas", BI.Canvas);/** - * Collection + * CollectionView * * Created by GUY on 2016/1/15. - * @class BI.Collection + * @class BI.CollectionView * @extends BI.Widget */ -BI.Collection = BI.inherit(BI.Widget, { +BI.CollectionView = BI.inherit(BI.Widget, { _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", width: 400, height: 300, @@ -2535,7 +2535,7 @@ BI.Collection = BI.inherit(BI.Widget, { }, _init: function () { - BI.Collection.superclass._init.apply(this, arguments); + BI.CollectionView.superclass._init.apply(this, arguments); var self = this, o = this.options; this.renderedCells = []; this.renderedKeys = []; @@ -2554,7 +2554,7 @@ BI.Collection = BI.inherit(BI.Widget, { o.scrollLeft = self.element.scrollLeft(); o.scrollTop = self.element.scrollTop(); self._calculateChildrenToRender(); - self.fireEvent(BI.Collection.EVENT_SCROLL, { + self.fireEvent(BI.CollectionView.EVENT_SCROLL, { scrollLeft: o.scrollLeft, scrollTop: o.scrollTop }); @@ -2742,13 +2742,16 @@ BI.Collection = BI.inherit(BI.Widget, { deleteArray.push(i); }); BI.each(deleteArray, function (i, index) { - self.renderedCells[index].el.destroy(); + //性能优化，不调用destroy方法防止触发destroy事件 + self.renderedCells[index].el._destroy(); }); var addedItems = []; BI.each(addSet, function (index) { addedItems.push(renderedCells[index]) }); this.container.addItems(addedItems); + //拦截父子级关系 + this.container._children = renderedCells; this.renderedCells = renderedCells; this.renderedKeys = renderedKeys; @@ -2859,8 +2862,8 @@ BI.Collection = BI.inherit(BI.Widget, { this._populate(); } }); -BI.Collection.EVENT_SCROLL = "EVENT_SCROLL"; -BI.shortcut('bi.collection_view', BI.Collection);/** +BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL"; +BI.shortcut('bi.collection_view', BI.CollectionView);/** * @class BI.Combo * @extends BI.Widget */ @@ -14646,15 +14649,15 @@ $.extend(BI, { }; }() });/** - * Grid + * GridView * * Created by GUY on 2016/1/11. - * @class BI.Grid + * @class BI.GridView * @extends BI.Widget */ -BI.Grid = BI.inherit(BI.Widget, { +BI.GridView = BI.inherit(BI.Widget, { _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", width: 400, height: 300, @@ -14673,7 +14676,7 @@ BI.Grid = BI.inherit(BI.Widget, { }, _init: function () { - BI.Grid.superclass._init.apply(this, arguments); + BI.GridView.superclass._init.apply(this, arguments); var self = this, o = this.options; this.renderedCells = []; this.renderedKeys = []; @@ -14692,7 +14695,7 @@ BI.Grid = BI.inherit(BI.Widget, { o.scrollLeft = self.element.scrollLeft(); o.scrollTop = self.element.scrollTop(); self._calculateChildrenToRender(); - self.fireEvent(BI.Grid.EVENT_SCROLL, { + self.fireEvent(BI.GridView.EVENT_SCROLL, { scrollLeft: o.scrollLeft, scrollTop: o.scrollTop }); @@ -14840,13 +14843,16 @@ BI.Grid = BI.inherit(BI.Widget, { deleteArray.push(i); }); BI.each(deleteArray, function (i, index) { - self.renderedCells[index].el.destroy(); + //性能优化，不调用destroy方法防止触发destroy事件 + self.renderedCells[index].el._destroy(); }); var addedItems = []; BI.each(addSet, function (index) { addedItems.push(renderedCells[index]) }); this.container.addItems(addedItems); + //拦截父子级关系 + this.container._children = renderedCells; this.renderedCells = renderedCells; this.renderedKeys = renderedKeys; this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY}; @@ -14965,8 +14971,8 @@ BI.Grid = BI.inherit(BI.Widget, { this._populate(); } }); -BI.Grid.EVENT_SCROLL = "EVENT_SCROLL"; -BI.shortcut('bi.grid_view', BI.Grid);/** +BI.GridView.EVENT_SCROLL = "EVENT_SCROLL"; +BI.shortcut('bi.grid_view', BI.GridView);/** * floatBox弹出层， * @class BI.FloatBox * @extends BI.Widget @@ -28603,7 +28609,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -28614,7 +28620,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -28625,7 +28631,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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.topLeftCollection.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -28637,7 +28643,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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.topRightCollection.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -29386,7 +29392,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -29396,7 +29402,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -29406,7 +29412,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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.topLeftGrid.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -29417,7 +29423,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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.topRightGrid.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); diff --git a/docs/core.js b/docs/core.js index 993453b35..c967d63bf 100644 --- a/docs/core.js +++ b/docs/core.js @@ -14582,7 +14582,7 @@ BI.Widget = BI.inherit(BI.OB, { }, getWidgetByName: function (name) { - if (!BI.isKey(name) || name == this.getName()) { + if (!BI.isKey(name) || name === this.getName()) { return this; } name = name + ""; @@ -14697,7 +14697,7 @@ BI.Widget = BI.inherit(BI.OB, { this.element.empty(); }, - destroy: function () { + _destroy: function(){ BI.each(this._children, function (i, widget) { widget._unMount && widget._unMount(); }); @@ -14706,6 +14706,10 @@ BI.Widget = BI.inherit(BI.OB, { this._isMounted = false; this.destroyed && this.destroyed(); this.element.destroy(); + }, + + destroy: function () { + this._destroy(); this.fireEvent(BI.Events.DESTROY); this.purgeListeners(); } diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js index f830cb050..42a48ed83 100644 --- a/src/base/collection/collection.js +++ b/src/base/collection/collection.js @@ -1,13 +1,13 @@ /** - * Collection + * CollectionView * * Created by GUY on 2016/1/15. - * @class BI.Collection + * @class BI.CollectionView * @extends BI.Widget */ -BI.Collection = BI.inherit(BI.Widget, { +BI.CollectionView = BI.inherit(BI.Widget, { _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", width: 400, height: 300, @@ -23,7 +23,7 @@ BI.Collection = BI.inherit(BI.Widget, { }, _init: function () { - BI.Collection.superclass._init.apply(this, arguments); + BI.CollectionView.superclass._init.apply(this, arguments); var self = this, o = this.options; this.renderedCells = []; this.renderedKeys = []; @@ -42,7 +42,7 @@ BI.Collection = BI.inherit(BI.Widget, { o.scrollLeft = self.element.scrollLeft(); o.scrollTop = self.element.scrollTop(); self._calculateChildrenToRender(); - self.fireEvent(BI.Collection.EVENT_SCROLL, { + self.fireEvent(BI.CollectionView.EVENT_SCROLL, { scrollLeft: o.scrollLeft, scrollTop: o.scrollTop }); @@ -230,13 +230,16 @@ BI.Collection = BI.inherit(BI.Widget, { deleteArray.push(i); }); BI.each(deleteArray, function (i, index) { - self.renderedCells[index].el.destroy(); + //性能优化，不调用destroy方法防止触发destroy事件 + self.renderedCells[index].el._destroy(); }); var addedItems = []; BI.each(addSet, function (index) { addedItems.push(renderedCells[index]) }); this.container.addItems(addedItems); + //拦截父子级关系 + this.container._children = renderedCells; this.renderedCells = renderedCells; this.renderedKeys = renderedKeys; @@ -347,5 +350,5 @@ BI.Collection = BI.inherit(BI.Widget, { this._populate(); } }); -BI.Collection.EVENT_SCROLL = "EVENT_SCROLL"; -BI.shortcut('bi.collection_view', BI.Collection); \ No newline at end of file +BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL"; +BI.shortcut('bi.collection_view', BI.CollectionView); \ No newline at end of file diff --git a/src/base/grid/grid.js b/src/base/grid/grid.js index 43fa51746..34eb81aa8 100644 --- a/src/base/grid/grid.js +++ b/src/base/grid/grid.js @@ -1,13 +1,13 @@ /** - * Grid + * GridView * * Created by GUY on 2016/1/11. - * @class BI.Grid + * @class BI.GridView * @extends BI.Widget */ -BI.Grid = BI.inherit(BI.Widget, { +BI.GridView = BI.inherit(BI.Widget, { _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", width: 400, height: 300, @@ -26,7 +26,7 @@ BI.Grid = BI.inherit(BI.Widget, { }, _init: function () { - BI.Grid.superclass._init.apply(this, arguments); + BI.GridView.superclass._init.apply(this, arguments); var self = this, o = this.options; this.renderedCells = []; this.renderedKeys = []; @@ -45,7 +45,7 @@ BI.Grid = BI.inherit(BI.Widget, { o.scrollLeft = self.element.scrollLeft(); o.scrollTop = self.element.scrollTop(); self._calculateChildrenToRender(); - self.fireEvent(BI.Grid.EVENT_SCROLL, { + self.fireEvent(BI.GridView.EVENT_SCROLL, { scrollLeft: o.scrollLeft, scrollTop: o.scrollTop }); @@ -193,13 +193,16 @@ BI.Grid = BI.inherit(BI.Widget, { deleteArray.push(i); }); BI.each(deleteArray, function (i, index) { - self.renderedCells[index].el.destroy(); + //性能优化，不调用destroy方法防止触发destroy事件 + self.renderedCells[index].el._destroy(); }); var addedItems = []; BI.each(addSet, function (index) { addedItems.push(renderedCells[index]) }); this.container.addItems(addedItems); + //拦截父子级关系 + this.container._children = renderedCells; this.renderedCells = renderedCells; this.renderedKeys = renderedKeys; this.renderRange = {minX: minX, minY: minY, maxX: maxX, maxY: maxY}; @@ -318,5 +321,5 @@ BI.Grid = BI.inherit(BI.Widget, { this._populate(); } }); -BI.Grid.EVENT_SCROLL = "EVENT_SCROLL"; -BI.shortcut('bi.grid_view', BI.Grid); \ No newline at end of file +BI.GridView.EVENT_SCROLL = "EVENT_SCROLL"; +BI.shortcut('bi.grid_view', BI.GridView); \ No newline at end of file diff --git a/src/base/table/table.collection.js b/src/base/table/table.collection.js index c60b8333a..535b3e1ae 100644 --- a/src/base/table/table.collection.js +++ b/src/base/table/table.collection.js @@ -34,7 +34,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -45,7 +45,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -56,7 +56,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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.topLeftCollection.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -68,7 +68,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, { 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.topRightCollection.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); diff --git a/src/base/table/table.grid.js b/src/base/table/table.grid.js index 1ddee09e4..873a581b8 100644 --- a/src/base/table/table.grid.js +++ b/src/base/table/table.grid.js @@ -39,7 +39,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -49,7 +49,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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._populateScrollbar(); self.fireEvent(BI.Table.EVENT_TABLE_SCROLL, arguments); @@ -59,7 +59,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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.topLeftGrid.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); @@ -70,7 +70,7 @@ BI.GridTable = BI.inherit(BI.Widget, { rowHeightGetter: rowHeightGetter, 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.topRightGrid.setScrollLeft(scroll.scrollLeft); self._populateScrollbar(); diff --git a/src/core/widget.js b/src/core/widget.js index af3aed4ca..464008cc7 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -260,7 +260,7 @@ BI.Widget = BI.inherit(BI.OB, { }, getWidgetByName: function (name) { - if (!BI.isKey(name) || name == this.getName()) { + if (!BI.isKey(name) || name === this.getName()) { return this; } name = name + ""; @@ -375,7 +375,7 @@ BI.Widget = BI.inherit(BI.OB, { this.element.empty(); }, - destroy: function () { + _destroy: function(){ BI.each(this._children, function (i, widget) { widget._unMount && widget._unMount(); }); @@ -384,6 +384,10 @@ BI.Widget = BI.inherit(BI.OB, { this._isMounted = false; this.destroyed && this.destroyed(); this.element.destroy(); + }, + + destroy: function () { + this._destroy(); this.fireEvent(BI.Events.DESTROY); this.purgeListeners(); }