Index: vue/src/assets/images/devops/DevSupport/github.png =================================================================== diff -u -r78b05593f6cc6771ff362f75d32fc6ef7cc88bd6 -r008311a2c3207590b0f27e8839b88e266815b998 --- vue/src/assets/images/devops/DevSupport/github.png (.../github.png) (revision 78b05593f6cc6771ff362f75d32fc6ef7cc88bd6) +++ vue/src/assets/images/devops/DevSupport/github.png (.../github.png) (revision 008311a2c3207590b0f27e8839b88e266815b998) @@ -2270,3 +2270,36 @@ .carousel-indicators li { background-color: rgba(51, 51, 51, 0.4); } + +/* 데이터테이블 커스텀 */ + +table thead tr th { + overflow: hidden; + white-space: nowrap; +} + +table tbody tr td { + border-bottom: 1px solid rgba(68, 68, 68, 0.7); + box-sizing: border-box; +} + +.dataTables_scrollBody::-webkit-scrollbar { + height: 10px; +} + +.dataTables_scrollBody:hover::-webkit-scrollbar-track { + background-color: #414141; +} + +.dataTables_scrollBody:hover::-webkit-scrollbar-thumb { + background-color: #784a3d; +} + +.dataTables_scrollBody::-webkit-scrollbar-track, +.dataTables_scrollBody::-webkit-scrollbar-thumb { + background-color: transparent; +} + +.dataTables_scrollBody::-webkit-scrollbar-thumb { + border-radius: 5px; +} \ No newline at end of file Index: arms/js/reqStatus.js =================================================================== diff -u -r0d9e822e04ee6395be40d56aec6f600f402ba9f7 -r008311a2c3207590b0f27e8839b88e266815b998 --- arms/js/reqStatus.js (.../reqStatus.js) (revision 0d9e822e04ee6395be40d56aec6f600f402ba9f7) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision 008311a2c3207590b0f27e8839b88e266815b998) @@ -25,17 +25,19 @@ "../reference/jquery-plugins/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js", "../reference/lightblue4/docs/lib/widgster/widgster.js"], - [ "../reference/jquery-plugins/select2-4.0.2/dist/css/select2_lightblue4.css", + [ + "../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.cookie.js", + "../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.hotkeys.js", + "../reference/jquery-plugins/jstree-v.pre1.0/jquery.jstree.js", + "../reference/jquery-plugins/select2-4.0.2/dist/css/select2_lightblue4.css", "../reference/jquery-plugins/lou-multi-select-0.9.12/css/multiselect-lightblue4.css", "../reference/jquery-plugins/multiple-select-1.5.2/dist/multiple-select-bluelight.css", "../reference/jquery-plugins/select2-4.0.2/dist/js/select2.min.js", "../reference/jquery-plugins/lou-multi-select-0.9.12/js/jquery.quicksearch.js", "../reference/jquery-plugins/lou-multi-select-0.9.12/js/jquery.multi-select.js", "../reference/jquery-plugins/multiple-select-1.5.2/dist/multiple-select.min.js"], - [ "../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.cookie.js", - "../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.hotkeys.js", - "../reference/jquery-plugins/jstree-v.pre1.0/jquery.jstree.js", + [ "../reference/jquery-plugins/dataTables-1.10.16/media/css/jquery.dataTables_lightblue4.css", "../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/css/responsive.dataTables_lightblue4.css", "../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/css/select.dataTables_lightblue4.css", @@ -219,18 +221,47 @@ function common_dataTableLoad(selectId, endPointUrl) { var columnList = [ { name: "c_pdservice_link", title: "제품(서비스) 아이디", data: "c_pdservice_link", visible: false }, - { name: "c_pdservice_name", title: "제품(서비스)", data: "c_pdservice_name", visible: true }, - { name: "c_version_link", title: "제품(서비스) 버전 아이디", data: "c_version_link", visible: false }, - { name: "c_version_name", title: "Version", data: "c_version_name", visible: true }, + { + name: "c_pdservice_name", + title: "제품(서비스)", + data: "c_pdservice_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + getStrLimit(data, 25) + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { name: "c_pds_version_link", title: "제품(서비스) 버전 아이디", data: "c_pds_version_link", visible: false }, + { + name: "c_pds_version_name", + title: "제품(서비스) 버전", + data: "c_pds_version_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + getStrLimit(data, 25) + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, { name: "c_jira_project_link", title: "지라 프로젝트 아이디", data: "c_jira_project_link", visible: false }, { name: "c_jira_project_name", title: "JIRA Project", data: "c_jira_project_name", render: function (data, type, row, meta) { - if (type === "display") { - var link = "http://www.313.co.kr/jira/browse/"; - return '' + data + ""; + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + getStrLimit(data, 25) + "
"; } return data; }, @@ -327,7 +358,7 @@ visible: true } ]; - var rowsGroupList = ["c_pdservice_name:name", "c_version_name:name"]; + var rowsGroupList = ["c_pdservice_link", "c_pdservice_name"]; var columnDefList = [ { orderable: false, Index: plugins/datatables/extensions/ColReorder/images/insert.png =================================================================== diff -u -r3c0d6124df28d12eaf8127e87b576744ff07bedf -r008311a2c3207590b0f27e8839b88e266815b998 --- plugins/datatables/extensions/ColReorder/images/insert.png (.../insert.png) (revision 3c0d6124df28d12eaf8127e87b576744ff07bedf) +++ plugins/datatables/extensions/ColReorder/images/insert.png (.../insert.png) (revision 008311a2c3207590b0f27e8839b88e266815b998) @@ -89,7 +89,7 @@ console.log("a-rms"); window.location.replace("http://www.a-rms.net:9999/arms"); } else { - alert("개발에 참여해 주셔서 감사합니다."); + alert("개발에 참여해 주셔서 감사합니다.\n기필코 그대의 노고를 잊지않고, 최대한의 보상을 약속하겠습니다.\n이동민 드림."); window.location.replace("./arms"); } };