Browse Source

优化一下context的传递

es6
guy 4 years ago
parent
commit
4d84909640
  1. 4
      src/core/base.js
  2. 5
      src/core/shortcut.js
  3. 11
      src/core/widget.js

4
src/core/base.js

@ -70,7 +70,7 @@ if (!_global.BI) {
}, },
isWidget: function (widget) { isWidget: function (widget) {
return widget instanceof BI.Widget || (BI.View && widget instanceof BI.View); return widget instanceof BI.Widget;
}, },
createWidgets: function (items, options, context) { createWidgets: function (items, options, context) {
@ -107,7 +107,7 @@ if (!_global.BI) {
el: innerAttr.shift() el: innerAttr.shift()
}); });
} }
if (item.el instanceof BI.Widget || (BI.View && item.el instanceof BI.View)) { if (item.el instanceof BI.Widget) {
innerAttr.shift(); innerAttr.shift();
return BI.extend({}, outerAttr.shift(), { type: null }, item); return BI.extend({}, outerAttr.shift(), { type: null }, item);
} }

5
src/core/shortcut.js

@ -18,11 +18,12 @@
throw new Error("组件" + config.type + "未定义"); throw new Error("组件" + config.type + "未定义");
} }
var pushed = false; var pushed = false;
if (context) { var widget = new cls();
widget._context = BI.Widget.context || context;
if (!BI.Widget.context && context) {
pushed = true; pushed = true;
BI.Widget.pushContext(context); BI.Widget.pushContext(context);
} }
var widget = new cls();
widget._initProps(config); widget._initProps(config);
widget._constructed(); widget._constructed();
widget._initRoot(); widget._initRoot();

11
src/core/widget.js

@ -152,16 +152,9 @@
this._children = {}; this._children = {};
if (BI.isWidget(o.element)) { if (BI.isWidget(o.element)) {
this.element = this.options.element.element; this.element = this.options.element.element;
if (o.element instanceof BI.Widget) { this._parent = o.element;
this._parent = o.element; this._parent.addWidget(this.widgetName, this);
this._parent.addWidget(this.widgetName, this);
} else {
this._isRoot = true;
}
} else if (o.element) { } else if (o.element) {
// if (o.root !== true) {
// throw new Error("root is a required property");
// }
this.element = BI.Widget._renderEngine.createElement(this); this.element = BI.Widget._renderEngine.createElement(this);
this._isRoot = true; this._isRoot = true;
} else { } else {

Loading…
Cancel
Save