Merge pull request #912 in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '320d407ae9385557321eb6b3f117e285abb07b45':
  build
  无JIRA任务 fix:更新一下layout的updateChildren方法

dist/2.0/fineui.ie.js

@@ -15177,9 +15177,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15223,9 +15236,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15251,6 +15268,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/2.0/fineui.js

@@ -15177,9 +15177,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15223,9 +15236,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15251,6 +15268,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/bundle.ie.js

@@ -15177,9 +15177,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15223,9 +15236,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15251,6 +15268,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/bundle.js

@@ -15177,9 +15177,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15223,9 +15236,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15251,6 +15268,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/core.js

@@ -15177,9 +15177,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15223,9 +15236,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15251,6 +15268,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/fineui.ie.js

@@ -15422,9 +15422,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15468,9 +15481,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15496,6 +15513,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/fineui.js

@@ -15422,9 +15422,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -15468,9 +15481,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -15496,6 +15513,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

dist/fineui_without_jquery_polyfill.js

@@ -14923,9 +14923,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -14969,9 +14982,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -14997,6 +15014,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },
 

src/core/wrapper/layout.js

@@ -421,9 +421,22 @@ BI.Layout = BI.inherit(BI.Widget, {
                 oldEndVnode = oldCh[--oldEndIdx];
                 newStartVnode = newCh[++newStartIdx];
             } else {
-                var node = addNode(newStartVnode);
+                var sameOldVnode = findOldVnode(oldCh, newStartVnode, oldStartIdx, oldEndIdx);
-                insertBefore(node, oldStartVnode);
+                if (BI.isNull(sameOldVnode)) {  //  不存在就把新的放到左边
-                newStartVnode = newCh[++newStartIdx];
+                    var node = addNode(newStartVnode);
+                    insertBefore(node, oldStartVnode);
+                    newStartVnode = newCh[++newStartIdx];
+                } else {   //  如果新节点在就旧节点区间中存在就复用一下
+                    BI.each(oldCh, function (index, child) {
+                        if (child && sameVnode(child, newStartVnode)) {
+                            updated = self.patchItem(sameOldVnode, newStartVnode, index) || updated;
+                            children[sameOldVnode.key == null ? self._getChildName(index) : sameOldVnode.key] = self._children[self._getChildName(index)];
+                            oldCh[index] = undefined;
+                            insertBefore(sameOldVnode, oldStartVnode);
+                        }
+                    });
+                    newStartVnode = newCh[++newStartIdx];
+                }
             }
         }
         if (oldStartIdx > oldEndIdx) {
@@ -467,9 +480,13 @@ BI.Layout = BI.inherit(BI.Widget, {
 
         function removeVnodes (vnodes, startIdx, endIdx) {
             for (; startIdx <= endIdx; ++startIdx) {
-                var node = self._getOptions(vnodes[startIdx]);
+                var ch = vnodes[startIdx];
-                var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                if (BI.isNotNull(ch)) {
-                children[key]._destroy();
+                    var node = self._getOptions(ch);
+                    var key = node.key == null ? self._getChildName(startIdx) : node.key;
+                    delete self._children[self._getChildName(key)];
+                    children[key]._destroy();
+                }
             }
         }
 
@@ -495,6 +512,16 @@ BI.Layout = BI.inherit(BI.Widget, {
             }
         }
 
+        function findOldVnode (vnodes, vNode, beginIdx, endIdx) {
+            var i, found;
+            for (i = beginIdx; i <= endIdx; ++i) {
+                if (vnodes[i] && sameVnode(vnodes[i], vNode)) {
+                    found = vnodes[i];
+                }
+            }
+            return found;
+        }
+
         return updated;
     },