From 677e853cb88fa43336b7aa7d2014ff8758d3b4bb Mon Sep 17 00:00:00 2001
From: JChehe <574805242@qq.com>
Date: Fri, 17 Feb 2017 15:53:38 +0800
Subject: [PATCH] Limit the format of the imported file

---
 app/package.json                              |  2 +-
 .../FirstScreenPageView/ExcelDisplay.vue      | 21 ++++++--
 app/src/components/common/FileList.vue        | 50 +++++++++++--------
 app/src/components/common/Footer.vue          | 17 +++++--
 app/src/utils/ExcelSet.js                     | 10 ++++
 package.json                                  |  2 +-
 6 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/app/package.json b/app/package.json
index 79171b3..f55d3c7 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xcel",
   "product": "XCel",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "An ultimate excel data filter",
   "author": "AOTULabs <o2labs@qq.com>",
   "main": "electron.js",
diff --git a/app/src/components/FirstScreenPageView/ExcelDisplay.vue b/app/src/components/FirstScreenPageView/ExcelDisplay.vue
index a45f186..7c7fe1e 100644
--- a/app/src/components/FirstScreenPageView/ExcelDisplay.vue
+++ b/app/src/components/FirstScreenPageView/ExcelDisplay.vue
@@ -41,6 +41,7 @@
 	import fs from 'fs-extra'
 	import pathModule from 'path'
 	import { ipcRenderer } from 'electron'
+	import { isExcelFile } from '../../utils/ExcelSet'
 	import { getSheetNameList, getActiveSheet, getSideBarStatus, getFilterTagList, getFilterWay } from '../../vuex/getters'
 	import { setActiveSheet, setExcelData, setUploadFiles } from '../../vuex/actions'
 	import SheetOfExcel from './SheetOfExcel'
@@ -101,11 +102,20 @@
 			},
 			dropHandler(e){
 				let files = e.dataTransfer.files
-				this.setExcelData({
-					path: files[0].path,
-					type: 'node'
-				})
-				this.setUploadFiles(path)
+				let path = files[0].path
+
+				if(!isExcelFile(path)) {
+					this.dragleaveHandler(e)
+					ipcRenderer.send('sync-alert-dialog', {
+		        content: '不支持该文件格式'
+		      })
+				} else {
+					this.setExcelData({
+						path: path,
+						type: 'node'
+					})
+					this.setUploadFiles(path)
+				}
 			}			
 		}
 	}
@@ -176,6 +186,7 @@
 			line-height: 17px;
 			background-color: rgba(0,0,0, .15);
 			text-align: center;
+			pointer-events: none;
 			svg {
 				vertical-align: text-top;
 				margin-right: 10px;
diff --git a/app/src/components/common/FileList.vue b/app/src/components/common/FileList.vue
index 6439474..6159efb 100644
--- a/app/src/components/common/FileList.vue
+++ b/app/src/components/common/FileList.vue
@@ -19,6 +19,7 @@
 <script>
 	import xlsx from 'xlsx'
 	import fs from 'fs'
+	import { isExcelFile } from '../../utils/ExcelSet'
 	import { remote, ipcRenderer } from 'electron'
 	import { changeFileType, setExcelData ,setActiveSheet, setUploadFiles, delUploadFiles } from '../../vuex/actions'
 	import { getCurSearchVal, getUploadFiles } from '../../vuex/getters'
@@ -64,27 +65,34 @@
 				});
 			},
 			confirmRead(path, index){
-				remote.dialog.showMessageBox({
-					type: 'question',
-					buttons: ['确定', '取消'],
-					defaultId: 0,
-					title: 'XCel',
-					message: '导入该文件会覆盖目前的筛选结果，是否确认要导入？'
-				}, (btnIndex) => {
-					if(btnIndex === 0) {
-						fs.stat(path, (err, stats) => {
-							if(stats && stats.isFile()) {
-								this.setExcelData({
-									path: path,
-									type: 'node'
-								})
-								this.setUploadFiles(path)
-							}else{
-								this.confirmDel(index, '当前文件不存在，是否删除该记录？')
-							}
-						})
-					}
-				})
+				if(!isExcelFile(path)) {
+					ipcRenderer.send('sync-alert-dialog', {
+		        content: '不支持该文件格式'
+		      })
+		      this.confirmDel(index, '当前工具不支持该文件格式，是否删除该记录？')
+				} else {
+					remote.dialog.showMessageBox({
+						type: 'question',
+						buttons: ['确定', '取消'],
+						defaultId: 0,
+						title: 'XCel',
+						message: '导入该文件会覆盖目前的筛选结果，是否确认要导入？'
+					}, (btnIndex) => {
+						if(btnIndex === 0) {
+							fs.stat(path, (err, stats) => {
+								if(stats && stats.isFile()) {
+									this.setExcelData({
+										path: path,
+										type: 'node'
+									})
+									this.setUploadFiles(path)
+								}else{
+									this.confirmDel(index, '当前文件不存在，是否删除该记录？')
+								}
+							})
+						}
+					})
+				}
 			},
 			confirmDel(index, content) {
 				remote.dialog.showMessageBox({
diff --git a/app/src/components/common/Footer.vue b/app/src/components/common/Footer.vue
index c8a3a46..2eb2668 100644
--- a/app/src/components/common/Footer.vue
+++ b/app/src/components/common/Footer.vue
@@ -43,6 +43,7 @@
 	import os from 'os'
 	import pathModule from 'path'
 	import { ipcRenderer } from 'electron'
+	import { isExcelFile } from '../../utils/ExcelSet'
 	import request from 'request'
 	import compareVersions from 'compare-versions'
 	import { openExternal } from '../../utils/openExternal'
@@ -100,11 +101,17 @@
 		},
 		created() {
 			ipcRenderer.on('open-file-response', (event, path) => {
-				this.setExcelData({
-					path: path,
-					type: 'node'
-				})
-				this.setUploadFiles(path)
+				if(isExcelFile(path)) {
+					this.setExcelData({
+						path: path,
+						type: 'node'
+					})
+					this.setUploadFiles(path)
+				} else {
+					ipcRenderer.send('sync-alert-dialog', {
+		        content: '不支持该文件格式'
+		      })
+				}
 			})
 			if(!this.isKeepCurVersion && firstTime) {
         this.checkUpdate(false)
diff --git a/app/src/utils/ExcelSet.js b/app/src/utils/ExcelSet.js
index 9e6830f..5f6f5cf 100644
--- a/app/src/utils/ExcelSet.js
+++ b/app/src/utils/ExcelSet.js
@@ -1,5 +1,7 @@
 // 该文件存放 Excel 的相关方法
 
+import pathModule from 'path'
+
 // Excel 横向坐标的转换 1 <--> A
 /* 来自 http://www.cnblogs.com/lavezhang/archive/2012/05/14/2499000.html */ 
 
@@ -29,6 +31,14 @@ export function getNumCol(s) {
   return n
 }
 
+export function isExcelFile(filePath) {
+  let extname = pathModule.extname(filePath)
+  let regexp = /\.xlsx?$/ig
+
+  return extname.search(regexp) !== -1
+}
+
+
 export const colOperator = [{
     char: '+',
     words: '相加'
diff --git a/package.json b/package.json
index 02be999..84567c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xcel",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "An ultimate excel data filter",
   "scripts": {
     "build": "node tasks/release.js",