Merge pull request #657 in VISUAL/fineui from ~GUY/fineui:master to master

* commit '105b0a1574652c7210197f89947fba09a972c3b7':
  add
  update
  update

dist/bundle.js

@@ -12122,7 +12122,33 @@ _.extend(BI.OB.prototype, {
         }
     });
 
-    BI.mount = function (widget, container, predicate) {
+    BI.mount = function (widget, container, predicate, hydrate) {
+        if(hydrate === true){
+            // 将widget的element元素都挂载好，并建立相互关系
+            var res = widget._mount(true, false, false, function(w){
+                var ws = w.element.data("__widgets");
+                if(!ws) {
+                    ws = [];
+                }
+                ws.push(w);
+                w.element.data("__widgets", ws);
+                predicate && predicate.apply(this, arguments);
+            });
+            // 将新的dom树属性（事件等）patch到已存在的dom上
+            var c = BI.Widget._renderEngine.createElement;
+            BI.DOM.patchProps(widget.element, c(c(container).children()[0]));
+
+            var triggerLifeHook = function (w) {
+                w.beforeMount && w.beforeMount();
+                w.mounted && w.mounted();
+                BI.each(w._children, function (i, child) {
+                    triggerLifeHook(child);
+                });
+            };
+            //最后触发组件树生命周期函数
+            triggerLifeHook(widget);
+            return res;
+        }
         if (container) {
             BI.Widget._renderEngine.createElement(container).append(widget.element);
         }
@@ -18497,9 +18523,30 @@ BI.prepares.push(function () {
  * 对DOM操作的通用函数
  * @type {{}}
  */
-BI.DOM = {};
+!(function () {
-BI.extend(BI.DOM, {
+    BI.DOM = {};
+    BI.extend(BI.DOM, {
 
+        patchProps: function (fromElement, toElement) {
+            var elemData = jQuery._data(fromElement[0]);
+            var events = elemData.events;
+            BI.each(events, function (eventKey, event) {
+                var handlers = event.handlers;
+                BI.each(handlers, function (i, handler) {
+                    toElement.on(eventKey, handler);
+                });
+            });
+            var fromChildren = fromElement.children(), toChildren = toElement.children();
+            if(fromChildren.length !== toChildren.length) {
+                throw new Error("不匹配");
+            }
+            BI.each(fromChildren, function (i, child) {
+                BI.DOM.patchProps(jQuery(child), jQuery(toChildren[i]));
+            });
+            BI.each(fromElement.data("__widgets"), function (i, widget) {
+                widget.element = toElement;
+            });
+        },
         /**
          * 把dom数组或元素悬挂起来,使其不对html产生影响
          * @param dom
@@ -18746,7 +18793,8 @@ BI.extend(BI.DOM, {
                 param: param
             };
         }
-});BI.EventListener = {
+    });
+})();BI.EventListener = {
     listen: function listen (target, eventType, callback) {
         if (target.addEventListener) {
             target.addEventListener(eventType, callback, false);
@@ -35216,12 +35264,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
+            initMixins(this, mixins);
             this._init();
             initState(this, state);
-            initMixins(this, mixins);
-            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
+            initMethods(this, actions);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;

dist/core.js

@@ -12122,7 +12122,33 @@ _.extend(BI.OB.prototype, {
         }
     });
 
-    BI.mount = function (widget, container, predicate) {
+    BI.mount = function (widget, container, predicate, hydrate) {
+        if(hydrate === true){
+            // 将widget的element元素都挂载好，并建立相互关系
+            var res = widget._mount(true, false, false, function(w){
+                var ws = w.element.data("__widgets");
+                if(!ws) {
+                    ws = [];
+                }
+                ws.push(w);
+                w.element.data("__widgets", ws);
+                predicate && predicate.apply(this, arguments);
+            });
+            // 将新的dom树属性（事件等）patch到已存在的dom上
+            var c = BI.Widget._renderEngine.createElement;
+            BI.DOM.patchProps(widget.element, c(c(container).children()[0]));
+
+            var triggerLifeHook = function (w) {
+                w.beforeMount && w.beforeMount();
+                w.mounted && w.mounted();
+                BI.each(w._children, function (i, child) {
+                    triggerLifeHook(child);
+                });
+            };
+            //最后触发组件树生命周期函数
+            triggerLifeHook(widget);
+            return res;
+        }
         if (container) {
             BI.Widget._renderEngine.createElement(container).append(widget.element);
         }
@@ -18497,9 +18523,30 @@ BI.prepares.push(function () {
  * 对DOM操作的通用函数
  * @type {{}}
  */
-BI.DOM = {};
+!(function () {
-BI.extend(BI.DOM, {
+    BI.DOM = {};
+    BI.extend(BI.DOM, {
 
+        patchProps: function (fromElement, toElement) {
+            var elemData = jQuery._data(fromElement[0]);
+            var events = elemData.events;
+            BI.each(events, function (eventKey, event) {
+                var handlers = event.handlers;
+                BI.each(handlers, function (i, handler) {
+                    toElement.on(eventKey, handler);
+                });
+            });
+            var fromChildren = fromElement.children(), toChildren = toElement.children();
+            if(fromChildren.length !== toChildren.length) {
+                throw new Error("不匹配");
+            }
+            BI.each(fromChildren, function (i, child) {
+                BI.DOM.patchProps(jQuery(child), jQuery(toChildren[i]));
+            });
+            BI.each(fromElement.data("__widgets"), function (i, widget) {
+                widget.element = toElement;
+            });
+        },
         /**
          * 把dom数组或元素悬挂起来,使其不对html产生影响
          * @param dom
@@ -18746,7 +18793,8 @@ BI.extend(BI.DOM, {
                 param: param
             };
         }
-});BI.EventListener = {
+    });
+})();BI.EventListener = {
     listen: function listen (target, eventType, callback) {
         if (target.addEventListener) {
             target.addEventListener(eventType, callback, false);

dist/fineui.js

@@ -12364,7 +12364,33 @@ _.extend(BI.OB.prototype, {
         }
     });
 
-    BI.mount = function (widget, container, predicate) {
+    BI.mount = function (widget, container, predicate, hydrate) {
+        if(hydrate === true){
+            // 将widget的element元素都挂载好，并建立相互关系
+            var res = widget._mount(true, false, false, function(w){
+                var ws = w.element.data("__widgets");
+                if(!ws) {
+                    ws = [];
+                }
+                ws.push(w);
+                w.element.data("__widgets", ws);
+                predicate && predicate.apply(this, arguments);
+            });
+            // 将新的dom树属性（事件等）patch到已存在的dom上
+            var c = BI.Widget._renderEngine.createElement;
+            BI.DOM.patchProps(widget.element, c(c(container).children()[0]));
+
+            var triggerLifeHook = function (w) {
+                w.beforeMount && w.beforeMount();
+                w.mounted && w.mounted();
+                BI.each(w._children, function (i, child) {
+                    triggerLifeHook(child);
+                });
+            };
+            //最后触发组件树生命周期函数
+            triggerLifeHook(widget);
+            return res;
+        }
         if (container) {
             BI.Widget._renderEngine.createElement(container).append(widget.element);
         }
@@ -18739,9 +18765,30 @@ BI.prepares.push(function () {
  * 对DOM操作的通用函数
  * @type {{}}
  */
-BI.DOM = {};
+!(function () {
-BI.extend(BI.DOM, {
+    BI.DOM = {};
+    BI.extend(BI.DOM, {
 
+        patchProps: function (fromElement, toElement) {
+            var elemData = jQuery._data(fromElement[0]);
+            var events = elemData.events;
+            BI.each(events, function (eventKey, event) {
+                var handlers = event.handlers;
+                BI.each(handlers, function (i, handler) {
+                    toElement.on(eventKey, handler);
+                });
+            });
+            var fromChildren = fromElement.children(), toChildren = toElement.children();
+            if(fromChildren.length !== toChildren.length) {
+                throw new Error("不匹配");
+            }
+            BI.each(fromChildren, function (i, child) {
+                BI.DOM.patchProps(jQuery(child), jQuery(toChildren[i]));
+            });
+            BI.each(fromElement.data("__widgets"), function (i, widget) {
+                widget.element = toElement;
+            });
+        },
         /**
          * 把dom数组或元素悬挂起来,使其不对html产生影响
          * @param dom
@@ -18988,7 +19035,8 @@ BI.extend(BI.DOM, {
                 param: param
             };
         }
-});BI.EventListener = {
+    });
+})();BI.EventListener = {
     listen: function listen (target, eventType, callback) {
         if (target.addEventListener) {
             target.addEventListener(eventType, callback, false);
@@ -35458,12 +35506,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
+            initMixins(this, mixins);
             this._init();
             initState(this, state);
-            initMixins(this, mixins);
-            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
+            initMethods(this, actions);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;

dist/fineui_without_jquery_polyfill.js

@@ -12122,7 +12122,33 @@ _.extend(BI.OB.prototype, {
         }
     });
 
-    BI.mount = function (widget, container, predicate) {
+    BI.mount = function (widget, container, predicate, hydrate) {
+        if(hydrate === true){
+            // 将widget的element元素都挂载好，并建立相互关系
+            var res = widget._mount(true, false, false, function(w){
+                var ws = w.element.data("__widgets");
+                if(!ws) {
+                    ws = [];
+                }
+                ws.push(w);
+                w.element.data("__widgets", ws);
+                predicate && predicate.apply(this, arguments);
+            });
+            // 将新的dom树属性（事件等）patch到已存在的dom上
+            var c = BI.Widget._renderEngine.createElement;
+            BI.DOM.patchProps(widget.element, c(c(container).children()[0]));
+
+            var triggerLifeHook = function (w) {
+                w.beforeMount && w.beforeMount();
+                w.mounted && w.mounted();
+                BI.each(w._children, function (i, child) {
+                    triggerLifeHook(child);
+                });
+            };
+            //最后触发组件树生命周期函数
+            triggerLifeHook(widget);
+            return res;
+        }
         if (container) {
             BI.Widget._renderEngine.createElement(container).append(widget.element);
         }
@@ -24249,12 +24275,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
+            initMixins(this, mixins);
             this._init();
             initState(this, state);
-            initMixins(this, mixins);
-            initMethods(this, actions);
             initComputed(this, computed);
             initWatch(this, watch$$1);
+            initMethods(this, actions);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;

src/core/platform/dom/dom.js

@@ -2,9 +2,30 @@
  * 对DOM操作的通用函数
  * @type {{}}
  */
-BI.DOM = {};
+!(function () {
-BI.extend(BI.DOM, {
+    BI.DOM = {};
+    BI.extend(BI.DOM, {
 
+        patchProps: function (fromElement, toElement) {
+            var elemData = jQuery._data(fromElement[0]);
+            var events = elemData.events;
+            BI.each(events, function (eventKey, event) {
+                var handlers = event.handlers;
+                BI.each(handlers, function (i, handler) {
+                    toElement.on(eventKey, handler);
+                });
+            });
+            var fromChildren = fromElement.children(), toChildren = toElement.children();
+            if(fromChildren.length !== toChildren.length) {
+                throw new Error("不匹配");
+            }
+            BI.each(fromChildren, function (i, child) {
+                BI.DOM.patchProps(jQuery(child), jQuery(toChildren[i]));
+            });
+            BI.each(fromElement.data("__widgets"), function (i, widget) {
+                widget.element = toElement;
+            });
+        },
         /**
          * 把dom数组或元素悬挂起来,使其不对html产生影响
          * @param dom
@@ -251,4 +272,5 @@ BI.extend(BI.DOM, {
                 param: param
             };
         }
-});
+    });
+})();

src/core/widget.js

@@ -491,7 +491,33 @@
         }
     });
 
-    BI.mount = function (widget, container, predicate) {
+    BI.mount = function (widget, container, predicate, hydrate) {
+        if(hydrate === true){
+            // 将widget的element元素都挂载好，并建立相互关系
+            var res = widget._mount(true, false, false, function(w){
+                var ws = w.element.data("__widgets");
+                if(!ws) {
+                    ws = [];
+                }
+                ws.push(w);
+                w.element.data("__widgets", ws);
+                predicate && predicate.apply(this, arguments);
+            });
+            // 将新的dom树属性（事件等）patch到已存在的dom上
+            var c = BI.Widget._renderEngine.createElement;
+            BI.DOM.patchProps(widget.element, c(c(container).children()[0]));
+
+            var triggerLifeHook = function (w) {
+                w.beforeMount && w.beforeMount();
+                w.mounted && w.mounted();
+                BI.each(w._children, function (i, child) {
+                    triggerLifeHook(child);
+                });
+            };
+            //最后触发组件树生命周期函数
+            triggerLifeHook(widget);
+            return res;
+        }
         if (container) {
             BI.Widget._renderEngine.createElement(container).append(widget.element);
         }