Index: arms/html/analysisResource/modal/content-modal_sankey.html
===================================================================
diff -u -r429435025d720146cf3285c4d47def376fb90e7c -ra361bc70f06ddac57114b42a827d3b0816a7e4e3
--- arms/html/analysisResource/modal/content-modal_sankey.html (.../content-modal_sankey.html) (revision 429435025d720146cf3285c4d47def376fb90e7c)
+++ arms/html/analysisResource/modal/content-modal_sankey.html (.../content-modal_sankey.html) (revision a361bc70f06ddac57114b42a827d3b0816a7e4e3)
@@ -149,7 +149,7 @@
loadPluginGroupsParallelAndSequential(pluginGroups).then(function() {
console.log("해당 html 및 js 로드 완료.");
- // excelColumn 세팅 (width ratio))
+ // excelColumn 세팅 (width ratio)
var columnList = [
{ type: "text", title: "제품(서비스) 키", wRatio: 0.1},
{ type: "text", title: "제품(서비스) 명", wRatio: 0.25},
@@ -384,8 +384,12 @@
let excelData = modifyData(mock_data);
console.log(excelData);
+ // 커스텀 옵션 정의
+ let customOptions = { search:false };
+
ModalTabFunction.setColumns(columnList);
ModalTabFunction.setExcelData(excelData);
+ ModalTabFunction.setOptions(customOptions);
ModalTabFunction.drawExcel("modal_excel");
});
Index: arms/js/common/jspreadsheet/modalTabFunction.js
===================================================================
diff -u -r429435025d720146cf3285c4d47def376fb90e7c -ra361bc70f06ddac57114b42a827d3b0816a7e4e3
--- arms/js/common/jspreadsheet/modalTabFunction.js (.../modalTabFunction.js) (revision 429435025d720146cf3285c4d47def376fb90e7c)
+++ arms/js/common/jspreadsheet/modalTabFunction.js (.../modalTabFunction.js) (revision a361bc70f06ddac57114b42a827d3b0816a7e4e3)
@@ -3,8 +3,9 @@
// Modal Chart / Modal Exce의 Tab 메뉴별 동작 설정
- let $tabFunction_data;
- let $tabFunction_columns;
+ let $tabFunction_data; // 엑셀 데이터
+ let $tabFunction_columns;// 엑셀 컬럼
+ let $tabFunction_options;// 엑셀 (커스텀)옵션 :: 정의 안할 경우 default
// 엑셀 데이터 높이 고정을 위한, 계산
let chart_height = $("#chart_data").height();
let chart_width = $("#chart_data").width();
@@ -24,6 +25,12 @@
var getColumns = function () {
return $tabFunction_columns;
}
+ var setOptions = function(options) {
+ $tabFunction_options = options;
+ }
+ var getOptions = function() {
+ return $tabFunction_options ? $tabFunction_options : null;
+ }
var setColumnWidth = function (width) {
console.log("setColumnWidth");
@@ -123,12 +130,10 @@
setColumnWidth(chart_width);
- $($targetId).spreadsheet({
+ $($targetId).spreadsheet($.extend({}, {
columns: getColumns(),
- data: getExcelData(),
- // 커스텀 옵션 정의
- search:false
- });
+ data: getExcelData()
+ }, getOptions()));
jexcel_content_height = chart_height - 40 -30 -35 - 34;
console.log("chart_height=> " + chart_height);
@@ -137,6 +142,9 @@
$("#modal_excel .jexcel_content").css("width","100%");
}
return {
- setExcelData, getExcelData, setColumns, getColumns, drawExcel
+ setExcelData, getExcelData,
+ setColumns, getColumns,
+ setOptions, getOptions,
+ drawExcel
}
})(jQuery);
\ No newline at end of file