Index: arms/js/common/jspreadsheet/jspreadsheetAPI.js =================================================================== diff -u -rf88f5ac0d4928dc9ae4fc01646abe67c875c7ad0 -r5308ae37385134ee1601da068b272328cd7747b8 --- arms/js/common/jspreadsheet/jspreadsheetAPI.js (.../jspreadsheetAPI.js) (revision f88f5ac0d4928dc9ae4fc01646abe67c875c7ad0) +++ arms/js/common/jspreadsheet/jspreadsheetAPI.js (.../jspreadsheetAPI.js) (revision 5308ae37385134ee1601da068b272328cd7747b8) @@ -244,7 +244,7 @@ return items; }, - search:true, + search:false, pagination:30, // data: getSheetData(), data: sheetData, @@ -264,7 +264,8 @@ oninsertcolumn: function(instance) { console.log('Column added' + '\n'); }, - /*onchange: function(instance, cell, x, y, value) { + /* + 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) { @@ -276,7 +277,8 @@ modifiedRows[key].키 = instance.jexcel.getValueFromCoords(1, y); modifiedRows[key].연봉 = value; } - },*/ + }, + */ oninsertrow: function(instance, rowNumber) { console.log('Row added' + rowNumber); }, @@ -359,7 +361,8 @@ oninsertcolumn: function(instance) { console.log('Column added' + '\n'); }, - /*onchange: function(instance, cell, x, y, value) { + /* + 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) { @@ -371,7 +374,8 @@ modifiedRows[key].키 = instance.jexcel.getValueFromCoords(1, y); modifiedRows[key].연봉 = value; } - },*/ + }, + */ oninsertrow: function(instance, rowNumber) { console.log('Row added' + rowNumber); }, @@ -548,7 +552,7 @@ return fetchData() .then((data) => { - console.log("[ jspreadsheetAPI :: sheetRenderProcess ] :: fetchData") + console.log("[ jspreadsheetAPI :: sheetRenderProcess ] :: fetchData"); console.log(data); return setOptions(data); }) Index: arms/js/common/jspreadsheet/modal/fs_analysisResource.js =================================================================== diff -u -rf88f5ac0d4928dc9ae4fc01646abe67c875c7ad0 -r5308ae37385134ee1601da068b272328cd7747b8 --- arms/js/common/jspreadsheet/modal/fs_analysisResource.js (.../fs_analysisResource.js) (revision f88f5ac0d4928dc9ae4fc01646abe67c875c7ad0) +++ arms/js/common/jspreadsheet/modal/fs_analysisResource.js (.../fs_analysisResource.js) (revision 5308ae37385134ee1601da068b272328cd7747b8) @@ -1,4 +1,16 @@ (function(){ + // 엑셀 데이터 높이 고정을 위한, 계산 + let chart_height = $("#chart_data").height(); + console.log(chart_height); + + // chart_height 고정 + if(chart_height) { + console.log("엑셀 데이터 높이 고정"); + $('#excel_data').height(chart_height); + console.log("엑셀 높이 =>" + $("#chart_data").height()); + } + + // $('a[data-toggle="tab"]').on("shown.bs.tab", function (e) { var target = $(e.target).attr("href"); // activated tab