Răsfoiți Sursa

feat(upload): Electron 支持多文件夹上传,失败文件移出待上传列表

- Electron 主进程新增 selectDirectories(openDirectory + multiSelections)
- 上传页检测桌面端后一次选择多个文件夹,逐文件读取并串行上传,控制内存占用
- 浏览器环境保留单文件夹选择与连续追加
- 普通上传与电子数据上传:后端报错的文件从待上传列表移除,不再堆积
- 电子数据上传移除无用的整体汇总进度条
cc 2 săptămâni în urmă
părinte
comite
f28b8c8a62

+ 6 - 0
ai-electron/electron/controller/osCtl.js

@@ -79,6 +79,12 @@ class OsCtl {
   async selectDirectory(params, event) {
     return await os.selectDirectory(resolveSenderWindow(event));
   }
+  /**
+   * 选择多个目录(批量上传文件夹用,返回目录路径数组)
+   */
+  async selectDirectories(params, event) {
+    return await os.selectDirectories(resolveSenderWindow(event));
+  }
   /**
    * 分块读本机文件(离线地图瓦片用;params: { filePath, offset?, length })。
    *

+ 17 - 0
ai-electron/electron/service/os/os.js

@@ -56,6 +56,23 @@ class Os {
     return result.filePaths[0];
   }
 
+  /**
+   * 选择多个目录(批量上传文件夹用)。
+   *
+   * @returns {Promise<string[]>} 取消时返回空数组
+   */
+  async selectDirectories(win) {
+    const parent = this.resolveWindow(win);
+    const result = await dialog.showOpenDialog(parent, {
+      title: '选择文件夹(可多选)',
+      properties: ['openDirectory', 'multiSelections'],
+    });
+    if (result.canceled || !result.filePaths || result.filePaths.length === 0) {
+      return [];
+    }
+    return result.filePaths;
+  }
+
   /**
    * 按偏移分块读本机文件,返回 base64(离线地图瓦片这类大文件只按需取块)。
    *

+ 6 - 58
ai-electron/frontend/src/case/views/data/edsUpload.vue

@@ -86,13 +86,6 @@
                 </button>
               </div>
             </div>
-            <!-- 整体进度 -->
-            <div v-if="isUploading" class="upload-overall-progress">
-              <div class="upload-overall-progress__bar">
-                <div class="upload-overall-progress__fill" :style="{ width: overallProgress + '%' }"></div>
-              </div>
-              <span class="upload-overall-progress__text">总进度 {{ overallProgress }}%</span>
-            </div>
           </div>
           <div v-else class="upload-file-list upload-file-list--empty">
             <div class="upload-empty">暂无待上传文件,选择 zip 后将自动上传并开始解压</div>
@@ -171,7 +164,6 @@
   const uploadProgressMap = ref<Map<File, number>>(new Map());
   const uploadStatuses = ref<Map<File, 'pending' | 'uploading' | 'done' | 'error'>>(new Map());
   const isUploading = ref(false);
-  const overallProgress = ref(0);
   const dragOver = ref(false);
 
   const rows = ref<EdsMaterialProcessRow[]>([]);
@@ -340,7 +332,6 @@
     selectedFiles.value = [];
     uploadProgressMap.value = new Map();
     uploadStatuses.value = new Map();
-    overallProgress.value = 0;
   };
 
   const removeSelectedFile = (target: File) => {
@@ -399,15 +390,6 @@
 
         const onProgress = (percent: number) => {
           uploadProgressMap.value.set(file, percent);
-          const list = selectedFiles.value;
-          const total = list.length || 1;
-          const sum = list.reduce((acc, item) => {
-            const status = uploadStatuses.value.get(item);
-            if (status === 'uploading') return acc + (uploadProgressMap.value.get(item) || 0);
-            if (status === 'error') return acc + 100;
-            return acc;
-          }, 0);
-          overallProgress.value = Math.round(sum / total);
         };
 
         try {
@@ -427,12 +409,14 @@
           // 上传成功即刷新一次,新记录立刻出现在右侧(后台进度继续轮询)
           void refreshRows();
         } catch (error: any) {
-          uploadStatuses.value.set(file, 'error');
-          uploadProgressMap.value.set(file, 100);
+          // 后端已返回错误即视为本次上传处理结束:从待上传列表移除,避免失败包继续堆积
+          uploadProgressMap.value.delete(file);
+          uploadStatuses.value.delete(file);
+          const failedIndex = selectedFiles.value.indexOf(file);
+          if (failedIndex !== -1) selectedFiles.value.splice(failedIndex, 1);
           createMessage.error(`「${file.name}」上传失败:${error?.message || '未知错误'}`);
         }
       }
-      overallProgress.value = 100;
     } finally {
       isUploading.value = false;
     }
@@ -943,37 +927,6 @@
       }
     }
 
-    .upload-overall-progress {
-      flex-shrink: 0;
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      padding: 8px 12px;
-      border-top: 1px solid #e2e8f0;
-
-      &__bar {
-        flex: 1;
-        height: 5px;
-        border-radius: 3px;
-        background: #e2e8f0;
-        overflow: hidden;
-      }
-
-      &__fill {
-        height: 100%;
-        border-radius: 3px;
-        background: #2563eb;
-        transition: width 0.3s ease;
-      }
-
-      &__text {
-        font-size: 12px;
-        color: #475569;
-        font-weight: 500;
-        white-space: nowrap;
-      }
-    }
-
     @media (max-width: 1080px) {
       .upload-layout {
         flex-direction: column;
@@ -1047,8 +1000,7 @@
       }
 
       .panel-header,
-      .upload-file-list__header,
-      .upload-overall-progress {
+      .upload-file-list__header {
         border-color: #1f2937;
       }
 
@@ -1066,10 +1018,6 @@
         background: #0f172a;
       }
 
-      .upload-overall-progress__bar {
-        background: #1f2937;
-      }
-
       .eds-process-table {
         :deep(.ant-table-thead > tr > th) {
           background: #0f172a;

+ 141 - 14
ai-electron/frontend/src/case/views/data/upload.vue

@@ -22,12 +22,12 @@
             type="primary"
             class="next-btn"
             :loading="smartCleaning"
-            :disabled="!hasCleanableSheet"
+            :disabled="!hasCleanableSheet || desktopFolderReading"
             @click="handleSmartClean"
           >
             智能清洗
           </Button>
-          <Button class="next-btn" :disabled="!hasCleanableSheet" @click="handleManualClean">手动清洗</Button>
+          <Button class="next-btn" :disabled="!hasCleanableSheet || desktopFolderReading" @click="handleManualClean">手动清洗</Button>
         </div>
       </div>
 
@@ -38,7 +38,7 @@
               <button
                 type="button"
                 :class="['upload-mode-switch__item', { 'is-active': uploadMode === 'single' }]"
-                :disabled="isUploading"
+                :disabled="isUploading || desktopFolderReading"
                 @click="handleUploadModeChange('single')"
               >
                 选择文件
@@ -46,7 +46,7 @@
               <button
                 type="button"
                 :class="['upload-mode-switch__item', { 'is-active': uploadMode === 'folder' }]"
-                :disabled="isUploading"
+                :disabled="isUploading || desktopFolderReading"
                 @click="handleUploadModeChange('folder')"
               >
                 选择文件夹
@@ -88,10 +88,17 @@
                 {{
                   uploadMode === 'single'
                     ? `支持批量选择文件;${UPLOAD_FILE_SUMMARY}`
-                    : '支持选择整个文件夹,文件夹内文件全部上传;不支持的格式仅登记、不保存源文件'
+                    : desktopFolderPicker
+                      ? '支持一次选择多个文件夹;文件夹内文件全部上传;不支持的格式仅登记、不保存源文件'
+                      : '浏览器一次只能选择一个文件夹,可连续选择多次;也可一次拖入多个文件夹;不支持的格式仅登记、不保存源文件'
                 }}
               </div>
-              <Button type="primary" class="upload-action-btn" :disabled="isUploading" @click="handleTriggerFileSelect">
+              <Button
+                type="primary"
+                class="upload-action-btn"
+                :loading="uploadMode === 'folder' && desktopFolderReading"
+                @click="handleTriggerFileSelect"
+              >
                 {{ uploadMode === 'single' ? '选择文件' : '选择文件夹' }}
               </Button>
             </div>
@@ -101,7 +108,7 @@
           <div v-if="selectedFiles.length" class="upload-file-list">
             <div class="upload-file-list__header">
               <span>待上传 {{ selectedFiles.length }} 个文件</span>
-              <Button type="link" size="small" :disabled="isUploading" @click="clearSelectedFiles"> 清空 </Button>
+              <Button type="link" size="small" :disabled="isUploading || desktopFolderReading" @click="clearSelectedFiles"> 清空 </Button>
             </div>
             <div class="upload-file-list__body">
               <div
@@ -188,6 +195,7 @@
   import { useEmitter } from '@/core/store/modules/case';
   import { clearUploadBatch, deletedFileList, preFileUpload, smartClean } from '@/case/api/govern/governApi';
   import { FileStatusEnum } from '@/case/types/enum';
+  import { isDesktopDialogAvailable, pickDirectories } from '@/core/utils/desktop/pathPicker';
   import CaseFlowTopBar from './components/CaseFlowTopBar.vue';
   import { resetImportProgressSession } from './importProgressSession';
   import type { FileInfo } from '@/types/api';
@@ -395,8 +403,114 @@
     target.value = '';
   };
 
-  const handleTriggerFileSelect = () => {
+  /** 是否运行在 Electron:桌面端用系统对话框一次选多个文件夹 */
+  const desktopFolderPicker = isDesktopDialogAvailable();
+  const desktopFolderReading = ref(false);
+
+  const resolveDesktopNodeModules = (): { fs: any; path: any } | null => {
+    const nodeRequire = (window as unknown as { require?: (id: string) => any }).require;
+    if (typeof nodeRequire !== 'function') return null;
+    try {
+      return { fs: nodeRequire('fs'), path: nodeRequire('path') };
+    } catch {
+      return null;
+    }
+  };
+
+  /** 等单个文件上传结束(成功移除或失败保留),避免一次性把所有文件读进内存 */
+  const waitForUploadSettled = (file: File) =>
+    new Promise<void>((resolve) => {
+      const startedAt = Date.now();
+      const timer = setInterval(() => {
+        const settled =
+          !selectedFiles.value.includes(file) ||
+          uploadStatuses.value.get(file) === 'error' ||
+          Date.now() - startedAt > 10 * 60 * 1000;
+        if (settled) {
+          clearInterval(timer);
+          resolve();
+        }
+      }, 150);
+    });
+
+  /** 递归遍历目录;文件逐个读取、上传,控制内存占用 */
+  const walkDesktopDirectory = async (
+    fs: any,
+    path: any,
+    dir: string,
+    onFile: (fullPath: string, fileName: string) => Promise<void>,
+  ) => {
+    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        await walkDesktopDirectory(fs, path, fullPath, onFile);
+      } else if (entry.isFile()) {
+        await onFile(fullPath, String(entry.name));
+      }
+    }
+  };
+
+  const handleDesktopFolderSelect = async () => {
+    if (desktopFolderReading.value) return;
+    if (!batchIdReady.value) {
+      createMessage.warning('上传批次尚未就绪,请稍后重试');
+      return;
+    }
+    const dirs = await pickDirectories().catch((error) => {
+      console.error('打开多文件夹选择框失败', error);
+      createMessage.error('多文件夹选择不可用,请重启桌面客户端后重试');
+      return [] as string[];
+    });
+    if (!dirs.length) return;
+    const nodeModules = resolveDesktopNodeModules();
+    if (!nodeModules) {
+      createMessage.error('当前环境无法读取本机文件夹,请重新启动桌面客户端');
+      return;
+    }
+
+    desktopFolderReading.value = true;
+    let added = 0;
+    let failed = 0;
+    try {
+      for (const dir of dirs) {
+        try {
+          await walkDesktopDirectory(nodeModules.fs, nodeModules.path, dir, async (fullPath, fileName) => {
+            if (isAbandoned.value) return;
+            try {
+              const stat = await nodeModules.fs.promises.stat(fullPath);
+              const buffer = await nodeModules.fs.promises.readFile(fullPath);
+              const file = new File([buffer as unknown as BlobPart], fileName, { lastModified: stat.mtimeMs });
+              addFiles([file], false);
+              added += 1;
+              await waitForUploadSettled(file);
+            } catch (error) {
+              failed += 1;
+              console.error('读取本机文件失败', fullPath, error);
+            }
+          });
+        } catch (error) {
+          failed += 1;
+          console.error('读取本机文件夹失败', dir, error);
+        }
+      }
+    } finally {
+      desktopFolderReading.value = false;
+    }
+
+    if (!added) {
+      createMessage.warning('所选文件夹中没有可上传文件');
+    } else if (failed) {
+      createMessage.warning(`已加入 ${added} 个文件,${failed} 个文件读取失败`);
+    }
+  };
+
+  const handleTriggerFileSelect = async () => {
     if (uploadMode.value === 'folder') {
+      if (desktopFolderPicker) {
+        await handleDesktopFolderSelect();
+        return;
+      }
       folderInputRef.value?.click();
     } else {
       fileInputRef.value?.click();
@@ -404,7 +518,7 @@
   };
 
   const handleUploadModeChange = (mode: UploadMode) => {
-    if (uploadMode.value === mode || isUploading.value) return;
+    if (uploadMode.value === mode || isUploading.value || desktopFolderReading.value) return;
     uploadMode.value = mode;
     clearSelectedFiles();
   };
@@ -494,11 +608,12 @@
 
   /**
    * 自动上传队列:选择文件后自动触发,按序消费列表中的待上传文件;
-   * 上传解析成功即从列表移除,失败保留(标记错误,可手动移除)。
+   * 上传解析成功或后端返回错误都从列表移除,避免失败文件继续堆积。
    */
   const startUpload = async () => {
     if (isUploading.value || !batchIdReady.value) return;
     const currentBatchId = uploadBatchId.value;
+    let failedCount = 0;
     isUploading.value = true;
     isAbandoned.value = false;
     tableLoading.value = true;
@@ -549,10 +664,15 @@
           }
           onProgress(100);
         } catch (error: any) {
-          // 失败保留在列表,标记错误供用户查看/移除
-          uploadStatuses.value.set(file, 'error');
-          uploadProgressMap.value.set(file, 100);
+          // 后端已返回错误即视为本次上传处理结束:从待上传列表移除,避免失败文件继续堆积
+          uploadProgressMap.value.delete(file);
+          uploadStatuses.value.delete(file);
+          const failedIdx = selectedFiles.value.indexOf(file);
+          if (failedIdx !== -1) {
+            selectedFiles.value.splice(failedIdx, 1);
+          }
           createMessage.error(`「${file.name}」上传失败:${error?.message || '未知错误'}`);
+          failedCount += 1;
         }
       }
 
@@ -580,7 +700,7 @@
         );
       } else if (!isAbandoned.value && unreadableCount) {
         createMessage.warning(`${unreadableCount} 个文件未解析${unreadableHint},见右侧列表`);
-      } else if (!isAbandoned.value && !selectedFiles.value.length) {
+      } else if (!isAbandoned.value && !failedCount && !selectedFiles.value.length) {
         createMessage.warning('未识别到可处理文件,请检查文件格式是否正确');
       }
     } catch (error) {
@@ -588,6 +708,13 @@
     } finally {
       isUploading.value = false;
       tableLoading.value = false;
+      // 上传过程中允许继续选择文件夹:若队列刚好在追加前结束,这里把新加入的待上传文件接上
+      if (
+        !isAbandoned.value &&
+        selectedFiles.value.some((file) => (uploadStatuses.value.get(file) || 'pending') === 'pending')
+      ) {
+        void startUpload();
+      }
     }
   };
 

+ 7 - 0
ai-electron/frontend/src/core/utils/desktop/pathPicker.ts

@@ -10,6 +10,13 @@ export async function pickDirectory(): Promise<string> {
   return typeof result === 'string' ? result : '';
 }
 
+/** 弹出系统目录选择框(支持多选);取消或非桌面端返回空数组 */
+export async function pickDirectories(): Promise<string[]> {
+  if (!isDesktopDialogAvailable()) return [];
+  const result = await invokeIpc<string[]>('selectDirectories');
+  return Array.isArray(result) ? result.filter((item) => typeof item === 'string' && item.trim()) : [];
+}
+
 /** 主进程 getMapLocalPath / setMapLocalPath 的返回(见 electron/controller/osCtl.js) */
 type MapLocalResult = { success: true; data: { path: string } } | { success: false; message: string };