From 244b4a7b1b315fe5753777cb7b9ddab7885921dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Thu, 15 Feb 2018 15:21:57 +0800
Subject: [PATCH] no message

Former-commit-id: 4fb4102e6baa9adca376f3558e320e268972a9ae
Former-commit-id: 4df54bfc47b07b9310bcd5889684a307e0508683
Former-commit-id: 1bfbc1b3dab2d61f43ad777ff0c2aeddd9b2f666
---
 src/pages/demo/plugins/import/csv.vue  |  6 +++---
 src/pages/demo/plugins/import/xlsx.vue | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/pages/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv.vue
index 5ab837cc..7e34eac4 100644
--- a/src/pages/demo/plugins/import/csv.vue
+++ b/src/pages/demo/plugins/import/csv.vue
@@ -2,20 +2,20 @@
   <Container>
     <PageHeader
       slot="header"
-      title="导入 CSV"
+      title="导入 csv"
       url="https://github.com/mholt/PapaParse">
     </PageHeader>
     <div class="dd-mb">
       <el-button @click="download">
         <Icon name="download"></Icon>
-        下载演示CSV
+        下载演示 .csv 表格
       </el-button>
     </div>
     <div class="dd-mb">
       <el-upload :before-upload="handleUpload" action="default">
         <el-button type="success">
           <Icon name="file-o"></Icon>
-          选择要导入的 CSV 文件
+          选择要导入的 .csv 表格
         </el-button>
       </el-upload>
     </div>
diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue
index f113b28a..8996035b 100644
--- a/src/pages/demo/plugins/import/xlsx.vue
+++ b/src/pages/demo/plugins/import/xlsx.vue
@@ -5,17 +5,17 @@
       title="导入 xlsx"
       url="https://github.com/SheetJS/js-xlsx">
     </PageHeader>
-    <!-- <div class="dd-mb">
+    <div class="dd-mb">
       <el-button @click="download">
         <Icon name="download"></Icon>
-        下载演示CSV
+        下载演示 .xlsx 表格
       </el-button>
-    </div> -->
+    </div>
     <div class="dd-mb">
       <el-upload :before-upload="handleUpload" action="default">
         <el-button type="success">
           <Icon name="file-o"></Icon>
-          选择要导入的 xlsx 文件
+          选择要导入的 .xlsx 表格
         </el-button>
       </el-upload>
     </div>
@@ -27,7 +27,7 @@
         :label="item.label">
       </el-table-column>
     </el-table>
-    <Markdown url="/static/markdownFiles/article/插件 - 导入 - csv.md"></Markdown>
+    <!-- <Markdown url="/static/markdownFiles/article/插件 - 导入 - csv.md"></Markdown> -->
   </Container>
 </template>
 
@@ -74,10 +74,10 @@ export default {
         const headers = []
         const range = XLSX.utils.decode_range(sheet['!ref'])
         let C
-        const R = range.s.r /* start in the first row */
-        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
-          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
-          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        const R = range.s.r
+        for (C = range.s.c; C <= range.e.c; ++C) {
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
+          var hdr = 'UNKNOWN ' + C
           if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
           headers.push(hdr)
         }
@@ -94,6 +94,9 @@ export default {
         this.generateDate({ header, results })
       }
       reader.readAsArrayBuffer(file)
+    },
+    download () {
+      window.location.href = 'http://fairyever.qiniudn.com/d2-admin-import-xlsx-demo.xlsx'
     }
   }
 }