diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue index 1fb63c56..975e5c5c 100644 --- a/src/pages/demo/plugins/export/table.vue +++ b/src/pages/demo/plugins/export/table.vue @@ -50,7 +50,9 @@ export default { exportExcel () { this.$export.excel({ columns: this.table.columns, - data: this.table.data + data: this.table.data, + header: '导出 Excel', + merges: ['A1', 'E1'] }) .then(() => { this.$message('导出表格成功') diff --git a/src/plugin/export/_export2Excel.js b/src/plugin/export/_export2Excel.js index 302e0dcd..0efa20ef 100644 --- a/src/plugin/export/_export2Excel.js +++ b/src/plugin/export/_export2Excel.js @@ -124,16 +124,22 @@ export function export_table_to_excel(id) { function formatJson(jsonData) { console.log(jsonData) } -export function export_json_to_excel(th, jsonData, defaultTitle) { +export function export_json_to_excel(th, jsonData, defaultTitle, options = { merges: [], header: null }) { /* original data */ var data = jsonData; data.unshift(th); + if (options.header) data.unshift([options.header]); var ws_name = "SheetJS"; var wb = new Workbook(), ws = sheet_from_array_of_arrays(data); + /* add merges area to worksheet */ + let { merges } = options; + if (typeof merges[0] == 'string' && merges.length == 2) merges = [merges] // just one # ['A1', 'C1'] = > [['A1', 'C1']] + merges = merges.map(i => i instanceof Array ? { s: i[0], e: i[1] } : i); // be sort :) # ['A1', 'C1'] => { s: 'A1', e: 'C3' } + ws['!merges'] = merges; /* add worksheet to workbook */ wb.SheetNames.push(ws_name); diff --git a/src/plugin/export/index.js b/src/plugin/export/index.js index eb2cae49..3449897b 100644 --- a/src/plugin/export/index.js +++ b/src/plugin/export/index.js @@ -36,7 +36,9 @@ export default { const paramsDefault = { columns: [], data: [], - title: 'table' + title: 'table', + header: null, + merges: [] } // 合并参数 const _params = Object.assign({}, paramsDefault, params) @@ -44,7 +46,7 @@ export default { const header = _params.columns.map(e => e.label) const data = _params.data.map(row => _params.columns.map(col => row[col.prop])) // 导出 - Excel.export_json_to_excel(header, data, _params.title) + Excel.export_json_to_excel(header, data, _params.title, { merges: _params.merges, header: _params.header }) // 完成 resolve() })