From 146daecda27390f35b99c65a8c9565c6049bec71 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 16:54:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 11 +++++++++--
1 files changed, 9 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..d6ea913 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,13 +77,16 @@
});
} 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 A',
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
daysOfWeek: options.daysOfWeek,
@@ -91,6 +94,10 @@
},
opens : "center"
});
+ // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕)
+ $($element).on('cancel.daterangepicker', function(ev, picker) {
+ $scope.ngModel = "";
+ });
}
}
else {
--
Gitblit v1.8.0