From 46a99d86835b9055a80c7742ac94502fb743b9ac Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 29 Mar 2017 09:15:40 +0800 Subject: [PATCH] update --- src/base/combination/group.virtual.js | 4 ++-- src/core/base.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/combination/group.virtual.js b/src/base/combination/group.virtual.js index 48ebdcb10..03a356efb 100644 --- a/src/base/combination/group.virtual.js +++ b/src/base/combination/group.virtual.js @@ -67,11 +67,11 @@ BI.VirtualGroup = BI.inherit(BI.Widget, { var self = this; items = items || []; this.options.items = items; - items = this._packageItems(items, this._packageBtns(items)); + items = this._packageBtns(items); if (!this.layouts) { this.layouts = BI.createWidget(BI.extend({element: this}, this._packageLayout(items))); } else { - this.layouts.populate(this._packageLayout(items).items); + this.layouts.populate(items); } } }); diff --git a/src/core/base.js b/src/core/base.js index ddfe30fa9..1c14fc7ad 100644 --- a/src/core/base.js +++ b/src/core/base.js @@ -141,7 +141,7 @@ if (!window.BI) { }, formatEL: function (obj) { - if (obj && obj.el) { + if (obj && !obj.type && obj.el) { return obj; } return {