From 5944f67823c581f47528791279dc0ad36ea20e55 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Fri, 4 Aug 2023 17:44:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=AF=E4=BB=A5=E6=8B=96=E5=85=A5=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E7=9A=84=E9=97=AE=E9=A2=98=20(#1840)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/1833
---
 frontend/src/components/upload/index.vue           |  6 ++++--
 frontend/src/lang/modules/en.ts                    |  1 +
 frontend/src/lang/modules/tw.ts                    |  1 +
 frontend/src/lang/modules/zh.ts                    |  1 +
 frontend/src/utils/util.ts                         | 14 ++++++++++++++
 .../views/host/file-management/upload/index.vue    |  5 ++++-
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/upload/index.vue b/frontend/src/components/upload/index.vue
index 94267da5d..88f98e6b1 100644
--- a/frontend/src/components/upload/index.vue
+++ b/frontend/src/components/upload/index.vue
@@ -80,7 +80,7 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
-import { computeSize } from '@/utils/util';
+import { checkFileType, computeSize } from '@/utils/util';
 import { useDeleteData } from '@/hooks/use-delete-data';
 import { handleRecoverByUpload } from '@/api/modules/setting';
 import i18n from '@/lang';
@@ -184,7 +184,9 @@ const beforeAvatarUpload = (rawFile) => {
 };
 
 const fileOnChange = (_uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-    uploaderFiles.value = uploadFiles;
+    if (checkFileType(_uploadFile, uploadFiles)) {
+        uploaderFiles.value = uploadFiles;
+    }
 };
 
 const handleClose = () => {
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index fb41b4dd8..def786360 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -895,6 +895,7 @@ const message = {
         uploadFailed: '[{0}] File Upload file',
         fileUploadStart: 'Uploading [{0}]....',
         currentSelect: 'Current Select: ',
+        unsupportType: 'Unsupported file type',
     },
     ssh: {
         sshAlert:
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index a68d5610a..ecef0654a 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -865,6 +865,7 @@ const message = {
         uploadFailed: '【{0}】 文件上傳失敗',
         fileUploadStart: '正在上傳【{0}】....',
         currentSelect: '當前選中: ',
+        unsupportType: '不支持的文件類型',
     },
     ssh: {
         sshAlert: '列表數據根據登錄時間排序，但請註意，切換時區或其他操作可能導致登錄日誌的時間出現偏差。',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 81108e29d..1d68eff61 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -865,6 +865,7 @@ const message = {
         uploadFailed: '【{0}】 文件上传失败',
         fileUploadStart: '正在上传【{0}】....',
         currentSelect: '当前选中: ',
+        unsupportType: '不支持的文件类型',
     },
     ssh: {
         sshAlert: '列表数据根据登录时间排序，但请注意，切换时区或其他操作可能导致登录日志的时间出现偏差。',
diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts
index 6db703eb0..18b5c14b0 100644
--- a/frontend/src/utils/util.ts
+++ b/frontend/src/utils/util.ts
@@ -1,4 +1,6 @@
 import i18n from '@/lang';
+import { UploadFile, UploadFiles } from 'element-plus';
+import { MsgWarning } from './message';
 
 export function deepCopy<T>(obj: any): T {
     let newObj: any;
@@ -305,3 +307,15 @@ export function downloadWithContent(content: string, fileName: string) {
     const event = new MouseEvent('click');
     a.dispatchEvent(event);
 }
+
+export function checkFileType(_uploadFile: UploadFile, uploadFiles: UploadFiles): boolean {
+    if (_uploadFile.raw?.type == '') {
+        const index = uploadFiles.findIndex((file) => file.name === _uploadFile.name && file.raw?.type === '');
+        if (index !== -1) {
+            uploadFiles.splice(index, 1);
+        }
+        MsgWarning(i18n.global.t('file.unsupportType'));
+        return false;
+    }
+    return true;
+}
diff --git a/frontend/src/views/host/file-management/upload/index.vue b/frontend/src/views/host/file-management/upload/index.vue
index f2101192e..c46af8048 100644
--- a/frontend/src/views/host/file-management/upload/index.vue
+++ b/frontend/src/views/host/file-management/upload/index.vue
@@ -48,6 +48,7 @@ import { ChunkUploadFileData, UploadFileData } from '@/api/modules/files';
 import i18n from '@/lang';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { MsgSuccess } from '@/utils/message';
+import { checkFileType } from '@/utils/util';
 
 interface UploadFileProps {
     path: string;
@@ -70,7 +71,9 @@ const handleClose = () => {
 const uploaderFiles = ref<UploadFiles>([]);
 
 const fileOnChange = (_uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-    uploaderFiles.value = uploadFiles;
+    if (checkFileType(_uploadFile, uploadFiles)) {
+        uploaderFiles.value = uploadFiles;
+    }
 };
 
 const handleExceed: UploadProps['onExceed'] = (files) => {