Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js =================================================================== diff -u -rc2cf4040e9e221c12ba20a389d64216337133f6b -r251816037c1e79d71f958f08020a3d6f1308b95f --- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision c2cf4040e9e221c12ba20a389d64216337133f6b) +++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 251816037c1e79d71f958f08020a3d6f1308b95f) @@ -29,7 +29,8 @@ proxies: [ { context: ['/auth-anon','/auth-user','/auth-admin','/auth-check','/sso','/dwr','/logout'], - host: '127.0.0.1', + host:'www.313.co.kr', + //host: '127.0.0.1', port: 13131, https: false, changeOrigin: true Index: arms/html/pdService/content-container.html =================================================================== diff -u -r81317e6c0912d3c4c16e426f57d211b715eecd29 -r251816037c1e79d71f958f08020a3d6f1308b95f --- arms/html/pdService/content-container.html (.../content-container.html) (revision 81317e6c0912d3c4c16e426f57d211b715eecd29) +++ arms/html/pdService/content-container.html (.../content-container.html) (revision 251816037c1e79d71f958f08020a3d6f1308b95f) @@ -21,7 +21,12 @@
1. 제품(서비스) 선택
-
-
-
-
- 새창으로 보기 - 내용편집 하기 - +
+
+

+ + 제품(서비스) 버전 등록 / 변경 + +

+
+ + + +
-
-
-
-
-
- +
+
+
+ +
+
+
-
- - +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
Version Contents
+
+
+ +
+
+
+ + Drop files here +
+
+
+
+
+ +
+
+
+ +
 
+
+
+
+ + + Add files... + + + + +
+
+ +
+ + + + + +
+
-
-
- -
- - -
-
-
- -
- -
- 이동민 - 방현지 +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + + + + + + +
+
+
+
+
+ +
+
+
+ + + + + + + +
+
+
+
+
+ +

+
+
+
+

버전에 포함될 기능을 요약합니다.

+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- - Drop files here -
-
-
-
-
-
-
+
+ + +
- -
 
+
-
- - - Add files... - - -
+
+
+ +
- -
-
- -
-
+
+
+ + + + + + + +
+
+
+
+
+ +
+
+ +
+
+
+ + +
+
+ - -
+ Close + +
- - + + @@ -351,14 +842,156 @@ .profile-image img { width: 100%; } + .dropzone { + text-align: center; + } + .modalDarkBack { + background: rgb(51 51 51 / 94%) !important; + border: 1px solid rgb(51 51 51) !important; + } + + /*! + * Datepicker for Bootstrap + * + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */ + .datepicker { + top: 0; + left: 0; + padding: 4px; + margin-top: 1px; + color: #555555; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + -ms-border-radius: 1px; + -o-border-radius: 1px; + border-radius: 1px; + /*.dow { + border-top: 1px solid #ddd !important; + }*/ + } + + .datepicker:before { + content: ""; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; + top: -7px; + left: 6px; + } + + .datepicker:after { + content: ""; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid white; + position: absolute; + top: -6px; + left: 7px; + } + + .datepicker > div { + display: none; + } + + .datepicker table { + width: 100%; + margin: 0; + } + + .datepicker td, + .datepicker th { + text-align: center; + width: 20px; + height: 20px; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + -ms-border-radius: 1px; + -o-border-radius: 1px; + border-radius: 1px; + } + + .datepicker td.day:hover { + background: #f8f8f8; + cursor: pointer; + } + + .datepicker td.day.disabled { + color: #f8f8f8; + } + + .datepicker td.old, + .datepicker td.new { + color: white; + } + + .datepicker td.active, + .datepicker td.active:hover { + background: #618fb0; + color: #fff; + } + + .datepicker td span { + display: block; + width: 47px; + height: 54px; + line-height: 54px; + float: left; + margin: 2px; + cursor: pointer; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + -ms-border-radius: 1px; + -o-border-radius: 1px; + border-radius: 1px; + } + + .datepicker td span:hover { + background: #eeeeee; + } + + .datepicker td span.active { + background: #618fb0; + color: #fff; + } + + .datepicker td span.old { + color: #999999; + } + + .datepicker th.switch { + width: 145px; + } + + .datepicker th.next, + .datepicker th.prev { + font-size: 19.5px; + } + + .datepicker thead tr:first-child th { + cursor: pointer; + } + + .datepicker thead tr:first-child th:hover { + background: #eeeeee; + } + Index: arms/js/pdService.js =================================================================== diff -u -raecefeabc79f6e368b3817187af7954ff86ece24 -r251816037c1e79d71f958f08020a3d6f1308b95f --- arms/js/pdService.js (.../pdService.js) (revision aecefeabc79f6e368b3817187af7954ff86ece24) +++ arms/js/pdService.js (.../pdService.js) (revision 251816037c1e79d71f958f08020a3d6f1308b95f) @@ -1,4 +1,21 @@ + +// --- 에디터 설정 --- // +//CKEDITOR.replace("editor"); +CKEDITOR.replace("input_pdservice_editor"); +CKEDITOR.replace("modal-editor"); + +// --- 팝업 띄울때 사이즈 조정 -- // +$("#modalPopupId").click(function () { + var height = $(document).height() - 400; + $(".modal-body") + .find(".cke_contents:eq(0)") + .css("height", height + "px"); +}); + + + // make review list + const makeReviewList = function (profile) { const wrap = document.getElementById("service-reviewers"); let reviewer = ""; @@ -28,10 +45,12 @@ }; $(function () { - pageChecker(); + + //pageChecker(); setSideMenu("sidebar_menu_product", "sidebar_menu_product_manage"); + makeReviewList([ { name: "Finees Lund", @@ -42,6 +61,39 @@ image: "../reference/light-blue/img/13.jpg", }, ]); + + // DataPicker 처리 부분 ( 팝업 레이어 ) + $(".date-picker").datepicker({ + autoclose: true, + }); + //datepicker 만들기 + const makeDatePicker = (calender) => { + calender + .datepicker({ + autoclose: true, + }) + .on("changeDate", function (ev) { + const Input = $(this).parent().prev(); + Input.val(calender.data("date")); + if (Input.attr("id") === "input_pdservice_start_date") { + $("#versionStartDate").text(calender.data("date")); + } else if (Input.attr("id") === "input_pdservice_end_date") { + $("#versionEndDate").text(calender.data("date")); + } + calender.datepicker("hide"); + }); + }; + + const $btnCalendar = $("#btn-select-calendar"); + const $btnEndCalendar = $("#btn-end-calendar"); + const $btnCalendarPopup = $("#btn-select-calendar-popup"); + const $btnEndCalendarPopup = $("#btn-end-calendar-popup"); + + makeDatePicker($btnCalendar); + makeDatePicker($btnEndCalendar); + makeDatePicker($btnCalendarPopup); + makeDatePicker($btnEndCalendarPopup); + }); function jstreeDataTableReload() { @@ -90,18 +142,7 @@ $("select[name=pdserviceTable_length]").css("width", "50px"); }); -// --- 에디터 설정 --- // -//CKEDITOR.replace("editor"); -//CKEDITOR.replace("modal-editor"); -// --- 팝업 띄울때 사이즈 조정 -- // -$("#modalPopupId").click(function () { - var height = $(document).height() - 400; - $(".modal-body") - .find(".cke_contents:eq(0)") - .css("height", height + "px"); -}); - function jsTreeClick(selectedNode) { console.log("-->" + selectedNode.attr("id").replace("node_", "")); console.log( Index: arms/js/pdServiceVersion.js =================================================================== diff -u -r7c696e479b93504e4ee2325d023b757b523ea607 -r251816037c1e79d71f958f08020a3d6f1308b95f --- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 7c696e479b93504e4ee2325d023b757b523ea607) +++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 251816037c1e79d71f958f08020a3d6f1308b95f) @@ -17,7 +17,7 @@ // document ready $(function () { - + //사이드 메뉴 처리 setSideMenu("sidebar_menu_product", "sidebar_menu_version_manage"); Index: arms/pdService.html =================================================================== diff -u -r73eae260aed639371608057f733ead1fed770466 -r251816037c1e79d71f958f08020a3d6f1308b95f --- arms/pdService.html (.../pdService.html) (revision 73eae260aed639371608057f733ead1fed770466) +++ arms/pdService.html (.../pdService.html) (revision 251816037c1e79d71f958f08020a3d6f1308b95f) @@ -174,6 +174,10 @@ + + + + + + + + + + Index: dist/css/alt/AdminLTE-select2.min.css =================================================================== diff -u -r92ab52e29efafd62f6d35f896e4d37f22c85b7c0 -r251816037c1e79d71f958f08020a3d6f1308b95f --- dist/css/alt/AdminLTE-select2.min.css (.../AdminLTE-select2.min.css) (revision 92ab52e29efafd62f6d35f896e4d37f22c85b7c0) +++ dist/css/alt/AdminLTE-select2.min.css (.../AdminLTE-select2.min.css) (revision 251816037c1e79d71f958f08020a3d6f1308b95f) @@ -24,6 +24,7 @@ "@vue/cli-plugin-eslint": "~5.0.0", "@vue/cli-plugin-router": "^5.0.8", "@vue/cli-service": "~5.0.0", + "R2": "^1.4.3", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", "grunt": "^1.5.3", @@ -49,7 +50,6 @@ "grunt-serve": "^0.1.6", "grunt-text-replace": "^0.4.0", "less": "^3", - "R2": "^1.4.3", "serve-static": "^1.15.0" }, "eslintConfig": {