caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

重构context

es6
guy 4 years ago
parent
4a69381076
commit
ae3b18cd19
18 changed files with 59 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/core/shortcut.js
  2. 2
      src/core/widget.js
  3. 2
      src/core/wrapper/layout.js
  4. 4
      src/core/wrapper/layout/adapt/adapt.table.js
  5. 6
      src/core/wrapper/layout/adapt/float.horizontal.js
  6. 10
      src/core/wrapper/layout/layout.border.js
  7. 4
      src/core/wrapper/layout/layout.card.js
  8. 2
      src/core/wrapper/layout/layout.division.js
  9. 6
      src/core/wrapper/layout/layout.grid.js
  10. 4
      src/core/wrapper/layout/layout.horizontal.js
  11. 2
      src/core/wrapper/layout/layout.table.js
  12. 4
      src/core/wrapper/layout/layout.tape.js
  13. 6
      src/core/wrapper/layout/layout.td.js
  14. 2
      src/core/wrapper/layout/layout.window.js
  15. 4
      src/core/wrapper/layout/middle/middle.center.js
  16. 4
      src/core/wrapper/layout/middle/middle.float.center.js
  17. 4
      src/core/wrapper/layout/middle/middle.horizontal.js
  18. 4
      src/core/wrapper/layout/middle/middle.vertical.js

18
src/core/shortcut.js
Unescape View File

@ -11,7 +11,7 @@
};
// 根据配置属性生成widget
var createWidget = function (config) {
var createWidget = function (config, lazy) {
var cls = kv[config.type];
if (!cls) {
@ -23,13 +23,13 @@
widget._initProps(config);
widget._initRoot();
widget._initRef();
// if (config.element || config.root) {
widget._lazyConstructor();
// }
if (config.element || config.root || !lazy) {
widget._lazyConstructor();
}
return widget;
};
BI.createWidget = BI.createWidget || function (item, options, context) {
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
var el, w;
@ -57,7 +57,7 @@
BI.Plugin.getObject(el.type, this);
}
}]);
return w.type === el.type ? createWidget(w) : BI.createWidget(BI.extend({}, item, {type: w.type}, options));
return w.type === el.type ? createWidget(w, lazy) : BI.createWidget(BI.extend({}, item, {type: w.type}), options, context, lazy);
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
@ -68,7 +68,7 @@
BI.Plugin.getObject(el.type, this);
}
}]);
return w.type === el.type ? createWidget(w) : BI.createWidget(BI.extend({}, item, {type: w.type}, options));
return w.type === el.type ? createWidget(w, lazy) : BI.createWidget(BI.extend({}, item, {type: w.type}), options, context, lazy);
}
if (BI.isWidget(item.el)) {
return item.el;
@ -76,6 +76,10 @@
throw new Error("无法根据item创建组件");
};
BI._lazyCreateWidget = BI._lazyCreateWidget || function (item, options, context) {
return BI.createWidget(item, options, context, true);
};
BI.createElement = BI.createElement || function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;

2
src/core/widget.js
Unescape View File

@ -181,7 +181,7 @@
}
if (BI.isArray(els)) {
BI.each(els, function (i, el) {
BI.createWidget(el, {
BI._lazyCreateWidget(el, {
element: self
});
});

2
src/core/wrapper/layout.js
Unescape View File

@ -89,7 +89,7 @@ BI.Layout = BI.inherit(BI.Widget, {
_addElement: function (i, item, context) {
var self = this, w;
if (!this.hasWidget(this._getChildName(i))) {
w = BI.createWidget(item, context);
w = BI._lazyCreateWidget(item, context);
w.on(BI.Events.DESTROY, function () {
BI.each(self._children, function (name, child) {
if (child === w) {

4
src/core/wrapper/layout/adapt/adapt.table.js
Unescape View File

@ -37,9 +37,9 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
var td;
var width = o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : o.columnSize[i];
if (!this.hasWidget(this._getChildName(i))) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
td = BI.createWidget({
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
items: [w]

6
src/core/wrapper/layout/adapt/float.horizontal.js
Unescape View File

@ -33,7 +33,7 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
delete self._children[i];
}
});
BI.createWidget({
BI._lazyCreateWidget({
type: "bi.horizontal_auto",
element: this,
items: [this.left]
@ -42,7 +42,7 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) {
var self = this, o = this.options;
this.left = BI.createWidget({
this.left = BI._lazyCreateWidget({
type: "bi.vertical",
items: [item],
hgap: o.hgap,
@ -53,7 +53,7 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
rgap: o.rgap
});
this.container = BI.createWidget({
this.container = BI._lazyCreateWidget({
type: "bi.left",
element: this,
items: [this.left]

10
src/core/wrapper/layout/layout.border.js
Unescape View File

@ -36,7 +36,7 @@ BI.BorderLayout = BI.inherit(BI.Layout, {
if (item != null) {
if (item.el) {
if (!this.hasWidget(this.getName() + "north")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
this.addWidget(this.getName() + "north", w);
}
this.getWidgetByName(this.getName() + "north").element.height(item.height)
@ -56,7 +56,7 @@ BI.BorderLayout = BI.inherit(BI.Layout, {
if (item != null) {
if (item.el) {
if (!this.hasWidget(this.getName() + "south")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
this.addWidget(this.getName() + "south", w);
}
this.getWidgetByName(this.getName() + "south").element.height(item.height)
@ -76,7 +76,7 @@ BI.BorderLayout = BI.inherit(BI.Layout, {
if (item != null) {
if (item.el) {
if (!this.hasWidget(this.getName() + "west")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
this.addWidget(this.getName() + "west", w);
}
this.getWidgetByName(this.getName() + "west").element.width(item.width)
@ -96,7 +96,7 @@ BI.BorderLayout = BI.inherit(BI.Layout, {
if (item != null) {
if (item.el) {
if (!this.hasWidget(this.getName() + "east")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
this.addWidget(this.getName() + "east", w);
}
this.getWidgetByName(this.getName() + "east").element.width(item.width)
@ -115,7 +115,7 @@ BI.BorderLayout = BI.inherit(BI.Layout, {
item = regions["center"];
if (item != null) {
if (!this.hasWidget(this.getName() + "center")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
this.addWidget(this.getName() + "center", w);
}
this.getWidgetByName(this.getName() + "center").element

4
src/core/wrapper/layout/layout.card.js
Unescape View File

@ -28,7 +28,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (item) {
if (!self.hasWidget(item.cardName)) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.on(BI.Events.DESTROY, function () {
var index = BI.findIndex(o.items, function (i, tItem) {
return tItem.cardName == item.cardName;
@ -98,7 +98,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
if (this.isCardExisted(cardName)) {
throw new Error("cardName is already exist");
}
var widget = BI.createWidget(cardItem, this);
var widget = BI._lazyCreateWidget(cardItem, this);
widget.element.css({
position: "relative",
top: "0",

2
src/core/wrapper/layout/layout.division.js
Unescape View File

@ -115,7 +115,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
throw new Error("item be required");
}
if (!this.hasWidget(this.getName() + i + "_" + j)) {
var w = BI.createWidget(map[i][j]);
var w = BI._lazyCreateWidget(map[i][j]);
this.addWidget(this.getName() + i + "_" + j, w);
} else {
w = this.getWidgetByName(this.getName() + i + "_" + j);

6
src/core/wrapper/layout/layout.grid.js
Unescape View File

@ -93,16 +93,16 @@ BI.GridLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (BI.isArray(item)) {
BI.each(item, function (j, el) {
els[i][j] = BI.createWidget(el);
els[i][j] = BI._lazyCreateWidget(el);
});
return;
}
els[item.row][item.column] = BI.createWidget(item);
els[item.row][item.column] = BI._lazyCreateWidget(item);
});
for (var i = 0; i < rows; i++) {
for (var j = 0; j < columns; j++) {
if (!els[i][j]) {
els[i][j] = BI.createWidget({
els[i][j] = BI._lazyCreateWidget({
type: "bi.layout"
});
}

4
src/core/wrapper/layout/layout.horizontal.js
Unescape View File

@ -41,9 +41,9 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
var td;
var width = o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : o.columnSize[i];
if (!this.hasWidget(this._getChildName(i))) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", margin: "0px auto"});
td = BI.createWidget({
td = BI._lazyCreateWidget({
type: "bi.default",
tagName: "td",
attributes: {

2
src/core/wrapper/layout/layout.table.js
Unescape View File

@ -110,7 +110,7 @@ BI.TableLayout = BI.inherit(BI.Layout, {
right: right <= 1 ? right * 100 + "%" : right
}, arr[i]));
}
var w = BI.createWidget({
var w = BI._lazyCreateWidget({
type: "bi.absolute",
height: BI.isArray(o.rowSize) ? o.rowSize[this.rows] : o.rowSize,
items: abs

4
src/core/wrapper/layout/layout.tape.js
Unescape View File

@ -47,7 +47,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -160,7 +160,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");

6
src/core/wrapper/layout/layout.td.js
Unescape View File

@ -77,13 +77,13 @@ BI.TdLayout = BI.inherit(BI.Layout, {
}
}
var tr = BI.createWidget({
var tr = BI._lazyCreateWidget({
type: "bi.default",
tagName: "tr"
});
for (var i = 0; i < arr.length; i++) {
var w = BI.createWidget(arr[i]);
var w = BI._lazyCreateWidget(arr[i]);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (arr[i].lgap) {
w.element.css({"margin-left": arr[i].lgap + "px"});
@ -98,7 +98,7 @@ BI.TdLayout = BI.inherit(BI.Layout, {
w.element.css({"margin-bottom": arr[i].bgap + "px"});
}
first(w, this.rows++, i);
var td = BI.createWidget({
var td = BI._lazyCreateWidget({
type: "bi.default",
attributes: {
width: o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : o.columnSize[i]

2
src/core/wrapper/layout/layout.window.js
Unescape View File

@ -95,7 +95,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
throw new Error("item be required");
}
if (!this.hasWidget(this.getName() + i + "_" + j)) {
var w = BI.createWidget(o.items[i][j]);
var w = BI._lazyCreateWidget(o.items[i][j]);
w.element.css({position: "absolute"});
this.addWidget(this.getName() + i + "_" + j, w);
}

4
src/core/wrapper/layout/middle/middle.center.js
Unescape View File

@ -24,7 +24,7 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
list.push({
column: i,
row: 0,
el: BI.createWidget({
el: BI._lazyCreateWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
})
@ -32,7 +32,7 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

4
src/core/wrapper/layout/middle/middle.float.center.js
Unescape View File

@ -20,7 +20,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
var self = this, o = this.options, items = o.items;
var list = [], width = 100 / items.length;
BI.each(items, function (i) {
var widget = BI.createWidget({
var widget = BI._lazyCreateWidget({
type: "bi.default"
});
widget.element.addClass("center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")).css({
@ -33,7 +33,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

4
src/core/wrapper/layout/middle/middle.horizontal.js
Unescape View File

@ -23,7 +23,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
list.push({
column: i,
row: 0,
el: BI.createWidget({
el: BI._lazyCreateWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
})
@ -31,7 +31,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

4
src/core/wrapper/layout/middle/middle.vertical.js
Unescape View File

@ -24,7 +24,7 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
list.push({
column: 0,
row: i,
el: BI.createWidget({
el: BI._lazyCreateWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
})
@ -32,7 +32,7 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item);
var w = BI._lazyCreateWidget(item);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

Write Preview
Loading…
Cancel
Save