From f7f1d62d4cfd8f4cc0426783ea2067d853368060 Mon Sep 17 00:00:00 2001
From: CNine <cnine229@gmail.com>
Date: Mon, 22 Oct 2018 19:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20excel=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20=E5=A2=9E=E5=8A=A0=20excel=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E7=AC=AC=E4=B8=80=E8=A1=8C=E6=A0=87=E9=A2=98=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 3463e5feeaec05f84a8c42930edfbacaba6f0b92 [formerly 9ab91bc47458493d93f817aca80427749cb0acf6]]]]]
Former-commit-id: 94df74e7c154789c835119fc23096fa6f8202ad5
Former-commit-id: 4a005fbd1ada5ce6e4cbb085b320660f2aa626cb
Former-commit-id: 9d6dcc7b0e761e85a5295b235351b2e462c42f1f [formerly 607caf152de8bef7fede86a44e3003b1aaff2912]
Former-commit-id: e54717456d4c5db124d9b8f0536a5dd6b1c9f8d7
Former-commit-id: 360f57cad825ce848e0cc1ef27835ec49837e0a8
Former-commit-id: 48de0f2794339a594d3fb37e3f76fdc6302932a9
Former-commit-id: e037bfa8bdb5e08b116cdea79887f82737b5034f
Former-commit-id: e785e67cb2ee407b5b682bf8959767daff219ce7
---
 src/pages/demo/plugins/export/table.vue | 4 +++-
 src/plugin/export/_export2Excel.js      | 8 +++++++-
 src/plugin/export/index.js              | 6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

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()
         })