Merge pull request #79 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '19579f2ce83dc444c9aa6b798b815c65ea189489':
  树控件

bi/widget.js

@@ -11826,18 +11826,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
+            }else{
-            }
                 if (isPopupView()) {
                     self.trigger.stopEditing();
                     self.storeValue = {value: self.combo.getValue()};
                     if (clear === true) {
                         self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
                     }
                     self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
+            }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({

docs/widget.js

@@ -11826,18 +11826,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
+            }else{
-            }
                 if (isPopupView()) {
                     self.trigger.stopEditing();
                     self.storeValue = {value: self.combo.getValue()};
                     if (clear === true) {
                         self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
                     }
                     self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
+            }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({

src/widget/multitree/multi.tree.combo.js

@@ -188,18 +188,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
+            }else{
-            }
                 if (isPopupView()) {
                     self.trigger.stopEditing();
                     self.storeValue = {value: self.combo.getValue()};
                     if (clear === true) {
                         self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
                     }
                     self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
+            }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({