From 58989268f4230376cb4049e3aa3efc5a5211b2cd Mon Sep 17 00:00:00 2001 From: Salih Date: Mon, 12 Feb 2024 17:49:45 +0300 Subject: [PATCH 1/2] Update date-range-picker-extensions.js --- .../date-range-picker/date-range-picker-extensions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js index 276f417219..7dae64e38e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js @@ -457,9 +457,9 @@ .each(function () { var $this = $(this); var $input = $this.find('.input-group input[type="text"]') - var $startDateInput = $this.find('input[data-start-date]'); - var $endDateInput = $this.find('input[data-end-date]'); - var $dateInput = $this.find('input[data-date]'); + var $startDateInput = $this.find('input[type="hidden"][data-start-date]'); + var $endDateInput = $this.find('input[type="hidden"][data-end-date]'); + var $dateInput = $this.find('input[type="hidden"][data-date]'); if ($input.data('daterangepicker')) { return; } From a557e95cef220670fa1d99cca6506097cd00aa55 Mon Sep 17 00:00:00 2001 From: Salih Date: Tue, 13 Feb 2024 13:28:40 +0300 Subject: [PATCH 2/2] Update date-range-picker-extensions.js --- .../date-range-picker/date-range-picker-extensions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js index 7dae64e38e..44615e5acd 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js @@ -304,6 +304,9 @@ function setOptions(options, $datePickerElement, singleDatePicker) { options.singleDatePicker = singleDatePicker; + + var $modal = $datePickerElement.closest('.modal.fade'); + var defaultOptions = { showDropdowns: true, opens: "center", @@ -320,7 +323,8 @@ clearLabel: abp.localization.localize('Clear', 'AbpUi'), applyLabel: abp.localization.localize('Apply', 'AbpUi'), }, - singleOpenAndClearButton: true + singleOpenAndClearButton: true, + parentEl: $modal.length > 0 ? $modal : 'body' }; var locale = defaultOptions.locale; $.extend(options, defaultOptions);