Merge pull request #146 in FUI/fineui from ~GUY/fineui:master to master

* commit '4ae207e7361d3a4383f65511361809faabbaa6f7':
  update
  update

bi/core.js

@@ -11646,7 +11646,7 @@ BI.Layout = BI.inherit(BI.Widget, {
                     next = children[beforeKey].element;
                 }
                 if (next.length > 0) {
-                    next.before(children[insert].element);
+                    next.before(children[insertKey].element);
                 } else {
                     self._getWrapper().append(children[insertKey].element);
                 }

demo/js/category/sortTree/demo.sortTree.js

@@ -1,3 +1,23 @@
+Demo.Expander = BI.inherit(BI.Widget, {
+    render: function () {
+        var self = this, o = this.options;
+        return {
+            type: "bi.expander",
+            ref: function () {
+                self.expander = this;
+            },
+            el: o.el,
+            popup: o.popup
+        }
+    },
+
+    update: function (opt) {
+        this.expander.populate(opt.items);
+        return true;
+    }
+});
+BI.shortcut("demo.sort_tree_expander", Demo.Expander)
+
 /**
  * guy
  * 二级树
@@ -13,7 +33,9 @@ Demo.SortTree = BI.inherit(BI.Widget, {
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
             element: this,
-            expander: {},
+            expander: {
+                type: "demo.sort_tree_expander"
+            },
 
             items: this._formatItems(0, tree.toJSON()),
 
@@ -71,6 +93,7 @@ Demo.SortTree = BI.inherit(BI.Widget, {
                 }
                 findTheNode.getParent().removeChild(node.id);
                 parentNode.addChild(findTheNode, currentIndex);
+                console.log(tree.toJSON());
                 self.tree.populate(self._formatItems(0, tree.toJSON()));
             },
             start: function (event, ui) {

dist/bundle.js

@@ -20002,7 +20002,7 @@ BI.Layout = BI.inherit(BI.Widget, {
                     next = children[beforeKey].element;
                 }
                 if (next.length > 0) {
-                    next.before(children[insert].element);
+                    next.before(children[insertKey].element);
                 } else {
                     self._getWrapper().append(children[insertKey].element);
                 }

dist/core.js

@@ -19951,7 +19951,7 @@ BI.Layout = BI.inherit(BI.Widget, {
                     next = children[beforeKey].element;
                 }
                 if (next.length > 0) {
-                    next.before(children[insert].element);
+                    next.before(children[insertKey].element);
                 } else {
                     self._getWrapper().append(children[insertKey].element);
                 }

src/core/wrapper/layout.js

@@ -462,7 +462,7 @@ BI.Layout = BI.inherit(BI.Widget, {
                     next = children[beforeKey].element;
                 }
                 if (next.length > 0) {
-                    next.before(children[insert].element);
+                    next.before(children[insertKey].element);
                 } else {
                     self._getWrapper().append(children[insertKey].element);
                 }