Index: arms/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -r819e8122b947b824c934ca8cfe23a674ece09424 -rf99437953d6bb12d24e7a99bfdbdad5d2b5bbdc1 --- arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 819e8122b947b824c934ca8cfe23a674ece09424) +++ arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision f99437953d6bb12d24e7a99bfdbdad5d2b5bbdc1) @@ -130,9 +130,15 @@ background: rgba(51,51,51,0.95); !important; border:none !important; - border-right: 1px solid #d9d9d94d !important; - border-bottom: 1px solid #d9d9d94d !important; + border-right: 1px solid #f8f8f81a !important; + border-bottom: 1px solid #f8f8f81a !important; } + +.jexcel thead tr td:last-child, +table.jexcel thead tr td:last-child { + border-right: 1px solid rgba(51,51,51,0.5) !important; +} + .jexcel tbody tr td.jexcel_row, table.jexcel tbody tr td.jexcel_row { color: var(--dark_jexcel_row_col_header_color) !important; @@ -142,8 +148,8 @@ background: rgba(51,51,51,0.95) !important; border:none !important; - border-right: 1px solid #d9d9d94d !important; - border-bottom: 1px solid #d9d9d94d !important; + border-right: 1px solid #f8f8f81a !important; + border-bottom: 1px solid #f8f8f81a !important; } .jexcel thead tr td.selected, table.jexcel thead tr td.selected { @@ -169,7 +175,7 @@ .jexcel tbody tr td, table.jexcel tbody tr td { border-top: none !important; - color: #FFF; + color: #f8f8f8; background-color: rgba(51,51,51,0.8); @@ -216,8 +222,8 @@ } .fa.fa-font.fa-background { - color: #FFF; - background-color: #000000; + color: #f8f8f8; + background-color: rgba(248,248,248,0.1); } .search-box { Index: arms/js/analysisCost.js =================================================================== diff -u -r819e8122b947b824c934ca8cfe23a674ece09424 -rf99437953d6bb12d24e7a99bfdbdad5d2b5bbdc1 --- arms/js/analysisCost.js (.../analysisCost.js) (revision 819e8122b947b824c934ca8cfe23a674ece09424) +++ arms/js/analysisCost.js (.../analysisCost.js) (revision f99437953d6bb12d24e7a99bfdbdad5d2b5bbdc1) @@ -62,9 +62,6 @@ "../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/jszip.min.js", ], [ - /*"../reference/jquery-plugins/datetimepicker-2.5.20/build/jquery.datetimepicker.min.css", - "../reference/light-blue/lib/bootstrap-datepicker.js", - "../reference/jquery-plugins/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js",*/ //chart Colors "./js/common/colorPalette.js", // Apache Echarts @@ -600,7 +597,6 @@ console.log(" [ analysisCost :: manpowerInput ] :: 인력별_연봉정보 => " + JSON.stringify(인력별_연봉정보)); drawExcel("spreadsheet", 인력별_연봉정보); - //jspreadsheetRender(인력별_연봉정보); // 템플릿 다운로드 excel_download(인력별_연봉정보); @@ -1497,13 +1493,12 @@ console.log($($targetId)[0].jexcel); $($targetId)[0].jexcel.destroy(); } - console.log("width=> " + $($targetId).width()); - var excelWidth=$($targetId).width() - 50; + var excelWidth=$($targetId).width() - 50; var columnList = [ { type: "text", title: "이름", wRatio: 0.25, readOnly: true }, { type: "text", title: "키", wRatio: 0.25, readOnly: true }, - { type: "text", title: "연봉", wRatio: 0.49 } + { type: "text", title: "연봉", wRatio: 0.5 } ]; SpreadSheetFunctions.setColumns(columnList); @@ -1609,104 +1604,7 @@ }; })(); -function jspreadsheetRender(data) { - var spreadsheetElement = document.getElementById("spreadsheet"); - if (spreadsheetElement.jexcel) { - spreadsheetElement.jexcel.destroy(); - } - - var sheet = jspreadsheet(spreadsheetElement, { - // allowComments: true, - contextMenu: function(o, x, y, e, items) { - var items = []; - - // Save - items.push({ - title: jSuites.translate('Save as'), - shortcut: 'Ctrl + S', - icon: 'save', - onclick: function () { - o.download(); - } - }); - - return items; - }, - search:true, - pagination:10, - data: data, - columns: [ - { type: "text", title: "이름", readOnly: true }, - { type: "text", title: "키", readOnly: true }, - { type: "text", title: "연봉" } - ], - onbeforechange: function(instance, cell, x, y, value) { - var cellName = jspreadsheet.getColumnNameFromId([x,y]); - console.log('The cell ' + cellName + ' will be changed' + '\n'); - }, - oninsertcolumn: function(instance) { - console.log('Column added' + '\n'); - }, - onchange: function(instance, cell, x, y, value) { - var cellName = jspreadsheet.getColumnNameFromId([x,y]); - console.log('onchange :: ' + cell + " :; x :: " + x + " :: y :: " + y +" :: cellName ::" + cellName + ' to: ' + value + '\n'); - if (x == 2) { - var key = instance.jexcel.getValueFromCoords(1, y); - if (!modifiedRows[key]) { - modifiedRows[key] = {}; - } - modifiedRows[key].이름 = instance.jexcel.getValueFromCoords(0, y); - modifiedRows[key].키 = instance.jexcel.getValueFromCoords(1, y); - modifiedRows[key].연봉 = value; - } - }, - oninsertrow: function(instance, rowNumber) { - console.log('Row added' + rowNumber); - }, - ondeleterow: function(instance, rowNumber) { - console.log('Row deleted' + rowNumber); - }, - ondeletecolumn: function(instance) { - console.log('Column deleted' +'\n'); - }, - onselection: function(instance, x1, y1, x2, y2, origin) { - var cellName1 = jspreadsheet.getColumnNameFromId([x1, y1]); - var cellName2 = jspreadsheet.getColumnNameFromId([x2, y2]); - console.log('The selection from ' + cellName1 + ' to ' + cellName2 + '' + '\n'); - }, - onsort: function(instance, cellNum, order) { - var order = (order) ? 'desc' : 'asc'; - console.log('The column ' + cellNum + ' sorted by ' + order + '\n'); - }, - onresizerow: function(instance, cell, height) { - console.log('The row ' + cell + ' resized to height ' + height + ' px' + '\n'); - }, - onresizecolumn: function(instance, cell, width) { - console.log('The column ' + cell + ' resized to width ' + width + ' px' + '\n'); - }, - onmoverow: function(instance, from, to) { - console.log('The row ' + from + ' was move to the position of ' + to + ' ' + '\n'); - }, - onmovecolumn: function(instance, from, to) { - console.log('The col ' + from + ' was move to the position of ' + to + ' ' + '\n'); - }, - onload: function(instance) { - console.log('New data is loaded' + '\n'); - }, - onblur: function(instance) { - console.log('The table ' + $(instance).prop('id') + ' is blur' + '\n'); - }, - onfocus: function(instance) { - console.log('The table ' + $(instance).prop('id') + ' is focus' + '\n'); - }, - onpaste: function(data) { - console.log('Paste on the table ' + $(instance).prop('id') + '' + '\n'); - }, - }); - -} - $(document).ready(function() { $("#cost-excel-batch-update").on('click', function() { Index: controltower/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -r819e8122b947b824c934ca8cfe23a674ece09424 -rf99437953d6bb12d24e7a99bfdbdad5d2b5bbdc1 --- controltower/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 819e8122b947b824c934ca8cfe23a674ece09424) +++ controltower/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision f99437953d6bb12d24e7a99bfdbdad5d2b5bbdc1) @@ -130,9 +130,15 @@ background: rgba(51,51,51,0.95); !important; border:none !important; - border-right: 1px solid #d9d9d94d !important; - border-bottom: 1px solid #d9d9d94d !important; + border-right: 1px solid #f8f8f81a !important; + border-bottom: 1px solid #f8f8f81a !important; } + +.jexcel thead tr td:last-child, +table.jexcel thead tr td:last-child { + border-right: 1px solid rgba(51,51,51,0.5) !important; +} + .jexcel tbody tr td.jexcel_row, table.jexcel tbody tr td.jexcel_row { color: var(--dark_jexcel_row_col_header_color) !important; @@ -142,8 +148,8 @@ background: rgba(51,51,51,0.95) !important; border:none !important; - border-right: 1px solid #d9d9d94d !important; - border-bottom: 1px solid #d9d9d94d !important; + border-right: 1px solid #f8f8f81a !important; + border-bottom: 1px solid #f8f8f81a !important; } .jexcel thead tr td.selected, table.jexcel thead tr td.selected { @@ -169,7 +175,7 @@ .jexcel tbody tr td, table.jexcel tbody tr td { border-top: none !important; - color: #FFF; + color: #f8f8f8; background-color: rgba(51,51,51,0.8); @@ -216,8 +222,8 @@ } .fa.fa-font.fa-background { - color: #FFF; - background-color: #000000; + color: #f8f8f8; + background-color: rgba(248,248,248,0.1); } .search-box {