From 9f97ef5e36296cbff665cbe8203686c2dd1c6c2d Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 목, 13 1월 2022 18:05:06 +0900 Subject: [PATCH] - owl Exception 리턴값 200으로 다시 수정 --- src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 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 7be0571..7e6e62a 100644 --- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js +++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js @@ -77,7 +77,8 @@ }); } else if ($attrs["rangeType"] === "singleDate") { $($element).daterangepicker({ - timePicker: false, + timePicker: true, + timePickerSeconds : true, autoUpdateInput: true, autoApply : true, singleDatePicker : true, @@ -85,7 +86,32 @@ //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, + monthNames: options.monthNames + }, + 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, -- Gitblit v1.8.0