From 6c02f6d813327dd2baaad2f37d9951807fa03c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sat, 10 Feb 2018 21:24:36 +0800
Subject: [PATCH] no message

Former-commit-id: f4dad5d69a0c6bff3fbc12432354f43589ad41b9
Former-commit-id: 03f9d142c7e22048c9a10c966943e8ac9283f0b6
Former-commit-id: 52cf672b7a3d062dfc95d1d495e026de03fd476a
---
 src/pages/demo/plugins/tableExport/demo.vue | 5 ++++-
 src/plugin/export/index.js                  | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/demo/plugins/tableExport/demo.vue b/src/pages/demo/plugins/tableExport/demo.vue
index 1a405ebc..9a06a5f6 100644
--- a/src/pages/demo/plugins/tableExport/demo.vue
+++ b/src/pages/demo/plugins/tableExport/demo.vue
@@ -38,7 +38,10 @@ export default {
   },
   methods: {
     exportCsv (params = {}) {
-      this.$export.csv()
+      this.$export.csv({
+        columns: this.table.columns,
+        data: this.table.data
+      })
     }
   }
 }
diff --git a/src/plugin/export/index.js b/src/plugin/export/index.js
index e67ae154..202de44e 100644
--- a/src/plugin/export/index.js
+++ b/src/plugin/export/index.js
@@ -13,7 +13,8 @@ export default {
           noHeader: false
         }
         // 合并参数
-        const _params = Object.assign({}, params, paramsDefault)
+        const _params = Object.assign({}, paramsDefault, params)
+        console.log(_params)
         // 生成数据
         const data = Csv(_params.columns, _params.data, params, _params.noHeader)
         // 下载数据