From 63fb9defce20d9118ce041f5d236535bda5f4508 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 11:32:36 +0800
Subject: [PATCH] no message

Former-commit-id: 9593f54f182e94d413e0b4fc1fcd82a52a779178
Former-commit-id: fb046e79ef923ced449c8e313209963b7106bc9d
Former-commit-id: 82dcc467d302e3b556b1c0dbcb43b6c0d29be11c
---
 src/plugin/export/_export2Excel.js | 7 +------
 src/plugin/export/index.js         | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugin/export/_export2Excel.js b/src/plugin/export/_export2Excel.js
index 11ae45b7..6037bbd6 100755
--- a/src/plugin/export/_export2Excel.js
+++ b/src/plugin/export/_export2Excel.js
@@ -17,25 +17,20 @@ function generateArray(table) {
             var rowspan = cell.getAttribute('rowspan');
             var cellValue = cell.innerText;
             if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
-
             //Skip ranges
             ranges.forEach(function (range) {
                 if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
                     for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
                 }
             });
-
             //Handle Row Span
             if (rowspan || colspan) {
                 rowspan = rowspan || 1;
                 colspan = colspan || 1;
                 ranges.push({s: {r: R, c: outRow.length}, e: {r: R + rowspan - 1, c: outRow.length + colspan - 1}});
-            }
-            ;
-
+            };
             //Handle Value
             outRow.push(cellValue !== "" ? cellValue : null);
-
             //Handle Colspan
             if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
         }
diff --git a/src/plugin/export/index.js b/src/plugin/export/index.js
index b7f4faeb..732a9131 100644
--- a/src/plugin/export/index.js
+++ b/src/plugin/export/index.js
@@ -1,7 +1,7 @@
 // 库
 import Csv from './_csv'
 import ExportCsv from './_export-csv'
-import * as excel from './_export2Excel'
+import * as Excel from './_export2Excel'
 export default {
   install (Vue, options) {
     Vue.prototype.$export = {
@@ -29,7 +29,7 @@ export default {
       excel () {
         const tHeader = ['Id', 'Title', 'Author', 'Readings', 'Date']
         const data = []
-        excel.export_json_to_excel(tHeader, data, 'demo')
+        Excel.export_json_to_excel(tHeader, data, 'demo')
       }
     }
   }