From 47ff13c198d6bb031500bd78211a3fdbf7b55a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 12 Mar 2023 00:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=B8=9A=E5=8A=A1=E4=B8=8B?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=90=8C=E6=AD=A5=E5=8A=A0=E5=85=A5=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/views/biz/user/impExp.vue | 29 +++++++++++++++++++
 snowy-admin-web/src/views/sys/user/impExp.vue | 13 +++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/snowy-admin-web/src/views/biz/user/impExp.vue b/snowy-admin-web/src/views/biz/user/impExp.vue
index 5d1681b6..759bf69a 100644
--- a/snowy-admin-web/src/views/biz/user/impExp.vue
+++ b/snowy-admin-web/src/views/biz/user/impExp.vue
@@ -37,6 +37,7 @@
 </template>
 
 <script setup name="bizUserImpExp">
+	import { message } from 'ant-design-vue'
 	import userApi from '@/api/sys/userApi'
 	import bizUserApi from '@/api/biz/bizUserApi'
 	import downloadUtil from '@/utils/downloadUtil'
@@ -45,10 +46,38 @@
 	const impAlertStatus = ref(false)
 	const impResultData = ref({})
 	const impResultErrorDataSource = ref([])
+	const impAccept = [
+		{
+			extension: '.xls',
+			mimeType: 'application/vnd.ms-excel'
+		},
+		{
+			extension: '.xlsx',
+			mimeType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+		}
+	]
+	// 指定能选择的文件类型
+	const uploadAccept = String(
+		impAccept.map((item) => {
+			return item.mimeType
+		})
+	)
 	// 导入
 	const customRequestLocal = (data) => {
 		impUploadLoading.value = true
 		const fileData = new FormData()
+		// 校验上传文件扩展名和文件类型是否为.xls、.xlsx
+		const extension = '.'.concat(data.file.name.split('.').slice(-1).toString().toLowerCase())
+		const mimeType = data.file.type
+		// 提取允许的扩展名
+		const extensionArr = impAccept.map((item) => item.extension)
+		// 提取允许的MIMEType
+		const mimeTypeArr = impAccept.map((item) => item.mimeType)
+		if (!extensionArr.includes(extension) || !mimeTypeArr.includes(mimeType)) {
+			message.warning('上传文件类型仅支持xls、xlsx格式文件！')
+			impUploadLoading.value = false
+			return false
+		}
 		fileData.append('file', data.file)
 		return bizUserApi
 			.userImport(fileData)
diff --git a/snowy-admin-web/src/views/sys/user/impExp.vue b/snowy-admin-web/src/views/sys/user/impExp.vue
index 5fc3b564..0fccc049 100644
--- a/snowy-admin-web/src/views/sys/user/impExp.vue
+++ b/snowy-admin-web/src/views/sys/user/impExp.vue
@@ -14,7 +14,7 @@
 		<a-divider dashed />
 		<div>
 			<a-spin :spinning="impUploadLoading">
-				<a-upload-dragger :show-upload-list="false" :custom-request="customRequestLocal" :accept="impAccept.map((item) => item.mimeType)">
+				<a-upload-dragger :show-upload-list="false" :custom-request="customRequestLocal" :accept="uploadAccept">
 					<p class="ant-upload-drag-icon">
 						<inbox-outlined></inbox-outlined>
 					</p>
@@ -37,8 +37,9 @@
 </template>
 
 <script setup name="userImpExp">
+	import { message } from 'ant-design-vue'
 	import userApi from '@/api/sys/userApi'
-	import downloadUtil from "@/utils/downloadUtil"
+	import downloadUtil from '@/utils/downloadUtil'
 
 	const impUploadLoading = ref(false)
 	const impAlertStatus = ref(false)
@@ -54,12 +55,18 @@
 			mimeType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
 		}
 	]
+	// 指定能选择的文件类型
+	const uploadAccept = String(
+		impAccept.map((item) => {
+			return item.mimeType
+		})
+	)
 	// 导入
 	const customRequestLocal = (data) => {
 		impUploadLoading.value = true
 		const fileData = new FormData()
 		// 校验上传文件扩展名和文件类型是否为.xls、.xlsx
-		const extension = '.'.concat(data.file.name.split(".").slice(-1).toString().toLowerCase())
+		const extension = '.'.concat(data.file.name.split('.').slice(-1).toString().toLowerCase())
 		const mimeType = data.file.type
 		// 提取允许的扩展名
 		const extensionArr = impAccept.map((item) => item.extension)