Index: arms/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -rf083dd15ef83c10dfaadfbeb967759b12ea7068b -r6dc6aa7a94afbb8a8ed2a29fb2e93d2ba300bcf4 --- arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision f083dd15ef83c10dfaadfbeb967759b12ea7068b) +++ arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 6dc6aa7a94afbb8a8ed2a29fb2e93d2ba300bcf4) @@ -30,21 +30,6 @@ --dark_border_color: rgba(51,51,51,1); } -.jexcel tbody tr:nth-child(even) td{ - background-color: #E6E6E6; -} - -.jexcel { - background: #DDD; -} - -.jexcel_pagination { - max-height: 40px; -} -.jexcel_toolbar { - margin: 0 !important; -} - .jexcel_container .jexcel_content { box-shadow: none !important; } @@ -55,19 +40,11 @@ line-height: 15px !important; /* 행간 설정 */ } -.cell-header { - font-size: 13px !important; -} -.cell-content { - font-size: 12px; - line-height: 15px !important; /* 행간 설정 */ -} - .jexcel_toolbar i.jexcel_toolbar_item { line-height: 16px !important; } -.jexcel > tbody > tr > td.readonly { - color: rgba(51,51,51,0.9); +.jexcel tbody tr td.readonly { + color: #a4c6ff; } /* @@ -121,15 +98,16 @@ } /**/ - .jexcel_toolbar i.jexcel_toolbar_item { line-height: 16px !important; } /* DarkTheme 을 위한 설정 */ +/* 툴바 */ .jexcel_toolbar { background: rgba(51,51,51,0.9) !important; /* rgba(51,51,51,0.9) */ border: none !important; + margin: 0 !important; border-bottom: 1px solid rgba(51,51,51,0.9) !important; /* rgba(51,51,51,0.9) */ } .tb-default-color, @@ -141,46 +119,66 @@ } /* 행 헤더 스타일 */ -.jexcel thead tr td{ +.jexcel thead tr td, +table.jexcel thead tr td{ height: 30px !important; color: var(--dark_jexcel_row_col_header_color) !important; font-weight: 300 !important; font-size: 12px !important; - background: var(--dark_jexcel_header_background) !important; + background: rgba(51,51,51,0.95); !important; border:none !important; + border-right: 1px solid var(--dark_jexcel_border_color_5) !important; border-bottom: 1px solid var(--dark_jexcel_border_color_5) !important; } -.jexcel_row { +.jexcel tbody tr td.jexcel_row, +table.jexcel tbody tr td.jexcel_row { color: var(--dark_jexcel_row_col_header_color) !important; font-weight: 300 !important; font-size: 12px !important; - background: var(--dark_jexcel_header_background) !important; + background: rgba(51,51,51,0.95) !important; border:none !important; + border-right: 1px solid var(--dark_jexcel_border_color_5) !important; border-bottom: 1px solid var(--dark_jexcel_border_color_5) !important; } -.jexcel thead tr td.selected { - background-color: #333333 !important; +.jexcel thead tr td.selected, +table.jexcel thead tr td.selected { + /*background-color: #333333 !important;*/ + background-color: rgba(51,51,51,0.7) !important; } -.jexcel tbody tr.selected .jexcel_row { - background-color: #333333 !important; +.jexcel tbody tr.selected td.jexcel_row, +table.jexcel tbody tr.selected td.jexcel_row { + /*background-color: #333333 !important;*/ + background-color: rgba(51,51,51,0.7) !important; } -.jexcel { +.jexcel, +table.jexcel { border: none !important; } -.jexcel tbody tr td { +/* 일반 셀 설정 */ +.jexcel tbody tr td, +table.jexcel tbody tr td { border-top: none !important; + color: #FFF; + + background-color: rgba(51,51,51,0.8); + + border-top: none !important; border-right: 1px solid var(--dark_jexcel_border_color_5) !important; border-bottom: 1px solid var(--dark_jexcel_border_color_5) !important; border-left: none !important;; padding: 5px !important; } +.jexcel .highlight, +table.jexcel .highlight { + background-color: rgba(51,51,51,0.7) !important; +} .jexcel_pagination div div { background: rgba(51,51,51,0.5) !important; Index: arms/js/analysisCost.js =================================================================== diff -u -rd346944f3b0c03ca470ae52bb25a0861eeb6dea9 -r6dc6aa7a94afbb8a8ed2a29fb2e93d2ba300bcf4 --- arms/js/analysisCost.js (.../analysisCost.js) (revision d346944f3b0c03ca470ae52bb25a0861eeb6dea9) +++ arms/js/analysisCost.js (.../analysisCost.js) (revision 6dc6aa7a94afbb8a8ed2a29fb2e93d2ba300bcf4) @@ -82,9 +82,9 @@ "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.css", "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.datatables.css", "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.theme.css", - "./css/jspreadsheet/custom_sheet.css", + "./js/common/jspreadsheet/spreadsheet.js", "./css/jspreadsheet/custom_icon.css", - "./js/common/jspreadsheet/spreadsheet.js" + "./css/jspreadsheet/custom_sheet.css" ] // 추가적인 플러그인 그룹들을 이곳에 추가하면 됩니다. ]; @@ -1508,19 +1508,17 @@ var columnList = [ { type: "text", title: "이름", wRatio: 0.25, readOnly: true }, { type: "text", title: "키", wRatio: 0.25, readOnly: true }, - { type: "text", title: "연봉", wRatio: 0.5 } + { type: "text", title: "연봉", wRatio: 0.49 } ]; SpreadSheetFunctions.setColumns(columnList); SpreadSheetFunctions.setColumnWidth(excelWidth); var customOptions = { - toolbar:false, + toolbar:[], pagination:10, allowInsertColumn: false, updateTable: function(instace, cell, col, row, val, id) { - cell.classList.add("cell-content"); - cell.style.whiteSpace = "normal"; if(col === 2) { cell.style.textAlign = "right"; @@ -1582,16 +1580,11 @@ }; var setColumnWidth = function (width) { - console.log("setColumnWidth"); - console.log($tabFunction_columns); $tabFunction_columns = $tabFunction_columns.map(column => ({ ...column, width: width * column.wRatio })); - console.log($tabFunction_columns); }; - - return { setExcelData, getExcelData, setColumns, getColumns,