|
|
|
@ -182,7 +182,6 @@ export class MultiTreeCombo extends Single {
|
|
|
|
|
return self.combo.isViewVisible(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
let shouldComboPopulate = true; |
|
|
|
|
this.trigger.on(MultiSelectTrigger.EVENT_FOCUS, () => { |
|
|
|
|
self.fireEvent(MultiTreeCombo.EVENT_FOCUS); |
|
|
|
|
}); |
|
|
|
@ -260,14 +259,14 @@ export class MultiTreeCombo extends Single {
|
|
|
|
|
} |
|
|
|
|
self.combo.setValue(self.storeValue); |
|
|
|
|
self.numberCounter.setValue(self.storeValue); |
|
|
|
|
shouldComboPopulate && self.populate(); |
|
|
|
|
self.populate(); |
|
|
|
|
self.fireEvent(MultiTreeCombo.EVENT_BEFORE_POPUPVIEW); |
|
|
|
|
}); |
|
|
|
|
this.combo.on(Combo.EVENT_BEFORE_HIDEVIEW, () => { |
|
|
|
|
if (isSearching()) { |
|
|
|
|
self._stopEditing(); |
|
|
|
|
self._dataChange && |
|
|
|
|
self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); |
|
|
|
|
self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); |
|
|
|
|
} else { |
|
|
|
|
if (isPopupView()) { |
|
|
|
|
self._stopEditing(); |
|
|
|
@ -276,7 +275,7 @@ export class MultiTreeCombo extends Single {
|
|
|
|
|
self.storeValue = { value: {} }; |
|
|
|
|
} |
|
|
|
|
self._dataChange && |
|
|
|
|
self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); |
|
|
|
|
self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
clear = false; |
|
|
|
@ -317,18 +316,10 @@ export class MultiTreeCombo extends Single {
|
|
|
|
|
valueFormatter: o.valueFormatter, |
|
|
|
|
value: { value: o.value || {} }, |
|
|
|
|
}); |
|
|
|
|
this.numberCounter.on( |
|
|
|
|
MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO, |
|
|
|
|
() => { |
|
|
|
|
self.populate(); |
|
|
|
|
shouldComboPopulate = true; |
|
|
|
|
} |
|
|
|
|
); |
|
|
|
|
this.numberCounter.on( |
|
|
|
|
MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE, |
|
|
|
|
() => { |
|
|
|
|
if (!self.combo.isViewVisible()) { |
|
|
|
|
shouldComboPopulate = false; |
|
|
|
|
self.combo.showView(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|