fix: 解决文件拖拽上传空文件夹失败的问题 (#2806)

frontend/src/lang/modules/en.ts

@@ -988,6 +988,8 @@ const message = {
         addFavorite: 'Add to favorites',
         clearList: 'Clear list',
         deleteRecycleHelper: 'Are you sure you want to permanently delete the following files?',
+        typeErrOrEmpty: '[{0}] file type is wrong or empty folder',
+        dropHelper: 'Drag [{0}] here, or',
     },
     ssh: {
         autoStart: 'Auto Start',

frontend/src/lang/modules/tw.ts

@@ -949,6 +949,8 @@ const message = {
         addFavorite: '加入收藏夾',
         clearList: '清空列表',
         deleteRecycleHelper: '確定永久刪除以下文件？',
+        typeErrOrEmpty: '【{0}】 檔案類型錯誤或為空資料夾',
+        dropHelper: '將【{0}】拖曳到此處，或',
     },
     ssh: {
         autoStart: '開機自啟',

frontend/src/lang/modules/zh.ts

@@ -950,6 +950,8 @@ const message = {
         addFavorite: '加入收藏夹子',
         clearList: '清空列表',
         deleteRecycleHelper: '确定永久删除以下文件？',
+        typeErrOrEmpty: '【{0}】 文件类型错误或为空文件夹',
+        dropHelper: '将【{0}】拖拽到此处，或者',
     },
     ssh: {
         autoStart: '开机自启',

frontend/src/views/host/file-management/upload/index.vue

@@ -10,22 +10,12 @@
             <DrawerHeader :header="$t('file.upload')" :back="handleClose" />
         </template>
         <div class="button-container">
-            <el-dropdown @command="upload">
+            <div>
-                <el-button type="primary">
+                <el-button type="primary" @click="upload('file')">
-                    {{ $t('file.upload') }}
+                    {{ $t('file.upload') }}{{ $t('file.file') }}
-                    <el-icon><arrow-down /></el-icon>
                 </el-button>
-                <template #dropdown>
+                <el-button type="primary" @click="upload('dir')">{{ $t('file.upload') }}{{ $t('file.dir') }}</el-button>
-                    <el-dropdown-menu>
+            </div>
-                        <el-dropdown-item command="file">
-                            {{ $t('file.file') }}
-                        </el-dropdown-item>
-                        <el-dropdown-item command="dir">
-                            {{ $t('file.dir') }}
-                        </el-dropdown-item>
-                    </el-dropdown-menu>
-                </template>
-            </el-dropdown>
             <el-button @click="clearFiles">{{ $t('file.clearList') }}</el-button>
         </div>
 
@@ -43,7 +33,7 @@
         >
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
-                {{ $t('database.dropHelper') }}
+                {{ $t('file.dropHelper', [$t('file.' + uploadType)]) }}
                 <em>{{ $t('database.clickHelper') }}</em>
             </div>
             <template #tip>
@@ -93,7 +83,7 @@ import { UploadFile, UploadFiles, UploadInstance, UploadProps, UploadRawFile } f
 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 { MsgError, MsgSuccess } from '@/utils/message';
 import { Close } from '@element-plus/icons-vue';
 
 interface UploadFileProps {
@@ -119,8 +109,10 @@ const state = reactive({
 const uploaderFiles = ref<UploadFiles>([]);
 const isUploadFolder = ref(false);
 const hoverIndex = ref(null);
+const uploadType = ref('file');
 
 const upload = (commnad: string) => {
+    uploadType.value = commnad;
     if (commnad == 'dir') {
         state.uploadEle.webkitdirectory = true;
     } else {
@@ -135,7 +127,15 @@ const removeFile = (index: number) => {
 };
 
 const fileOnChange = (_uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(_uploadFile.raw);
+    reader.onload = async () => {
         uploaderFiles.value = uploadFiles;
+    };
+    reader.onerror = () => {
+        uploaderFiles.value = uploaderFiles.value.filter((file) => file.uid !== _uploadFile.uid);
+        MsgError(i18n.global.t('file.typeErrOrEmpty', [_uploadFile.name]));
+    };
 };
 
 const clearFiles = () => {
@@ -160,17 +160,18 @@ const submit = async () => {
     const files = uploaderFiles.value.slice();
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
-        const CHUNK_SIZE = 1024 * 1024; // 1MB
         const fileSize = file.size;
 
         uploadHelper.value = i18n.global.t('file.fileUploadStart', [file.name]);
-        if (fileSize == 0) {
+        if (fileSize <= 1024 * 1024 * 50) {
             const formData = new FormData();
             formData.append('file', file.raw);
             formData.append('path', path.value);
             await UploadFileData(formData, {});
-        }
+            success++;
-
+            uploaderFiles.value[i].status = 'success';
+        } else {
+            const CHUNK_SIZE = 1024 * 1024 * 20; // 10MB
             const chunkCount = Math.ceil(fileSize / CHUNK_SIZE);
             let uploadedChunkCount = 0;
             for (let c = 0; c < chunkCount; c++) {
@@ -210,6 +211,8 @@ const submit = async () => {
                     break;
                 }
             }
+        }
+
         if (i == files.length - 1) {
             loading.value = false;
             uploadHelper.value = '';