Browse Source

调整数据结构

es6
guy 8 years ago
parent
commit
19bc6efa87
  1. 11
      src/core/ob.js
  2. 12
      src/core/widget.js

11
src/core/ob.js

@ -4,7 +4,11 @@
* @abstract * @abstract
*/ */
BI.OB = function (config) { BI.OB = function (config) {
this.options = $.extend(this._defaultConfig(config), config); var props = this.props;
if (BI.isFunction(this.props)) {
props = this.props(config);
}
this.options = $.extend(this._defaultConfig(config), props, config);
this._init(); this._init();
this._initRef(); this._initRef();
}; };
@ -14,10 +18,7 @@ $.extend(BI.OB.prototype, {
}, },
_defaultConfig: function (config) { _defaultConfig: function (config) {
if (BI.isFunction(this.props)) { return {};
return this.props(config);
}
return this.props;
}, },
_init: function () { _init: function () {

12
src/core/widget.js

@ -7,7 +7,7 @@
*/ */
BI.Widget = BI.inherit(BI.OB, { BI.Widget = BI.inherit(BI.OB, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend({ return BI.extend(BI.Widget.superclass._defaultConfig.apply(this), {
tagName: "div", tagName: "div",
attributes: null, attributes: null,
data: null, data: null,
@ -17,8 +17,9 @@ BI.Widget = BI.inherit(BI.OB, {
invisible: false, invisible: false,
invalid: false, invalid: false,
baseCls: "", baseCls: "",
extraCls: "",
cls: "" cls: ""
}, BI.Widget.superclass._defaultConfig.call(this)) })
}, },
//生命周期函数 //生命周期函数
@ -74,11 +75,8 @@ BI.Widget = BI.inherit(BI.OB, {
} else { } else {
this.element = $(document.createElement(o.tagName)); this.element = $(document.createElement(o.tagName));
} }
if (o.baseCls) { if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass(o.baseCls); this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.cls) {
this.element.addClass(o.cls);
} }
if (o.attributes) { if (o.attributes) {
this.element.attr(o.attributes); this.element.attr(o.attributes);

Loading…
Cancel
Save