From 62a27546c06a4a1066756dc84fffc444b3f78c23 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:08:39 +0300 Subject: [PATCH 1/4] Remove custom css for select2 --- .../Bundling/BasicThemeGlobalStyleContributor.cs | 1 - .../wwwroot/themes/basic/custom/select2-bs5-fix.css | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs index e5254366d4..bf60b4ccd0 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs @@ -7,7 +7,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling public override void ConfigureBundle(BundleConfigurationContext context) { context.Files.Add("/themes/basic/layout.css"); - context.Files.Add("/themes/basic/custom/select2-bs5-fix.css"); } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css deleted file mode 100644 index beb981c139..0000000000 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css +++ /dev/null @@ -1,4 +0,0 @@ -/*TODO: Remove after BS5 Modal support of select2 */ -span.select2-container.select2-container--default.select2-container--open { - z-index: 1056; /*Just for BS5 Modals*/ -} From 253408ff5bec01649e736e87e301fb097ef06efb Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:08:53 +0300 Subject: [PATCH 2/4] Add parent parameter to dom-initializers --- .../bootstrap/dom-event-handlers.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js index 55c604cf4a..4e83df796a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js @@ -81,6 +81,7 @@ var itemsPropertyName = $(this).data("autocompleteItemsProperty"); var filterParamName = $(this).data("autocompleteFilterParamName"); var selectedText = $(this).data("autocompleteSelectedItemName"); + var parentSelector = $(this).data("autocompleteParentSelector"); var name = $(this).attr("name"); var selectedTextInputName = name.substring(0, name.length - 1) + "_Text]"; var selectedTextInput = $('', { @@ -119,7 +120,8 @@ }; } }, - width: '100%' + width: '100%', + dropdownParent: parentSelector ? $(parentSelector) : $('body'), }); $select.on('select2:select', function (e) { selectedTextInput.val(e.params.data.text); From 7b070e0296fd00a4b2d31bcd898cb8cd43c87732 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:09:11 +0300 Subject: [PATCH 3/4] Implement parent selector for CmsKit Menu select2 --- .../Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml | 2 +- .../Pages/CmsKit/Menus/MenuItems/createModal.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml index 37264289b4..bb4083a6b9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml @@ -13,7 +13,7 @@ }
- + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js index 41e37a0118..2818f48523 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/createModal.js @@ -33,6 +33,7 @@ $(function () { $pageId.data('autocompleteValueProperty', 'id'); $pageId.data('autocompleteItemsProperty', 'items'); $pageId.data('autocompleteFilterParamName', 'filter'); + $pageId.data('autocompleteParentSelector', '#menu-create-modal'); abp.dom.initializers.initializeAutocompleteSelects($pageId); } From 3aef9d9d99c1fe6c4b143a7e558e74016ce22ab4 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 25 Nov 2021 15:25:11 +0300 Subject: [PATCH 4/4] CmsKit - Implement parentSelector to UpdateModal --- .../Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml | 2 +- .../Pages/CmsKit/Menus/MenuItems/updateModal.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml index 81ebc6625d..719b708566 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml @@ -13,7 +13,7 @@ } - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js index e219763fc0..d8ded357bb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/updateModal.js @@ -34,6 +34,7 @@ $(function () { $pageId.data('autocompleteValueProperty', 'id'); $pageId.data('autocompleteItemsProperty', 'items'); $pageId.data('autocompleteFilterParamName', 'filter'); + $pageId.data('autocompleteParentSelector', '#menu-update-modal'); abp.dom.initializers.initializeAutocompleteSelects($pageId); }