Browse Source

Pull request #2016: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'ef718ad88a4fc0feb907de5839022dfc3c5b212c':
  bugfix
  bugfix
  bugfix
es6
guy 3 years ago
parent
commit
db4027415e
  1. 12
      src/core/4.widget.js
  2. 2
      src/core/element2Snabbdom.js

12
src/core/4.widget.js

@ -40,7 +40,7 @@
cls: "", cls: "",
css: null, css: null,
vdom: false, vdom: false
}); });
}, },
@ -170,9 +170,9 @@
this.element = BI.Widget._renderEngine.createElement(this); this.element = BI.Widget._renderEngine.createElement(this);
} }
this.element._isWidget = true; this.element._isWidget = true;
var widgets = this.element.data("_Widgets") || []; var widgets = this.element.data("__widgets") || [];
widgets.push(this); widgets.push(this);
this.element.data("_Widgets", widgets); this.element.data("__widgets", widgets);
this._initCurrent(); this._initCurrent();
}, },
@ -237,7 +237,7 @@
element.empty(); element.empty();
BI.each(BI.jQuery(self.vnode.elm).children(), function (i, node) { BI.each(BI.jQuery(self.vnode.elm).children(), function (i, node) {
element.append(node); element.append(node);
}) });
} else { } else {
BI.each(els, function (i, el) { BI.each(els, function (i, el) {
if (el) { if (el) {
@ -268,7 +268,7 @@
BI.each(els, function (i, el) { BI.each(els, function (i, el) {
if (el) { if (el) {
var w = BI._lazyCreateWidget(el, { var w = BI._lazyCreateWidget(el, {
element: container, element: container
}); });
self.addWidget(w); self.addWidget(w);
} }
@ -302,7 +302,7 @@
var child = this._children[key]; var child = this._children[key];
if (layer === 0) { if (layer === 0) {
!self.isEnabled() && child._setEnable(false); !self.isEnabled() && child._setEnable(false);
self.isValid() && child._setValid(false); !self.isValid() && child._setValid(false);
} }
child._mount && child._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1); child._mount && child._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
} }

2
src/core/element2Snabbdom.js

@ -31,7 +31,7 @@
on: on, on: on,
hook: { hook: {
create: function () { create: function () {
BI.each(BI.Widget._renderEngine.createElement(parentNode).data("_Widgets"), function (i, w) { BI.each(BI.Widget._renderEngine.createElement(parentNode).data("__widgets"), function (i, w) {
w.element = BI.Widget._renderEngine.createElement(vnode.elm); w.element = BI.Widget._renderEngine.createElement(vnode.elm);
}); });
} }

Loading…
Cancel
Save