From 3fdea7abe9bbfe80b6633790b03eef48d7989b0d Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 19 Aug 2024 09:23:27 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EB=8B=AC=EB=A0=A5=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EC=9D=98=20z-index=20=EC=88=98=EC=A0=95=202.=20datepicker=20?= =?UTF-8?q?=EC=9B=90=EB=B3=B8=20js=ED=8C=8C=EC=9D=BC=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=84=B0=EB=A7=88=EC=9D=B4=EC=A7=95=ED=95=9C?= =?UTF-8?q?=20=EB=B6=80=EB=B6=84=EC=97=90=20=EC=A3=BC=EC=84=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bootstrap-datepicker.js | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/webapp/resources/3rd-party/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js b/src/main/webapp/resources/3rd-party/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js index e10f157..dfbd045 100644 --- a/src/main/webapp/resources/3rd-party/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js +++ b/src/main/webapp/resources/3rd-party/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js @@ -660,6 +660,7 @@ place: function(){ if (this.isInline) return this; + var calendarWidth = this.picker.outerWidth(), calendarHeight = this.picker.outerHeight(), inputHeight = this.inputField.innerHeight(), @@ -721,6 +722,10 @@ } } + // ** 달력 팝업 위치 결정방법 수정 + // 1.기본적으로 하단에 표시 + // 2.공간이 없을 경우 상단에 표시 + // 3.상단에도 공간이 경우 하단에 표시 // auto y orientation is best-situation: top or bottom, no fudging, // decision based on which shows more of the calendar var yorient = this.o.orientation.y, @@ -761,6 +766,23 @@ zIndex: zIndex }); } + + // ** 달력 스타일 수정(z-index !important 추가) + var styleAttr = this.picker.attr('style'); + var ziStart = styleAttr.substring(styleAttr.indexOf("z-index")); + var semicolonIdx = ziStart.indexOf(";"); + if(semicolonIdx != -1){ + ziString = ziStart.substring(0,semicolonIdx); + } else { + ziString = ziStart; + } + + if(ziString.indexOf("!important") == -1){ + var ziValue = ziString.substring(9); + var replaceStr = "z-index: " + ziValue + ' !important'; + this.picker.attr('style', styleAttr.replace(ziString, replaceStr)); + } + return this; }, @@ -1694,6 +1716,7 @@ }; $.fn.datepicker = datepickerPlugin; + // ** 기본 설정 수정 var defaults = $.fn.datepicker.defaults = { language: 'ko', rtl: false, @@ -1747,6 +1770,7 @@ 'weekStart' ]; $.fn.datepicker.Constructor = Datepicker; + // ** 기본 언어 한글로 변경 var dates = $.fn.datepicker.dates = { ko: { days: ["일","월","화","수","목","금","토"], @@ -1959,6 +1983,7 @@ } return date.join(''); }, + // ** 템플릿 수정(오늘 버튼, 지우기 버튼 추가) headTemplate: ''+ ''+ ''+