Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

update

master
guy 8 years ago
parent
509f8668a4
commit
9d7628fc0c
11 changed files with 83 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      bi/base.js
  2. 29
      bi/core.js
  3. 8
      bi/widget.js
  4. 4
      docs/base.js
  5. 29
      docs/core.js
  6. 8
      docs/widget.js
  7. 7
      src/core/controller/router.floatbox.js
  8. 6
      src/core/events.js
  9. 6
      src/core/view.js
  10. 8
      src/core/widget.js
  11. 5
      src/widget/sequencetable/treenumber.sequencetable.js

4
bi/base.js
Unescape View File

@ -15079,9 +15079,9 @@ BI.FloatBox = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
el: this._center, el: this._center,
left: 20, left: 10,
top: 10, top: 10,
right: 20, right: 10,
bottom: 10 bottom: 10
}] }]
} }

29
bi/core.js
Unescape View File

@ -3184,7 +3184,7 @@ if (!window.BI) {
if (numReg) { if (numReg) {
var num = numReg[0]; var num = numReg[0];
var orilen = num.length; var orilen = num.length;
var newnum = BI.parseInt(num) + 1 + ''; var newnum = parseInt(num) + 1 + '';
//进位到整数部分 //进位到整数部分
if (newnum.length > orilen) { if (newnum.length > orilen) {
newnum = newnum.substr(1); newnum = newnum.substr(1);
@ -3728,6 +3728,12 @@ _.extend(BI, {
*/ */
DESTROY: '_DESTROY', DESTROY: '_DESTROY',
/**
* @static
* @property 取消挂载事件
*/
UNMOUNT: '_UNMOUNT',
/** /**
* @static * @static
* @property 清除选择 * @property 清除选择
@ -4360,6 +4366,8 @@ BI.Widget = BI.inherit(BI.OB, {
update: function () { update: function () {
}, },
beforeDestroyed: null,
destroyed: null, destroyed: null,
_init: function () { _init: function () {
@ -4719,18 +4727,20 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
this._children = {}; this._children = {};
this._parent = null; this._parent = null;
this._isMounted = false; this._isMounted = false;
this.destroyed && this.destroyed();
}, },
_unMount: function () { _unMount: function () {
this.__d(); this.__d();
this.fireEvent(BI.Events.UNMOUNT);
this.purgeListeners(); this.purgeListeners();
this.destroyed && this.destroyed();
}, },
isolate: function () { isolate: function () {
@ -4750,14 +4760,12 @@ BI.Widget = BI.inherit(BI.OB, {
_destroy: function () { _destroy: function () {
this.__d(); this.__d();
this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
this.purgeListeners(); this.purgeListeners();
}, },
destroy: function () { destroy: function () {
this.__d(); this.__d();
this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this.purgeListeners(); this.purgeListeners();
@ -5253,6 +5261,8 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null,
destroyed: null, destroyed: null,
_init: function () { _init: function () {
@ -5742,18 +5752,22 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });
delete this._cardLayouts; delete this._cardLayouts;
delete this._cards; delete this._cards;
this.destroyed && this.destroyed(); this.destroyed && this.destroyed();
this.trigger(BI.Events.UNMOUNT);
this.off(); this.off();
}, },
_destroy: function () { _destroy: function () {
var self = this;
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
BI.Layers.remove(name + self.cid);
}); });
delete this._cardLayouts; delete this._cardLayouts;
delete this._cards; delete this._cards;
@ -15959,7 +15973,10 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
var view = this.createView(url, data, viewData, context); var view = this.createView(url, data, viewData, context);
isValid && context.model.addChild(modelData, view.model); isValid && context.model.addChild(modelData, view.model);
view.listenTo(view.model, "destroy", function () { view.listenTo(view.model, "destroy", function () {
self.remove(url); self.remove(url, context);
});
context.on(BI.Events.UNMOUNT, function () {
self.remove(url, context);
}); });
this.store[url].populate(view); this.store[url].populate(view);
this.views[url] = view; this.views[url] = view;
@ -15998,7 +16015,7 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
remove: function (url, context) { remove: function (url, context) {
url = context.rootURL + "/" + url; url = context.rootURL + "/" + url;
if(this.controller){ if (this.controller) {
this.controller.remove(url); this.controller.remove(url);
delete this.store[url]; delete this.store[url];
this.views[url] && this.views[url].model.destroy(); this.views[url] && this.views[url].model.destroy();

8
bi/widget.js
Unescape View File

@ -103,12 +103,13 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
_getStart: function (nodes) { _getStart: function (nodes) {
var self = this; var self = this;
var start = this.start; var start = this.start;
BI.each(nodes, function (i, node) { BI.some(nodes, function (i, node) {
if (BI.isNotEmptyArray(node.children)) { if (BI.isNotEmptyArray(node.children)) {
BI.each(node.children, function (index, child) { return BI.some(node.children, function (index, child) {
if (index === 0) { if (index === 0) {
if (self.cache[child.text || child.value]) { if (self.cache[child.text || child.value]) {
start = self.cache[child.text || child.value]; start = self.cache[child.text || child.value];
return true;
} }
} }
}); });
@ -12681,8 +12682,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, {
}) })
}, },
isStateValid: function () {
isValid: function () {
return this.options.validation === "valid"; return this.options.validation === "valid";
}, },

4
docs/base.js
Unescape View File

@ -15079,9 +15079,9 @@ BI.FloatBox = BI.inherit(BI.Widget, {
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
el: this._center, el: this._center,
left: 20, left: 10,
top: 10, top: 10,
right: 20, right: 10,
bottom: 10 bottom: 10
}] }]
} }

29
docs/core.js
Unescape View File

@ -14362,6 +14362,8 @@ BI.Widget = BI.inherit(BI.OB, {
update: function () { update: function () {
}, },
beforeDestroyed: null,
destroyed: null, destroyed: null,
_init: function () { _init: function () {
@ -14721,18 +14723,20 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
this._children = {}; this._children = {};
this._parent = null; this._parent = null;
this._isMounted = false; this._isMounted = false;
this.destroyed && this.destroyed();
}, },
_unMount: function () { _unMount: function () {
this.__d(); this.__d();
this.fireEvent(BI.Events.UNMOUNT);
this.purgeListeners(); this.purgeListeners();
this.destroyed && this.destroyed();
}, },
isolate: function () { isolate: function () {
@ -14752,14 +14756,12 @@ BI.Widget = BI.inherit(BI.OB, {
_destroy: function () { _destroy: function () {
this.__d(); this.__d();
this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
this.purgeListeners(); this.purgeListeners();
}, },
destroy: function () { destroy: function () {
this.__d(); this.__d();
this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this.purgeListeners(); this.purgeListeners();
@ -15255,6 +15257,8 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null,
destroyed: null, destroyed: null,
_init: function () { _init: function () {
@ -15744,18 +15748,22 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });
delete this._cardLayouts; delete this._cardLayouts;
delete this._cards; delete this._cards;
this.destroyed && this.destroyed(); this.destroyed && this.destroyed();
this.trigger(BI.Events.UNMOUNT);
this.off(); this.off();
}, },
_destroy: function () { _destroy: function () {
var self = this;
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
BI.Layers.remove(name + self.cid);
}); });
delete this._cardLayouts; delete this._cardLayouts;
delete this._cards; delete this._cards;
@ -20132,7 +20140,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";;(function () {
if (numReg) { if (numReg) {
var num = numReg[0]; var num = numReg[0];
var orilen = num.length; var orilen = num.length;
var newnum = BI.parseInt(num) + 1 + ''; var newnum = parseInt(num) + 1 + '';
//进位到整数部分 //进位到整数部分
if (newnum.length > orilen) { if (newnum.length > orilen) {
newnum = newnum.substr(1); newnum = newnum.substr(1);
@ -21552,7 +21560,10 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
var view = this.createView(url, data, viewData, context); var view = this.createView(url, data, viewData, context);
isValid && context.model.addChild(modelData, view.model); isValid && context.model.addChild(modelData, view.model);
view.listenTo(view.model, "destroy", function () { view.listenTo(view.model, "destroy", function () {
self.remove(url); self.remove(url, context);
});
context.on(BI.Events.UNMOUNT, function () {
self.remove(url, context);
}); });
this.store[url].populate(view); this.store[url].populate(view);
this.views[url] = view; this.views[url] = view;
@ -21591,7 +21602,7 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
remove: function (url, context) { remove: function (url, context) {
url = context.rootURL + "/" + url; url = context.rootURL + "/" + url;
if(this.controller){ if (this.controller) {
this.controller.remove(url); this.controller.remove(url);
delete this.store[url]; delete this.store[url];
this.views[url] && this.views[url].model.destroy(); this.views[url] && this.views[url].model.destroy();
@ -21758,6 +21769,12 @@ _.extend(BI, {
*/ */
DESTROY: '_DESTROY', DESTROY: '_DESTROY',
/**
* @static
* @property 取消挂载事件
*/
UNMOUNT: '_UNMOUNT',
/** /**
* @static * @static
* @property 清除选择 * @property 清除选择

8
docs/widget.js
Unescape View File

@ -103,12 +103,13 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
_getStart: function (nodes) { _getStart: function (nodes) {
var self = this; var self = this;
var start = this.start; var start = this.start;
BI.each(nodes, function (i, node) { BI.some(nodes, function (i, node) {
if (BI.isNotEmptyArray(node.children)) { if (BI.isNotEmptyArray(node.children)) {
BI.each(node.children, function (index, child) { return BI.some(node.children, function (index, child) {
if (index === 0) { if (index === 0) {
if (self.cache[child.text || child.value]) { if (self.cache[child.text || child.value]) {
start = self.cache[child.text || child.value]; start = self.cache[child.text || child.value];
return true;
} }
} }
}); });
@ -12681,8 +12682,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, {
}) })
}, },
isStateValid: function () {
isValid: function () {
return this.options.validation === "valid"; return this.options.validation === "valid";
}, },

7
src/core/controller/router.floatbox.js
Unescape View File

@ -45,7 +45,10 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
var view = this.createView(url, data, viewData, context); var view = this.createView(url, data, viewData, context);
isValid && context.model.addChild(modelData, view.model); isValid && context.model.addChild(modelData, view.model);
view.listenTo(view.model, "destroy", function () { view.listenTo(view.model, "destroy", function () {
self.remove(url); self.remove(url, context);
});
context.on(BI.Events.UNMOUNT, function () {
self.remove(url, context);
}); });
this.store[url].populate(view); this.store[url].populate(view);
this.views[url] = view; this.views[url] = view;
@ -84,7 +87,7 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
remove: function (url, context) { remove: function (url, context) {
url = context.rootURL + "/" + url; url = context.rootURL + "/" + url;
if(this.controller){ if (this.controller) {
this.controller.remove(url); this.controller.remove(url);
delete this.store[url]; delete this.store[url];
this.views[url] && this.views[url].model.destroy(); this.views[url] && this.views[url].model.destroy();

6
src/core/events.js
Unescape View File

@ -53,6 +53,12 @@ _.extend(BI, {
*/ */
DESTROY: '_DESTROY', DESTROY: '_DESTROY',
/**
* @static
* @property 取消挂载事件
*/
UNMOUNT: '_UNMOUNT',
/** /**
* @static * @static
* @property 清除选择 * @property 清除选择

6
src/core/view.js
Unescape View File

@ -10,6 +10,8 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null,
destroyed: null, destroyed: null,
_init: function () { _init: function () {
@ -499,18 +501,22 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });
delete this._cardLayouts; delete this._cardLayouts;
delete this._cards; delete this._cards;
this.destroyed && this.destroyed(); this.destroyed && this.destroyed();
this.trigger(BI.Events.UNMOUNT);
this.off(); this.off();
}, },
_destroy: function () { _destroy: function () {
var self = this;
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
BI.Layers.remove(name + self.cid);
}); });
delete this._cardLayouts; delete this._cardLayouts;
delete this._cards; delete this._cards;

8
src/core/widget.js
Unescape View File

@ -37,6 +37,8 @@ BI.Widget = BI.inherit(BI.OB, {
update: function () { update: function () {
}, },
beforeDestroyed: null,
destroyed: null, destroyed: null,
_init: function () { _init: function () {
@ -396,18 +398,20 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
this._children = {}; this._children = {};
this._parent = null; this._parent = null;
this._isMounted = false; this._isMounted = false;
this.destroyed && this.destroyed();
}, },
_unMount: function () { _unMount: function () {
this.__d(); this.__d();
this.fireEvent(BI.Events.UNMOUNT);
this.purgeListeners(); this.purgeListeners();
this.destroyed && this.destroyed();
}, },
isolate: function () { isolate: function () {
@ -427,14 +431,12 @@ BI.Widget = BI.inherit(BI.OB, {
_destroy: function () { _destroy: function () {
this.__d(); this.__d();
this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
this.purgeListeners(); this.purgeListeners();
}, },
destroy: function () { destroy: function () {
this.__d(); this.__d();
this.destroyed && this.destroyed();
this.element.destroy(); this.element.destroy();
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this.purgeListeners(); this.purgeListeners();

5
src/widget/sequencetable/treenumber.sequencetable.js
Unescape View File

@ -103,12 +103,13 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
_getStart: function (nodes) { _getStart: function (nodes) {
var self = this; var self = this;
var start = this.start; var start = this.start;
BI.each(nodes, function (i, node) { BI.some(nodes, function (i, node) {
if (BI.isNotEmptyArray(node.children)) { if (BI.isNotEmptyArray(node.children)) {
BI.each(node.children, function (index, child) { return BI.some(node.children, function (index, child) {
if (index === 0) { if (index === 0) {
if (self.cache[child.text || child.value]) { if (self.cache[child.text || child.value]) {
start = self.cache[child.text || child.value]; start = self.cache[child.text || child.value];
return true;
} }
} }
}); });

Write Preview
Loading…
Cancel
Save