From 865e48b3de08f6d51b3e2fe3170585d535512961 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 10 1월 2022 14:10:04 +0900
Subject: [PATCH] 사용자 정의 필드(날짜) 기간 검색으로 변경
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index d6367d5..7e6e62a 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,13 +77,17 @@
});
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
- timePicker: false,
+ timePicker: true,
+ timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
singleDatePicker : true,
+ isSingle : true,
+
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD hh:mm:ss',
+ separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
daysOfWeek: options.daysOfWeek,
@@ -91,6 +95,34 @@
},
opens : "center"
});
+ // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕)
+ $($element).on('cancel.daterangepicker', function(ev, picker) {
+ $scope.ngModel = "";
+ });
+ } else if ($attrs["rangeType"] === "multiDate") {
+ $($element).daterangepicker({
+ timePicker: true,
+ timePickerSeconds : true,
+ autoUpdateInput: true,
+ autoApply : true,
+ singleDatePicker : false,
+ isSingle : false,
+
+ //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
+ locale: {
+ format: 'YYYY-MM-DD hh:mm:ss',
+ separator: "~",
+ applyLabel: options.applyLabel,
+ cancelLabel: options.cancelLabel,
+ daysOfWeek: options.daysOfWeek,
+ monthNames: options.monthNames
+ },
+ opens : "center"
+ });
+ // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕)
+ $($element).on('cancel.daterangepicker', function(ev, picker) {
+ $scope.ngModel = "";
+ });
}
}
else {
--
Gitblit v1.8.0