Pull request #2561: 无JIRA任务 chore: bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '72cab4136dca0addb5f5c9a8f308759103bcf73a':
  chore: bugfix
  chore: bugfix
  chore: bugfix

dist/fix/fix.compact.js

@@ -105,6 +105,10 @@
         if (workerMode && this._worker) {
             return;
         }
+        if (this.store) {
+            pushTarget(this.store);
+            return true;
+        }
         if (this._store) {
             var store = findStore(this.options.context || this._parent || this.options.element || this._context);
             if (store) {
@@ -150,8 +154,8 @@
         }
     };
 
-    var unMount = BI.Widget.prototype.__d;
-    BI.Widget.prototype.__d = function () {
+    var unMount = BI.Widget.prototype.__destroy;
+    BI.Widget.prototype.__destroy = function () {
         try {
             unMount.apply(this, arguments);
         } catch (e) {

src/core/4.widget.js

@@ -756,12 +756,20 @@
             // }
             // this._isMounted = false;
             // this.purgeListeners();
+
+            // 去掉组件绑定的watcher
+            BI.each(this._watchers, function (i, unwatches) {
+                unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
+                BI.each(unwatches, function (j, unwatch) {
+                    unwatch();
+                });
+            });
+            this._watchers && (this._watchers = []);
             this.__d();
             this.element.empty();
             this.element.unbind();
             this._initCurrent();
             this._init();
-            this._mount();
             // this._initRef();
         },