Browse Source
Fix date range picker initialization and update Luxon usage for timezone handling
pull/22236/head
maliming
2 years ago
No known key found for this signature in database
GPG Key ID: A646B9CB645ECEA4
2 changed files with
5 additions and
2 deletions
-
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
-
npm/packs/luxon/src/abp.luxon.js
|
|
@ -759,12 +759,15 @@ |
|
|
$this.find('input[class~="hidden-datepicker"]').remove(); |
|
|
$this.find('input[class~="hidden-datepicker"]').remove(); |
|
|
datepickers.each(function () { |
|
|
datepickers.each(function () { |
|
|
var $this = $(this); |
|
|
var $this = $(this); |
|
|
|
|
|
var datepicker = $this.data('daterangepicker'); |
|
|
|
|
|
if (!datepicker) { |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
if ($this.val() === '') { |
|
|
if ($this.val() === '') { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
var name = $this.attr('name') || $this.data('name'); |
|
|
var name = $this.attr('name') || $this.data('name'); |
|
|
$this.data('name', name).removeAttr('name'); |
|
|
$this.data('name', name).removeAttr('name'); |
|
|
var datepicker = $this.data('daterangepicker'); |
|
|
|
|
|
if (datepicker.singleDatePicker) { |
|
|
if (datepicker.singleDatePicker) { |
|
|
var startDate = abp.clock.normalizeToString(datepicker.startDate.toDate()); |
|
|
var startDate = abp.clock.normalizeToString(datepicker.startDate.toDate()); |
|
|
var startDateInput = $('<input>').attr('type', 'hidden').attr('name', name).val(startDate).addClass('hidden-datepicker'); |
|
|
var startDateInput = $('<input>').attr('type', 'hidden').attr('name', name).val(startDate).addClass('hidden-datepicker'); |
|
|
|
|
|
@ -56,7 +56,7 @@ var abp = abp || {}; |
|
|
|
|
|
|
|
|
var timeZone = abp.clock.timeZone(); |
|
|
var timeZone = abp.clock.timeZone(); |
|
|
if (abp.clock.supportsMultipleTimezone() && timeZone) { |
|
|
if (abp.clock.supportsMultipleTimezone() && timeZone) { |
|
|
return DateTime.fromObject({ |
|
|
return luxon.DateTime.fromObject({ |
|
|
year: dateObj.getFullYear(), |
|
|
year: dateObj.getFullYear(), |
|
|
month: dateObj.getMonth() + 1, |
|
|
month: dateObj.getMonth() + 1, |
|
|
day: dateObj.getDate(), |
|
|
day: dateObj.getDate(), |
|
|
|