diff --git a/bi/widget.js b/bi/widget.js index fd9277951..638fea28d 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -11828,18 +11828,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 fd9277951..638fea28d 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -11828,18 +11828,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({