From ed27fae2b7763376412e1b001724dff5619a48a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sun, 11 Feb 2018 16:58:30 +0800
Subject: [PATCH] no message

Former-commit-id: 8ba996eb2dbe794b7e1162c48b02488521f7553f
Former-commit-id: 7e2450ef2cd0607d8609a26c150cc8537911c5b7
Former-commit-id: 437f88a1aba7be735f85017831b6a46c09ad7776
---
 src/pages/demo/plugins/tableExport/demo.vue |  5 ++++-
 src/plugin/export/index.js                  | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/pages/demo/plugins/tableExport/demo.vue b/src/pages/demo/plugins/tableExport/demo.vue
index db5341c9..ff74a8f9 100644
--- a/src/pages/demo/plugins/tableExport/demo.vue
+++ b/src/pages/demo/plugins/tableExport/demo.vue
@@ -49,7 +49,10 @@ export default {
       })
     },
     exportExcel () {
-      this.$export.excel()
+      this.$export.excel({
+        columns: this.table.columns,
+        data: this.table.data
+      })
     }
   }
 }
diff --git a/src/plugin/export/index.js b/src/plugin/export/index.js
index fc3a6ed1..9646f18e 100644
--- a/src/plugin/export/index.js
+++ b/src/plugin/export/index.js
@@ -27,12 +27,19 @@ export default {
         })
       },
       // 导出 Excel
-      excel () {
-        const tHeader = ['Id', 'Title', 'Author', 'Readings', 'Date']
-        const data = [
-          ['1', 'name']
-        ]
-        Excel.export_json_to_excel(tHeader, data, 'demo')
+      excel (params) {
+        // 默认值
+        const paramsDefault = {
+          columns: [],
+          data: []
+        }
+        // 合并参数
+        const _params = Object.assign({}, paramsDefault, params)
+        // 从参数中派生数据
+        const header = _params.columns.map(e => e.label)
+        const data = _params.data.map(row => _params.columns.map(col => row[col.prop]))
+        // 导出 Excel
+        Excel.export_json_to_excel(header, data, 'demo')
       }
     }
   }