diff --git a/src/vendor/Export2Excel.js b/src/vendor/Export2Excel.js index ba956dc1..d4223f35 100644 --- a/src/vendor/Export2Excel.js +++ b/src/vendor/Export2Excel.js @@ -145,9 +145,11 @@ export function export_table_to_excel(id) { } export function export_json_to_excel({ + multiHeader, header, data, filename, + merges, autoWidth = true, bookType= 'xlsx' } = {}) { @@ -155,9 +157,21 @@ export function export_json_to_excel({ filename = filename || 'excel-list' data = [...data] data.unshift(header); + + for (let i = multiHeader.length-1; i > -1; i--) { + data.unshift(multiHeader[i]) + } + var ws_name = "SheetJS"; var wb = new Workbook(), ws = sheet_from_array_of_arrays(data); + + if (merges.length > 0) { + if (!ws['!merges']) ws['!merges'] = []; + merges.forEach(item => { + ws['!merges'].push(XLSX.utils.decode_range(item)) + }) + } if (autoWidth) { /*设置worksheet每列的最大宽度*/ diff --git a/src/views/excel/exportExcel.vue b/src/views/excel/exportExcel.vue index 551b89f8..1702d978 100644 --- a/src/views/excel/exportExcel.vue +++ b/src/views/excel/exportExcel.vue @@ -18,20 +18,22 @@ {{ scope.$index }} - - - - - - - - + + + + + + + + + +