From 554162775ca771ded91656e1061b5f530555e9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Fri, 9 Feb 2018 19:52:42 +0800
Subject: [PATCH] no message

Former-commit-id: 749c159b54ea39951ddad455ca99256a55745644
Former-commit-id: 2dda6f7f898b9fc36d236eb478a615d9cd03ba1f
Former-commit-id: a21343caef3ca2939d104cbdba14780da79381ef
---
 src/pages/demo/plugins/tableExport/demo.vue | 20 +++++++++++---------
 src/utils/csv.js                            |  5 +++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pages/demo/plugins/tableExport/demo.vue b/src/pages/demo/plugins/tableExport/demo.vue
index ea6377e4..b8474ee5 100644
--- a/src/pages/demo/plugins/tableExport/demo.vue
+++ b/src/pages/demo/plugins/tableExport/demo.vue
@@ -4,12 +4,12 @@
       slot="header"
       title="基本示例">
     </PageHeader>
-    <div>
+    <!-- <div>
       <el-button @click="exportCsv">
         <Icon name="download"></Icon>
         exportCsv
       </el-button>
-    </div>
+    </div> -->
     <el-table v-bind="table" style="width: 100%" class="dd-mb">
       <el-table-column
         v-for="(item, index) in table.columns"
@@ -25,8 +25,8 @@
 // 假数据
 import table from './data'
 // 库
-// import Csv from '@/utils/csv.js'
-// import ExportCsv from '@/utils/export-csv.js'
+import Csv from '@/utils/csv.js'
+import ExportCsv from '@/utils/export-csv.js'
 export default {
   data () {
     return {
@@ -39,12 +39,14 @@ export default {
       }
     }
   },
+  mounted () {
+    this.exportCsv()
+  },
   methods: {
-    exportCsv (params) {
-      let _params = Object.assign({}, params, {
-        filename: 'table'
-      })
-      console.log(_params)
+    exportCsv (params = {}) {
+      const noHeader = false
+      const data = Csv(this.table.columns, this.table.data, params, noHeader)
+      ExportCsv.download('table.csv', data)
     }
   }
 }
diff --git a/src/utils/csv.js b/src/utils/csv.js
index d8f300b3..43a329ac 100755
--- a/src/utils/csv.js
+++ b/src/utils/csv.js
@@ -30,11 +30,12 @@ export default function csv(columns, datas, options, noHeader = false) {
 
     if (columns) {
         columnOrder = columns.map(v => {
+            console.log(v)
             if (typeof v === 'string') return v;
             if (!noHeader) {
-                column.push(typeof v.title !== 'undefined' ? v.title : v.key);
+                column.push(typeof v.label !== 'undefined' ? v.label : v.prop);
             }
-            return v.key;
+            return v.prop;
         });
         if (column.length > 0) appendLine(content, column, options);
     } else {