From 208c832597ba594a325f34ac22d4d86c2964ee4b Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 22 Mar 2017 16:06:48 +0800
Subject: [PATCH] add

---
 demo/js/widget/demo.multiselectcombo.js | 8 ++++++--
 dist/core.js                            | 6 +++++-
 src/core/widget.js                      | 6 +++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/demo/js/widget/demo.multiselectcombo.js b/demo/js/widget/demo.multiselectcombo.js
index f1441fa7b..e725573e5 100644
--- a/demo/js/widget/demo.multiselectcombo.js
+++ b/demo/js/widget/demo.multiselectcombo.js
@@ -45,10 +45,14 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
     _itemsCreator: function (options, callback) {
         var self = this;
         var items = ITEMS;
+        var keywords = (options.keywords || []).slice();
         if (options.keyword) {
-            var search = BI.Func.getSearchResult(items, options.keyword);
-            items = search.matched.concat(search.finded);
+            keywords.push(options.keyword);
         }
+        BI.each(keywords, function (i, kw) {
+            var search = BI.Func.getSearchResult(items, kw);
+            items = search.matched.concat(search.finded);
+        });
         if (options.selected_values) {//过滤
             var filter = BI.makeObject(options.selected_values, true);
             items = BI.filter(items, function (i, ob) {
diff --git a/dist/core.js b/dist/core.js
index 859c9f544..38b9bea06 100644
--- a/dist/core.js
+++ b/dist/core.js
@@ -14518,6 +14518,7 @@ BI.Widget = BI.inherit(BI.OB, {
             this.options.invisible = true;
             this.element.hide();
         }
+        this.fireEvent(BI.Events.VIEW, visible);
     },
 
     setValid: function (valid) {
@@ -14663,7 +14664,10 @@ BI.Widget = BI.inherit(BI.OB, {
     },
 
     destroy: function () {
-        this._unMount();
+        this.empty();
+        this._isMounted = false;
+        this._parent = null;
+        this.destroyed();
         this.element.destroy();
         this.fireEvent(BI.Events.DESTROY);
     }
diff --git a/src/core/widget.js b/src/core/widget.js
index 541c98699..54de57d74 100644
--- a/src/core/widget.js
+++ b/src/core/widget.js
@@ -220,6 +220,7 @@ BI.Widget = BI.inherit(BI.OB, {
             this.options.invisible = true;
             this.element.hide();
         }
+        this.fireEvent(BI.Events.VIEW, visible);
     },
 
     setValid: function (valid) {
@@ -365,7 +366,10 @@ BI.Widget = BI.inherit(BI.OB, {
     },
 
     destroy: function () {
-        this._unMount();
+        this.empty();
+        this._isMounted = false;
+        this._parent = null;
+        this.destroyed();
         this.element.destroy();
         this.fireEvent(BI.Events.DESTROY);
     }