Browse Source

Update date-range-picker-extensions.js

pull/18648/head
Salih 3 years ago
parent
commit
2f3b65880a
  1. 18
      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

18
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

@ -215,7 +215,12 @@
var today = moment(); var today = moment();
$dateRangePicker.setStartDate(today); $dateRangePicker.setStartDate(today);
$dateRangePicker.setEndDate(today); $dateRangePicker.setEndDate(today);
$dateRangePicker.updateView();
if(options.singleDatePicker && options.autoApply){
$dateRangePicker.clickApply();
}else{
$dateRangePicker.updateView();
}
}); });
return $todayBtn; return $todayBtn;
@ -568,14 +573,17 @@
}); });
$input.on('show.daterangepicker', function (ev, picker) { $input.on('show.daterangepicker', function (ev, picker) {
const today = moment();
if(isEmptyDate(startDate, options)){ if(isEmptyDate(startDate, options)){
picker.setStartDate(); picker.setStartDate(today);
}else{ }else{
picker.setStartDate(convertToMoment(startDate, options, options.inputDateFormat)); picker.setStartDate(convertToMoment(startDate, options, options.inputDateFormat));
} }
if(isEmptyDate(endDate, options)){ if(singleDatePicker){
picker.setEndDate(); picker.setEndDate(picker.startDate);
}else if(isEmptyDate(endDate, options)){
picker.setEndDate(today);
} }
else{ else{
picker.setEndDate(convertToMoment(endDate, options, options.inputDateFormat)); picker.setEndDate(convertToMoment(endDate, options, options.inputDateFormat));

Loading…
Cancel
Save