Index: arms/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -re2d040dbcb294d7f6c59c2fa0eea7dcea1f5af16 -r03bc9a6f23bcee1e88684992ef4c019f0bd0595e --- arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision e2d040dbcb294d7f6c59c2fa0eea7dcea1f5af16) +++ arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 03bc9a6f23bcee1e88684992ef4c019f0bd0595e) @@ -44,4 +44,8 @@ .jexcel { background: #DDD; -} \ No newline at end of file +} + +.jexcel_pagination { + max-height: 40px; +} Index: arms/html/analysisResource/modal/content-modal_sankey.html =================================================================== diff -u -rf88f5ac0d4928dc9ae4fc01646abe67c875c7ad0 -r03bc9a6f23bcee1e88684992ef4c019f0bd0595e --- arms/html/analysisResource/modal/content-modal_sankey.html (.../content-modal_sankey.html) (revision f88f5ac0d4928dc9ae4fc01646abe67c875c7ad0) +++ arms/html/analysisResource/modal/content-modal_sankey.html (.../content-modal_sankey.html) (revision 03bc9a6f23bcee1e88684992ef4c019f0bd0595e) @@ -43,24 +43,6 @@
-
@@ -109,7 +91,7 @@ class="gradient_middle_border" style="width: 100%; height: 1px">
-
Index: arms/js/common/jspreadsheet/jspreadsheetAPI.js =================================================================== diff -u -r5308ae37385134ee1601da068b272328cd7747b8 -r03bc9a6f23bcee1e88684992ef4c019f0bd0595e --- arms/js/common/jspreadsheet/jspreadsheetAPI.js (.../jspreadsheetAPI.js) (revision 5308ae37385134ee1601da068b272328cd7747b8) +++ arms/js/common/jspreadsheet/jspreadsheetAPI.js (.../jspreadsheetAPI.js) (revision 03bc9a6f23bcee1e88684992ef4c019f0bd0595e) @@ -131,6 +131,54 @@ "parent": "61" }, { + "id": "admin", + "name": "admin", + "type": "작업자", + "parent": "55" + }, + { + "id": "63b2a039159df2c252e826e9", + "name": "이동민", + "type": "작업자", + "parent": "61" + }, + { + "id": "admin", + "name": "admin", + "type": "작업자", + "parent": "37" + }, + { + "id": "63b2a039159df2c252e826ee", + "name": "이동민", + "type": "작업자", + "parent": "61" + }, + { + "id": "admin", + "name": "admin", + "type": "작업자", + "parent": "74" + }, + { + "id": "63b2a039159df2c252e826e9", + "name": "이동민", + "type": "작업자", + "parent": "37" + }, + { + "id": "admin", + "name": "admin", + "type": "작업자", + "parent": "36" + }, + { + "id": "63b2a039159df2c252e826e9", + "name": "이동민", + "type": "작업자", + "parent": "55" + }, + { "id": "No-Worker", "name": "No-Worker", "type": "No-Worker", @@ -248,6 +296,7 @@ pagination:30, // data: getSheetData(), data: sheetData, + tableOverflow: true, //columns: columnList, columns: [ { type: "text", title: "제품(서비스) 키", width: spreadsheetElement.clientWidth * 0.1}, Index: arms/js/common/jspreadsheet/modal/fs_analysisResource.js =================================================================== diff -u -re2d040dbcb294d7f6c59c2fa0eea7dcea1f5af16 -r03bc9a6f23bcee1e88684992ef4c019f0bd0595e --- arms/js/common/jspreadsheet/modal/fs_analysisResource.js (.../fs_analysisResource.js) (revision e2d040dbcb294d7f6c59c2fa0eea7dcea1f5af16) +++ arms/js/common/jspreadsheet/modal/fs_analysisResource.js (.../fs_analysisResource.js) (revision 03bc9a6f23bcee1e88684992ef4c019f0bd0595e) @@ -1,6 +1,7 @@ (function(){ // 엑셀 데이터 높이 고정을 위한, 계산 let chart_height = $("#chart_data").height(); + let chart_width = $("#chart_data").width(); console.log(chart_height); // chart_height 고정 @@ -40,8 +41,17 @@ console.log("excel_data"); // $("#btn_modal_excel").click(); let tarId = "modal_excel"; - JspreadsheetApi.getSheetData(); - JspreadsheetApi.sheetRender(tarId); + $.when(JspreadsheetApi.getSheetData()).done(function() { + JspreadsheetApi.sheetRender(tarId); + }).done( function() { + // 40(pagination) 30(header) + let jexcel_content_height = chart_height - 40 -30; + $("#modal_excel .jexcel_content").css("max-height",jexcel_content_height); + $("#modal_excel .jexcel_content").css("width","100%"); + }).fail( function() { + console.log("excel_data 그리기 실패"); + }); + } else if (target === "#option_toggle") { $(".option_tab").removeClass("active");