无JIRA任务 revert: 5fb75ef130 [5fb75ef]

src/core/wrapper/layout.js

@@ -71,13 +71,12 @@ BI.Layout = BI.inherit(BI.Widget, {
         var self = this;
         var frag = BI.Widget._renderEngine.createFragment();
         var hasChild = false;
-        for (var key in this._children) {
+        BI.each(this._children, function (i, widget) {
-            var child = this._children[key];
+            if (widget.element !== self.element) {
-            if (child.element !== self.element) {
+                frag.appendChild(widget.element[0]);
-                frag.appendChild(child.element[0]);
                 hasChild = true;
             }
-        }
+        });
         if (hasChild === true) {
             this.appendFragment(frag);
         }
@@ -269,13 +268,19 @@ BI.Layout = BI.inherit(BI.Widget, {
         if (!child.shouldUpdate) {
             return null;
         }
-        return child.shouldUpdate(this._getOptions(item));
+        return child.shouldUpdate(this._getOptions(item)) === true;
     },
 
     updateItemAt: function (index, item) {
         if (index < 0 || index > this.options.items.length - 1) {
             return;
         }
+
+        var child = this._children[this._getChildName(index)];
+        var updated;
+        if (updated = child.update(this._getOptions(item))) {
+            return updated;
+        }
         var del = this._children[this._getChildName(index)];
         delete this._children[this._getChildName(index)];
         this.options.items.splice(index, 1);
@@ -362,14 +367,7 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     patchItem: function (oldVnode, vnode, index) {
         var shouldUpdate = this.shouldUpdateItem(index, vnode);
-        var child = this._children[this._getChildName(index)];
+        if (shouldUpdate === true || (shouldUpdate === null && !this._compare(oldVnode, vnode))) {
-        if (shouldUpdate) {
-            return child._update(this._getOptions(vnode), shouldUpdate);
-        }
-        if (shouldUpdate === null && !this._compare(oldVnode, vnode)) {
-            // if (child.update) {
-            //     return child.update(this._getOptions(vnode));
-            // }
             return this.updateItemAt(index, vnode);
         }
     },