fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #115140 in DEC/fineui from master to feature/x 

* commit 'f630a17ad8bcc987a3068812f5a23f1713d82ba3':
  无JIRA toast容错
  KERNEL-12098 feat: radio和checkbox item代码规范化
  KERNEL-11911 feat: label默认tooltip适配, 气泡不需要tooltip
  REPORT-75687 & KERNEL-11647 fix: 依然把triggerIcon放到trigger外面
es6
superman 2 years ago
parent
525541d7a7 f630a17ad8
commit
35e8e4dae3
15 changed files with 148 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/base/foundation/message.js
  2. 6
      src/case/button/item.multiselect.js
  3. 11
      src/case/button/item.singleselect.radio.js
  4. 1
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  5. 4
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
  6. 2
      src/core/controller/controller.bubbles.js
  7. 2
      src/core/controller/controller.tooltips.js
  8. 7
      src/less/widget/multitree/multi.tree.combo.less
  9. 22
      src/widget/multiselect/multiselect.combo.js
  10. 3
      src/widget/multiselect/multiselect.loader.js
  11. 20
      src/widget/multiselect/multiselect.trigger.js
  12. 3
      src/widget/multiselect/search/multiselect.search.loader.js
  13. 51
      src/widget/multitree/multi.tree.combo.js
  14. 49
      src/widget/multitree/multi.tree.insert.combo.js
  15. 49
      src/widget/multitree/multi.tree.list.combo.js

10
src/base/foundation/message.js
Unescape View File

@ -22,7 +22,7 @@ BI.Msg = function () {
// BI.Msg.prompt(title, message, value, callback, min_width);
},
toast: function (message, options, context) {
BI.isString(options) && (options = { level: options })
BI.isString(options) && (options = { level: options });
options = options || {};
context = context || BI.Widget._renderEngine.createElement("body");
var level = options.level || "common";
@ -41,7 +41,7 @@ BI.Msg = function () {
BI.remove(toastStack, toast.element);
var _height = BI.SIZE_CONSANTS.TOAST_TOP;
BI.each(toastStack, function (i, element) {
element.css({"top": _height});
element.css({ "top": _height });
_height += element.outerHeight() + 10;
});
callback();
@ -62,16 +62,16 @@ BI.Msg = function () {
}]
});
toastStack.push(toast.element);
toast.element.css({"margin-left": -1 * toast.element.outerWidth() / 2});
toast.element.css({ "margin-left": -1 * toast.element.outerWidth() / 2 });
toast.element.removeClass("bi-message-leave").addClass("bi-message-enter");
autoClose && BI.delay(function () {
toast.element.removeClass("bi-message-enter").addClass("bi-message-leave");
toast.destroy();
toast.destroy?.();
}, 5000);
return function () {
toast.element.removeClass("bi-message-enter").addClass("bi-message-leave");
toast.destroy();
toast.destroy?.();
};
},
_show: function (hasCancel, title, message, callback) {

6
src/case/button/item.multiselect.js
Unescape View File

@ -20,11 +20,6 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
this.checkbox = BI.createWidget({
type: "bi.checkbox"
});
this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
if (type === BI.Events.CLICK) {
self.setSelected(self.isSelected());
}
});
return {
type: "bi.vertical_adapt",
columnSize: [o.iconWrapperWidth || o.height, "fill"],
@ -74,7 +69,6 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
doClick: function () {
BI.MultiSelectItem.superclass.doClick.apply(this, arguments);
this.checkbox.setSelected(this.isSelected());
if (this.isValid()) {
this.fireEvent(BI.MultiSelectItem.EVENT_CHANGE, this.getValue(), this);
}

11
src/case/button/item.singleselect.radio.js
Unescape View File

@ -28,16 +28,6 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
ref: function (_ref) {
self.radio = _ref;
},
listeners: [
{
eventName: BI.Controller.EVENT_CHANGE,
action: function (type) {
if (type === BI.Events.CLICK) {
self.setSelected(self.isSelected());
}
}
}
],
}]
}, {
el: {
@ -82,7 +72,6 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
doClick: function () {
BI.SingleSelectRadioItem.superclass.doClick.apply(this, arguments);
this.radio.setSelected(this.isSelected());
if (this.isValid()) {
this.fireEvent(BI.SingleSelectRadioItem.EVENT_CHANGE, this.isSelected(), this);
}

1
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -33,7 +33,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
adjustLength: 2,
height: height,
width: width,
toggle: false,
ref: function () {
self.combo = this;
},

4
src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
Unescape View File

@ -24,10 +24,6 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
},
width: o.height,
height: o.height,
stopPropagation: true,
handler: function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.TOGGLE);
}
};
var stateText = this._digest(o.value, o.items) || o.text;

2
src/core/controller/controller.bubbles.js
Unescape View File

@ -30,7 +30,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = BI.createWidget({
type: "bi.label",
type: "bi.text",
cls: "bi-bubble" + " bubble-" + level,
text: text,
hgap: 5,

2
src/core/controller/controller.tooltips.js
Unescape View File

@ -38,7 +38,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
});
this.showingTips = {};
if (!this.has(name)) {
this.create(name, tooltipOpt, opt.container || "body");
this.create(name, tooltipOpt, document.fullscreenElement ? context : (opt.container || "body"));
}
if (!opt.belowMouse) {
var offset = context.element.offset();

7
src/less/widget/multitree/multi.tree.combo.less
Unescape View File

@ -1,9 +1,11 @@
@import "../../index.less";
@val: transform .3s ease;
.bi-multi-tree-combo{
& .multi-select-trigger-icon-button{
.bi-multi-tree-combo, .bi-multi-tree-insert-combo, .bi-multi-tree-list-combo {
& .multi-select-trigger-icon-button {
font-size: @font-size-16;
}
// 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
& .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
& .x-icon {
@ -11,6 +13,7 @@
.transition(@val);
}
}
& .bi-combo + .bi-trigger-icon-button {
& .x-icon {
.rotate(0deg);

22
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -173,7 +173,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return self.numberCounter.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && self.numberCounter.element.find(e.target).length === 0;
},
});
@ -198,6 +198,21 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}
});
var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.height,
height: o.height,
cls: "multi-select-trigger-icon-button",
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
self.numberCounter.hideView();
if (self.combo.isViewVisible()) {
self.combo.hideView();
} else {
self.combo.showView();
}
});
this.numberCounter = BI.createWidget({
type: "bi.multi_select_check_selected_switcher",
masker: {
@ -248,6 +263,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
right: 0,
top: 0,
bottom: 0,
}, {
el: triggerBtn,
right: 0,
top: 0,
bottom: 0,
}, {
el: {
type: "bi.vertical_adapt",

3
src/widget/multiselect/multiselect.loader.js
Unescape View File

@ -110,12 +110,13 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
},
_createItems: function (items) {
var allSelected = this.isAllSelected();
return BI.createItems(items, {
type: "bi.multi_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
selected: this.isAllSelected(),
selected: allSelected,
iconWrapperWidth: 36
});
},

20
src/widget/multiselect/multiselect.trigger.js
Unescape View File

@ -78,22 +78,10 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
items: [
{
el: this.searcher,
width: "fill"
}, {
el: this.wrapNumberCounter,
width: 0
}, {
el: {
type: "bi.trigger_icon_button",
height: o.height,
stopPropagation: true,
cls: "multi-select-trigger-icon-button",
handler: function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.TOGGLE);
width: "fill",
rgap: 24
}
},
width: 24
}]
]
});
!o.allowEdit && BI.createWidget({
@ -123,7 +111,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
* 重新调整numberCounter的空白占位符
*/
refreshPlaceHolderWidth: function (width) {
this.wrapper.attr("items")[1].width = width;
this.wrapper.attr("items")[0].rgap = 24 + width;
this.wrapper.resize();
},

3
src/widget/multiselect/search/multiselect.search.loader.js
Unescape View File

@ -91,13 +91,14 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
},
_createItems: function (items) {
var allSelected = this.isAllSelected();
return BI.createItems(items, {
type: "bi.multi_select_item",
logic: {
dynamic: false
},
height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
selected: this.isAllSelected(),
selected: allSelected,
cls: "bi-list-item-active",
iconWrapperWidth: 36
});

51
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -22,7 +22,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
var isInit = false;
var want2showCounter = false;
this.storeValue = { value: o.value || {} };
this.storeValue = {value: o.value || {}};
this.trigger = BI.createWidget({
type: "bi.multi_select_trigger",
@ -44,7 +44,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
type: "bi.multi_tree_searcher",
itemsCreator: o.itemsCreator
},
value: { value: o.value || {} }
value: {value: o.value || {}}
});
this.combo = BI.createWidget({
@ -105,9 +105,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
},
isNeedAdjustWidth: o.isNeedAdjustWidth,
value: { value: o.value || {} },
value: {value: o.value || {}},
hideChecker: function (e) {
return self.numberCounter.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
self.numberCounter.element.find(e.target).length === 0;
}
});
@ -130,12 +131,12 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_START, function () {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
this.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_STOP, function () {
self.storeValue = { value: this.getValue() };
self.storeValue = {value: this.getValue()};
self.combo.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
BI.nextTick(function () {
@ -150,11 +151,11 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiTreeCombo.EVENT_SEARCHING);
});
function showCounter() {
function showCounter () {
if (isSearching()) {
self.storeValue = { value: self.trigger.getValue() };
self.storeValue = {value: self.trigger.getValue()};
} else if (isPopupView()) {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
}
self.trigger.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
@ -173,7 +174,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
var checked = this.getSearcher().hasChecked();
var val = {
type: BI.Selection.Multi,
value: checked ? { 1: 1 } : {}
value: checked ? {1: 1} : {}
};
this.getSearcher().setState(checked ? BI.Selection.Multi : BI.Selection.None);
self.numberCounter.setButtonChecked(val);
@ -185,7 +186,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return;
}
if (change === true) {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
change = false;
}
self.combo.setValue(self.storeValue);
@ -200,9 +201,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
} else {
if (isPopupView()) {
self._stopEditing();
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
if (clear === true) {
self.storeValue = { value: {} };
self.storeValue = {value: {}};
}
self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
}
@ -211,6 +212,21 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
change = false;
});
var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.height,
height: o.height,
cls: "multi-select-trigger-icon-button"
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
self.numberCounter.hideView();
if (self.combo.isViewVisible()) {
self.combo.hideView();
} else {
self.combo.showView();
}
});
this.numberCounter = BI.createWidget({
type: "bi.multi_select_check_selected_switcher",
el: {
@ -229,7 +245,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
},
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
value: { value: o.value || {} }
value: {value: o.value || {}}
});
this.numberCounter.on(BI.MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE, function () {
if (!self.combo.isViewVisible()) {
@ -273,6 +289,11 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
right: 0,
top: 0,
bottom: 0
}, {
el: triggerBtn,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.vertical_adapt",
@ -285,7 +306,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
});
},
_stopEditing: function () {
_stopEditing: function() {
this.trigger.stopEditing();
this.numberCounter.hideView();
},

49
src/widget/multitree/multi.tree.insert.combo.js
Unescape View File

@ -23,7 +23,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
var isInit = false;
var want2showCounter = false;
this.storeValue = { value: o.value || {} };
this.storeValue = {value: o.value || {}};
this.trigger = BI.createWidget({
type: "bi.multi_select_trigger",
@ -59,7 +59,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
}]
}
},
value: { value: o.value || {} }
value: {value: o.value || {}}
});
@ -121,9 +121,10 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
},
isNeedAdjustWidth: o.isNeedAdjustWidth,
value: { value: o.value || {} },
value: {value: o.value || {}},
hideChecker: function (e) {
return self.numberCounter.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
self.numberCounter.element.find(e.target).length === 0;
}
});
@ -146,12 +147,12 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_START, function () {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
this.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_STOP, function () {
self.storeValue = { value: this.getValue() };
self.storeValue = {value: this.getValue()};
self.combo.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
BI.nextTick(function () {
@ -166,11 +167,11 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiTreeInsertCombo.EVENT_SEARCHING);
});
function showCounter() {
function showCounter () {
if (isSearching()) {
self.storeValue = { value: self.trigger.getValue() };
self.storeValue = {value: self.trigger.getValue()};
} else if (isPopupView()) {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
}
self.trigger.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
@ -184,7 +185,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
var checked = this.getSearcher().hasChecked();
var val = {
type: BI.Selection.Multi,
value: checked ? { 1: 1 } : {}
value: checked ? {1: 1} : {}
};
this.getSearcher().setState(checked ? BI.Selection.Multi : BI.Selection.None);
self.numberCounter.setButtonChecked(val);
@ -196,7 +197,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
return;
}
if (change === true) {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
change = false;
}
self.combo.setValue(self.storeValue);
@ -211,9 +212,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
} else {
if (isPopupView()) {
self._stopEditing();
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
if (clear === true) {
self.storeValue = { value: {} };
self.storeValue = {value: {}};
}
self.fireEvent(BI.MultiTreeInsertCombo.EVENT_CONFIRM);
}
@ -222,6 +223,21 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
change = false;
});
var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.height,
height: o.height,
cls: "multi-select-trigger-icon-button"
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
self.numberCounter.hideView();
if (self.combo.isViewVisible()) {
self.combo.hideView();
} else {
self.combo.showView();
}
});
this.numberCounter = BI.createWidget({
type: "bi.multi_select_check_selected_switcher",
el: {
@ -284,6 +300,11 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
right: 0,
top: 0,
bottom: 0
}, {
el: triggerBtn,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.vertical_adapt",
@ -301,7 +322,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
this.numberCounter.setButtonChecked(this.storeValue);
},
_stopEditing: function () {
_stopEditing: function() {
this.trigger.stopEditing();
this.numberCounter.hideView();
},

49
src/widget/multitree/multi.tree.list.combo.js
Unescape View File

@ -23,7 +23,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
var isInit = false;
var want2showCounter = false;
this.storeValue = { value: o.value || [] };
this.storeValue = {value: o.value || []};
this.trigger = BI.createWidget({
type: "bi.multi_select_trigger",
@ -74,7 +74,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: o.itemsCreator
}
},
value: { value: o.value || {} }
value: {value: o.value || {}}
});
@ -139,9 +139,10 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
},
isNeedAdjustWidth: o.isNeedAdjustWidth,
value: { value: o.value || {} },
value: {value: o.value || {}},
hideChecker: function (e) {
return self.numberCounter.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
self.numberCounter.element.find(e.target).length === 0;
}
});
@ -164,12 +165,12 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_START, function () {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
this.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_STOP, function () {
self.storeValue = { value: this.getValue() };
self.storeValue = {value: this.getValue()};
self.combo.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
BI.nextTick(function () {
@ -184,11 +185,11 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiTreeListCombo.EVENT_SEARCHING);
});
function showCounter() {
function showCounter () {
if (isSearching()) {
self.storeValue = { value: self.trigger.getValue() };
self.storeValue = {value: self.trigger.getValue()};
} else if (isPopupView()) {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
}
self.trigger.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
@ -202,7 +203,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
var checked = this.getSearcher().hasChecked();
var val = {
type: BI.Selection.Multi,
value: checked ? { 1: 1 } : {}
value: checked ? {1: 1} : {}
};
this.getSearcher().setState(checked ? BI.Selection.Multi : BI.Selection.None);
self.numberCounter.setButtonChecked(val);
@ -214,7 +215,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
return;
}
if (change === true) {
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
change = false;
}
self.combo.setValue(self.storeValue);
@ -229,9 +230,9 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
} else {
if (isPopupView()) {
self._stopEditing();
self.storeValue = { value: self.combo.getValue() };
self.storeValue = {value: self.combo.getValue()};
if (clear === true) {
self.storeValue = { value: [] };
self.storeValue = {value: []};
}
self.fireEvent(BI.MultiTreeListCombo.EVENT_CONFIRM);
}
@ -240,6 +241,21 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
change = false;
});
var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.height,
height: o.height,
cls: "multi-select-trigger-icon-button"
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
self.numberCounter.hideView();
if (self.combo.isViewVisible()) {
self.combo.hideView();
} else {
self.combo.showView();
}
});
this.numberCounter = BI.createWidget({
type: "bi.multi_select_check_selected_switcher",
el: {
@ -302,6 +318,11 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
right: 0,
top: 0,
bottom: 0
}, {
el: triggerBtn,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.vertical_adapt",
@ -319,7 +340,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
this.numberCounter.setButtonChecked(this.storeValue);
},
_stopEditing: function () {
_stopEditing: function() {
this.trigger.stopEditing();
this.numberCounter.hideView();
},

Write Preview
Loading…
Cancel
Save