update

dist/bundle.js

@@ -12509,19 +12509,18 @@ BI.Widget = BI.inherit(BI.OB, {
         this._initElementHeight();
         this._initVisual();
         this._initState();
-        var func = function () {
+        if (this.beforeInit) {
-            this.fireEvent(BI.Events.INIT);
+            this.beforeInit(BI.bind(this._render, this));
+        } else {
+            this._render();
+        }
+    },
+
+    _render: function(){
         this.beforeCreate && this.beforeCreate();
         this._initElement();
         this._initEffects();
         this.created && this.created();
-            this.fireEvent(BI.Events.AFTERINIT);
-        };
-        if (this.beforeInit) {
-            this.beforeInit(BI.bind(func, this));
-        } else {
-            func.call(this);
-        }
     },
 
     /**

dist/core.js

@@ -12509,19 +12509,18 @@ BI.Widget = BI.inherit(BI.OB, {
         this._initElementHeight();
         this._initVisual();
         this._initState();
-        var func = function () {
+        if (this.beforeInit) {
-            this.fireEvent(BI.Events.INIT);
+            this.beforeInit(BI.bind(this._render, this));
+        } else {
+            this._render();
+        }
+    },
+
+    _render: function(){
         this.beforeCreate && this.beforeCreate();
         this._initElement();
         this._initEffects();
         this.created && this.created();
-            this.fireEvent(BI.Events.AFTERINIT);
-        };
-        if (this.beforeInit) {
-            this.beforeInit(BI.bind(func, this));
-        } else {
-            func.call(this);
-        }
     },
 
     /**

dist/fineui.js

@@ -12682,19 +12682,18 @@ BI.Widget = BI.inherit(BI.OB, {
         this._initElementHeight();
         this._initVisual();
         this._initState();
-        var func = function () {
+        if (this.beforeInit) {
-            this.fireEvent(BI.Events.INIT);
+            this.beforeInit(BI.bind(this._render, this));
+        } else {
+            this._render();
+        }
+    },
+
+    _render: function(){
         this.beforeCreate && this.beforeCreate();
         this._initElement();
         this._initEffects();
         this.created && this.created();
-            this.fireEvent(BI.Events.AFTERINIT);
-        };
-        if (this.beforeInit) {
-            this.beforeInit(BI.bind(func, this));
-        } else {
-            func.call(this);
-        }
     },
 
     /**
@@ -27484,6 +27483,7 @@ Data.Source = BISource = {
 
     var _init = BI.Widget.prototype._init;
     BI.Widget.prototype._init = function () {
+        var self = this;
         var needPop = false;
         if (window.Fix && this._store) {
             var store = findStore(this.options.element);
@@ -27500,13 +27500,20 @@ Data.Source = BISource = {
             } else {
                 this.model = this.store;
             }
-            initWatch(this, this.watch);
             needPop = true;
         }
         _init.apply(this, arguments);
         needPop && popTarget();
     };
 
+    var _init = BI.Widget.prototype._render;
+    BI.Widget.prototype._render = function () {
+        if (window.Fix && this._store) {
+            initWatch(this, this.watch);
+        }
+        _render.apply(this, arguments);
+    };
+
     var unMount = BI.Widget.prototype.__d;
     BI.Widget.prototype.__d = function () {
         unMount.apply(this, arguments);

dist/fix/fix.compact.js

@@ -81,19 +81,20 @@
             } else {
                 this.model = this.store;
             }
-            if (this.beforeInit) {
-                this.on(BI.Events.INIT, function () {
-                    initWatch(self, self.watch);
-                });
-            } else {
-                initWatch(this, this.watch);
-            }
             needPop = true;
         }
         _init.apply(this, arguments);
         needPop && popTarget();
     };
 
+    var _init = BI.Widget.prototype._render;
+    BI.Widget.prototype._render = function () {
+        if (window.Fix && this._store) {
+            initWatch(this, this.watch);
+        }
+        _render.apply(this, arguments);
+    };
+
     var unMount = BI.Widget.prototype.__d;
     BI.Widget.prototype.__d = function () {
         unMount.apply(this, arguments);

src/core/widget.js

@@ -52,19 +52,18 @@ BI.Widget = BI.inherit(BI.OB, {
         this._initElementHeight();
         this._initVisual();
         this._initState();
-        var func = function () {
+        if (this.beforeInit) {
-            this.fireEvent(BI.Events.INIT);
+            this.beforeInit(BI.bind(this._render, this));
+        } else {
+            this._render();
+        }
+    },
+
+    _render: function(){
         this.beforeCreate && this.beforeCreate();
         this._initElement();
         this._initEffects();
         this.created && this.created();
-            this.fireEvent(BI.Events.AFTERINIT);
-        };
-        if (this.beforeInit) {
-            this.beforeInit(BI.bind(func, this));
-        } else {
-            func.call(this);
-        }
     },
 
     /**