From 4b755848fea77fe87c0824156074c5cc030e7575 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 5 Mar 2025 14:43:08 +0800 Subject: [PATCH] Fix date range picker initialization and update Luxon usage for timezone handling --- .../date-range-picker/date-range-picker-extensions.js | 5 ++++- npm/packs/luxon/src/abp.luxon.js | 2 +- 2 files changed, 5 insertions(+), 2 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 29facc3ac8..e10ceefbf9 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 @@ -759,12 +759,15 @@ $this.find('input[class~="hidden-datepicker"]').remove(); datepickers.each(function () { var $this = $(this); + var datepicker = $this.data('daterangepicker'); + if (!datepicker) { + return; + } if ($this.val() === '') { return; } var name = $this.attr('name') || $this.data('name'); $this.data('name', name).removeAttr('name'); - var datepicker = $this.data('daterangepicker'); if (datepicker.singleDatePicker) { var startDate = abp.clock.normalizeToString(datepicker.startDate.toDate()); var startDateInput = $('').attr('type', 'hidden').attr('name', name).val(startDate).addClass('hidden-datepicker'); diff --git a/npm/packs/luxon/src/abp.luxon.js b/npm/packs/luxon/src/abp.luxon.js index e8bcfb7acc..5e42183884 100644 --- a/npm/packs/luxon/src/abp.luxon.js +++ b/npm/packs/luxon/src/abp.luxon.js @@ -56,7 +56,7 @@ var abp = abp || {}; var timeZone = abp.clock.timeZone(); if (abp.clock.supportsMultipleTimezone() && timeZone) { - return DateTime.fromObject({ + return luxon.DateTime.fromObject({ year: dateObj.getFullYear(), month: dateObj.getMonth() + 1, day: dateObj.getDate(),