From abba157cbf33a39c1a1e4e73576f99b234222fe7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 1 Dec 2022 21:02:37 +0300 Subject: [PATCH] [DE] Forms: fix alignment for mask combobox --- apps/common/main/lib/component/ComboBox.js | 5 ++++- apps/documenteditor/main/app/view/FormSettings.js | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 1eb060eb2..42bd19a0e 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -311,7 +311,10 @@ define([ var $list = this.cmpEl.find('ul'); if ($list.hasClass('menu-absolute')) { var offset = this.cmpEl.offset(); - $list.css({left: offset.left, top: offset.top + this.cmpEl.outerHeight() + 2}); + var left = offset.left; + if (left + $list.outerWidth()>Common.Utils.innerWidth()) + left += (this.cmpEl.outerWidth() - $list.outerWidth()); + $list.css({left: left, top: offset.top + this.cmpEl.outerHeight() + 2}); } else if ($list.hasClass('menu-aligned')) { var offset = this.cmpEl.offset(); $list.toggleClass('show-top', offset.top + this.cmpEl.outerHeight() + $list.outerHeight() > Common.Utils.innerHeight()); diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 119ac6d3f..2c7e786c4 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -589,7 +589,8 @@ define([ this.cmbMask = new Common.UI.ComboBoxCustom({ el: $markup.findById('#form-txt-mask'), cls: 'input-group-nr', - menuStyle: 'min-width: 100%;', + menuCls: 'menu-absolute', + menuStyle: 'min-width: 195px;', editable: true, data: [ { displayValue: this.textPhone1, value: '(999)999-9999' },