Index: arms/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -r6c18adeefe4c7da4c6958786abc7c77da7dc80dd -r592948f3b91694e6df37d6e1cc77025c4b25a897 --- arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 6c18adeefe4c7da4c6958786abc7c77da7dc80dd) +++ arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 592948f3b91694e6df37d6e1cc77025c4b25a897) @@ -46,6 +46,16 @@ color: #a4c6ff; } +/* Editor 설정 */ +.jexcel_content tbody tr td.editor { + padding-left: 1px !important; + overflow-x: hidden; + overflow-y: auto !important; +} +.jexcel_content tbody tr td.editor>input { + width: 95% !important; +} + /* * DarkTheme 을 위한 설정 */ @@ -87,15 +97,6 @@ color: var(--dark_jexcel_row_col_header_color) !important; } -/* icon 설정 */ -.fa:before { - width: 16px; - display: inline-block; - height: 16px; - text-align: center; - vertical-align: middle; -} - /**/ .jexcel_toolbar i.jexcel_toolbar_item { line-height: 16px !important; @@ -210,7 +211,6 @@ text-align: center; vertical-align: middle; line-height: 16px; - color: #f8f8f8; } .fa.fa-font.fa-background { Index: arms/js/common/jspreadsheet/spreadsheet.js =================================================================== diff -u -r819e8122b947b824c934ca8cfe23a674ece09424 -r592948f3b91694e6df37d6e1cc77025c4b25a897 --- arms/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision 819e8122b947b824c934ca8cfe23a674ece09424) +++ arms/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision 592948f3b91694e6df37d6e1cc77025c4b25a897) @@ -132,7 +132,7 @@ search: true, pagination: 30, tableOverflow: true, - textOverflow: true, + textOverflow: false, tableWidth: "100%", onchange: function (instance, cell, x, y, value) { console.log(cell); Index: backoffice/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -rb2af5eef60b0cc50cc3982a901a3a393b2889fe8 -r592948f3b91694e6df37d6e1cc77025c4b25a897 --- backoffice/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision b2af5eef60b0cc50cc3982a901a3a393b2889fe8) +++ backoffice/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 592948f3b91694e6df37d6e1cc77025c4b25a897) @@ -24,7 +24,6 @@ --dark_toolbar_background: rgba(51,51,51,0.9); --dark_toolbar_color: #FFF; --dark_jexcel_header_background: rgba(51,51,51,0.95); - /*--dark_jexcel_row_col_header_color: #646463;*/ --dark_jexcel_row_col_header_color: #EEE; --dark_jexcel_border_color_5: rgba(51,51,51,0.5); --dark_border_color: rgba(51,51,51,1); @@ -47,6 +46,16 @@ color: #a4c6ff; } +/* Editor 설정 */ +.jexcel_content tbody tr td.editor { + padding-left: 1px !important; + overflow-x: hidden; + overflow-y: auto !important; +} +.jexcel_content tbody tr td.editor>input { + width: 95% !important; +} + /* * DarkTheme 을 위한 설정 */ @@ -88,15 +97,6 @@ color: var(--dark_jexcel_row_col_header_color) !important; } -/* icon 설정 */ -.fa:before { - width: 16px; - display: inline-block; - height: 16px; - text-align: center; - vertical-align: middle; -} - /**/ .jexcel_toolbar i.jexcel_toolbar_item { line-height: 16px !important; @@ -211,7 +211,6 @@ text-align: center; vertical-align: middle; line-height: 16px; - color: #f8f8f8; } .fa.fa-font.fa-background { Index: backoffice/js/common/jspreadsheet/spreadsheet.js =================================================================== diff -u -rb2af5eef60b0cc50cc3982a901a3a393b2889fe8 -r592948f3b91694e6df37d6e1cc77025c4b25a897 --- backoffice/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision b2af5eef60b0cc50cc3982a901a3a393b2889fe8) +++ backoffice/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision 592948f3b91694e6df37d6e1cc77025c4b25a897) @@ -134,11 +134,10 @@ search: true, pagination: 30, tableOverflow: true, - textOverflow: true, + textOverflow: false, tableWidth: "100%", onchange: function(instacne, cell, x, y, value) { console.log(cell); - //var cellName = Spreadsheet.getColumnNameFromId([x,y]); }, onload: function (element) { var $jexcel = $(element); @@ -147,12 +146,12 @@ 'row;align-items: center; font-style: normal; height: 100%; width:100% !important;">' + ' ' + ''); - $jexcel.find(".jexcel_toolbar_item[data-k='undo']").addClass("fa fa-mail-reply tb-default-color"); + $jexcel.find(".jexcel_toolbar_item[data-k='undo']").addClass("fa fa-mail-reply "); $jexcel.find(".jexcel_toolbar_item[data-k='redo']").addClass("fa fa-mail-forward "); $jexcel.find(".jexcel_toolbar_item[data-k='save']").addClass("fa fa-save"); - $jexcel.find(".jexcel_toolbar_item[data-k='text-align'][data-v='right']").addClass("fa fa-align-left fa-rotate-180"); - $jexcel.find(".jexcel_toolbar_item[data-k='text-align'][data-v='center']").addClass("fa fa-align-center fa-rotate-180"); - $jexcel.find(".jexcel_toolbar_item[data-k='text-align'][data-v='left']").addClass("fa fa-align-right fa-rotate-180"); + $jexcel.find(".jexcel_toolbar_item[data-k='text-align'][data-v='left']").addClass("fa fa-align-left fa-flip-vertical"); + $jexcel.find(".jexcel_toolbar_item[data-k='text-align'][data-v='center']").addClass("fa fa-align-center fa-flip-vertical"); + $jexcel.find(".jexcel_toolbar_item[data-k='text-align'][data-v='right']").addClass("fa fa-align-right fa-flip-vertical"); $jexcel.find(".jexcel_toolbar_item[data-k='font-weight'][data-v='bold']").addClass("fa fa-bold"); $jexcel.find(".jexcel_toolbar_item[data-k='font-style'][data-v='italic']").addClass("fa fa-italic"); $jexcel.find(".jexcel_toolbar_item[data-k='text-decoration'][data-v='underline']").addClass("fa fa-underline");