Browse Source

Fix date range picker initialization and update Luxon usage for timezone handling

pull/22236/head
maliming 2 years ago
parent
commit
4b755848fe
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 5
      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
  2. 2
      npm/packs/luxon/src/abp.luxon.js

5
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 = $('<input>').attr('type', 'hidden').attr('name', name).val(startDate).addClass('hidden-datepicker');

2
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(),

Loading…
Cancel
Save