From 5996786ac1e76645be752a9971ad75ee2fe730d7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 15 2월 2022 10:40:00 +0900
Subject: [PATCH] - 탐지일시가 제대로 검색되지 않는 문제 해결 - 이슈 테이블 표시 설정 시 팝업 타이밍 수정
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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..aee27e2 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,13 +77,18 @@
});
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
- timePicker: false,
+ timePicker: true,
+ timePicker24Hour : 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 +96,35 @@
},
opens : "center"
});
+ // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕)
+ $($element).on('cancel.daterangepicker', function(ev, picker) {
+ $scope.ngModel = "";
+ });
+ } else if ($attrs["rangeType"] === "multiDate") {
+ $($element).daterangepicker({
+ timePicker: true,
+ timePicker24Hour : 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