From 19579f2ce83dc444c9aa6b798b815c65ea189489 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 21 Jun 2017 19:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/widget.js                             | 20 ++++++++++----------
 docs/widget.js                           | 20 ++++++++++----------
 src/widget/multitree/multi.tree.combo.js | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bi/widget.js b/bi/widget.js
index 9a0b7488b..d6c5fca72 100644
--- a/bi/widget.js
+++ b/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;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
             }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({
diff --git a/docs/widget.js b/docs/widget.js
index 9a0b7488b..d6c5fca72 100644
--- a/docs/widget.js
+++ b/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;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
             }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({
diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js
index fb5234f4c..37d31c82d 100644
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/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;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
             }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({