From ae4645e01b73ea5c3fcd95bcb8efd52cc0086e1e Mon Sep 17 00:00:00 2001
From: chanx <1243304602@qq.com>
Date: Fri, 6 Mar 2026 20:17:29 +0800
Subject: [PATCH] Fix: Add folder upload  #9743 (#13448)

### What problem does this PR solve?

Fix: Add folder upload  #9743

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 .../components/file-upload-dialog/index.tsx   |  12 +-
 web/src/components/file-uploader.tsx          | 206 ++++++++++++------
 web/src/locales/en.ts                         |   2 +
 web/src/locales/zh.ts                         |   2 +
 4 files changed, 155 insertions(+), 67 deletions(-)

diff --git a/web/src/components/file-upload-dialog/index.tsx b/web/src/components/file-upload-dialog/index.tsx
index ba90d3fa4..d7239e2e8 100644
--- a/web/src/components/file-upload-dialog/index.tsx
+++ b/web/src/components/file-upload-dialog/index.tsx
@@ -20,8 +20,16 @@ import { Switch } from '../ui/switch';
 function buildUploadFormSchema(t: TFunction) {
   const FormSchema = z.object({
     parseOnCreation: z.boolean().optional(),
+    // Update schema to allow files with path property to handle folder uploads
     fileList: z
-      .array(z.instanceof(File))
+      .array(
+        z.instanceof(File).or(
+          z.object({
+            file: z.instanceof(File),
+            path: z.string(), // Store the relative path for files in folders
+          }),
+        ),
+      )
       .min(1, { message: t('fileManager.pleaseUploadAtLeastOneFile') }),
   });
 
@@ -72,7 +80,7 @@ function UploadForm({ submit, showParseOnCreation }: UploadFormProps) {
             )}
           </RAGFlowFormItem>
         )}
-        <RAGFlowFormItem name="fileList" label={t('fileManager.file')}>
+        <RAGFlowFormItem name="fileList" label={''}>
           {(field) => (
             <FileUploader
               value={field.value}
diff --git a/web/src/components/file-uploader.tsx b/web/src/components/file-uploader.tsx
index 41563b4bf..56163df10 100644
--- a/web/src/components/file-uploader.tsx
+++ b/web/src/components/file-uploader.tsx
@@ -2,7 +2,7 @@
 
 'use client';
 
-import { FileText, Upload, X } from 'lucide-react';
+import { FileText, FolderUp, Upload, X } from 'lucide-react';
 import * as React from 'react';
 import Dropzone, {
   type DropzoneProps,
@@ -12,6 +12,7 @@ import { toast } from 'sonner';
 
 import { Button } from '@/components/ui/button';
 import { Progress } from '@/components/ui/progress';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { useControllableState } from '@/hooks/use-controllable-state';
 import { cn, formatBytes } from '@/lib/utils';
 import { useTranslation } from 'react-i18next';
@@ -202,9 +203,11 @@ export function FileUploader(props: FileUploaderProps) {
     onChange: onValueChange,
   });
 
+  const folderInputRef = React.useRef<HTMLInputElement>(null);
+
   const reachesMaxFileCount = (files?.length ?? 0) >= maxFileCount;
 
-  const onDrop = React.useCallback(
+  const processFiles = React.useCallback(
     (acceptedFiles: File[], rejectedFiles: FileRejection[]) => {
       if (!multiple && maxFileCount === 1 && acceptedFiles.length > 1) {
         toast.error('Cannot upload more than 1 file at a time');
@@ -216,11 +219,16 @@ export function FileUploader(props: FileUploaderProps) {
         return;
       }
 
-      const newFiles = acceptedFiles.map((file) =>
-        Object.assign(file, {
-          preview: URL.createObjectURL(file),
-        }),
-      );
+      const newFiles = acceptedFiles.map((file) => {
+        const enhancedFile = file as File & { preview?: string };
+        Object.defineProperty(enhancedFile, 'preview', {
+          value: URL.createObjectURL(file),
+          writable: true,
+          enumerable: true,
+          configurable: true,
+        });
+        return enhancedFile;
+      });
 
       const updatedFiles = files ? [...files, ...newFiles] : newFiles;
 
@@ -250,10 +258,26 @@ export function FileUploader(props: FileUploaderProps) {
         });
       }
     },
-
     [files, maxFileCount, multiple, onUpload, setFiles],
   );
 
+  const onDrop = React.useCallback(
+    (acceptedFiles: File[], rejectedFiles: FileRejection[]) => {
+      processFiles(acceptedFiles, rejectedFiles);
+    },
+    [processFiles],
+  );
+
+  const handleFolderSelect = React.useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      if (!e.target.files) return;
+      const fileList = Array.from(e.target.files);
+      processFiles(fileList, []);
+      e.target.value = '';
+    },
+    [processFiles],
+  );
+
   function onRemove(index: number) {
     if (!files) return;
     const newFiles = files.filter((_, i) => i !== index);
@@ -276,68 +300,120 @@ export function FileUploader(props: FileUploaderProps) {
 
   const isDisabled = disabled || (files?.length ?? 0) >= maxFileCount;
 
-  return (
-    <div className="relative flex flex-col gap-6 overflow-hidden">
-      {!(hideDropzoneOnMaxFileCount && reachesMaxFileCount) && (
-        <Dropzone
-          onDrop={onDrop}
-          accept={accept}
-          maxSize={maxSize}
-          maxFiles={maxFileCount}
-          multiple={maxFileCount > 1 || multiple}
-          disabled={isDisabled}
+  const renderDropzone = (isFolderMode: boolean = false) => (
+    <Dropzone
+      onDrop={onDrop}
+      accept={isFolderMode ? undefined : accept}
+      maxSize={maxSize}
+      maxFiles={maxFileCount}
+      multiple={maxFileCount > 1 || multiple}
+      disabled={isDisabled}
+      noClick={isFolderMode}
+      noDrag={isFolderMode}
+    >
+      {({ getRootProps, getInputProps, isDragActive }) => (
+        <div
+          {...getRootProps()}
+          className={cn(
+            'group relative grid h-72 w-full cursor-pointer place-items-center rounded-lg border border-dashed border-border-default px-5 py-2.5 text-center transition hover:bg-border-button bg-bg-card',
+            'ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
+            isDragActive && 'border-border-button',
+            isDisabled && 'pointer-events-none opacity-60',
+            className,
+          )}
+          {...dropzoneProps}
         >
-          {({ getRootProps, getInputProps, isDragActive }) => (
+          {!isFolderMode && <input {...getInputProps()} />}
+          {isDragActive && !isFolderMode ? (
+            <div className="flex flex-col items-center justify-center gap-4 sm:px-5">
+              <div className="rounded-full border border-dashed p-3">
+                <Upload
+                  className="size-7 text-text-secondary transition-colors group-hover:text-text-primary"
+                  aria-hidden="true"
+                />
+              </div>
+              <p className="font-medium text-text-secondary">
+                {t('fileManager.dropFilesHere', 'Drop the files here')}
+              </p>
+            </div>
+          ) : (
             <div
-              {...getRootProps()}
-              className={cn(
-                'group relative grid h-72 w-full cursor-pointer place-items-center rounded-lg border border-dashed border-border-default px-5 py-2.5 text-center transition hover:bg-border-button bg-bg-card',
-                'ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
-                isDragActive && 'border-border-button',
-                isDisabled && 'pointer-events-none opacity-60',
-                className,
-              )}
-              {...dropzoneProps}
+              className="flex flex-col items-center justify-center gap-4 sm:px-5"
+              onClick={() => {
+                if (isFolderMode && !isDisabled) {
+                  folderInputRef.current?.click();
+                }
+              }}
             >
-              <input {...getInputProps()} />
-              {isDragActive ? (
-                <div className="flex flex-col items-center justify-center gap-4 sm:px-5">
-                  <div className="rounded-full border border-dashed p-3">
-                    <Upload
-                      className="size-7 text-text-secondary transition-colors group-hover:text-text-primary"
-                      aria-hidden="true"
-                    />
-                  </div>
-                  <p className="font-medium text-text-secondary">
-                    Drop the files here
-                  </p>
-                </div>
-              ) : (
-                <div className="flex flex-col items-center justify-center gap-4 sm:px-5">
-                  <div className="rounded-full border border-dashed p-3">
-                    <Upload
-                      className="size-7 text-text-secondary transition-colors group-hover:text-text-primary"
-                      aria-hidden="true"
-                    />
-                  </div>
-                  <div className="flex flex-col gap-px">
-                    <p className="font-medium text-text-secondary ">
-                      {title || t('knowledgeDetails.uploadTitle')}
-                    </p>
-                    <p className="text-sm text-text-disabled">
-                      {description || t('knowledgeDetails.uploadDescription')}
-                      {/* You can upload
-                      {maxFileCount > 1
-                        ? ` ${maxFileCount === Infinity ? 'multiple' : maxFileCount}
-                        files (up to ${formatBytes(maxSize)} each)`
-                        : ` a file with ${formatBytes(maxSize)}`} */}
-                    </p>
-                  </div>
-                </div>
-              )}
+              <div className="rounded-full border border-dashed p-3">
+                {isFolderMode ? (
+                  <FolderUp
+                    className="size-7 text-text-secondary transition-colors group-hover:text-text-primary"
+                    aria-hidden="true"
+                  />
+                ) : (
+                  <Upload
+                    className="size-7 text-text-secondary transition-colors group-hover:text-text-primary"
+                    aria-hidden="true"
+                  />
+                )}
+              </div>
+              <div className="flex flex-col gap-px">
+                <p className="font-medium text-text-secondary ">
+                  {title ||
+                    (isFolderMode
+                      ? t('fileManager.uploadFolderTitle', 'Upload Folder')
+                      : t('knowledgeDetails.uploadTitle'))}
+                </p>
+                <p className="text-sm text-text-disabled">
+                  {description ||
+                    (isFolderMode
+                      ? t(
+                          'knowledgeDetails.uploadDescription',
+                          'Select a folder to upload all files inside',
+                        )
+                      : t('knowledgeDetails.uploadDescription'))}
+                </p>
+              </div>
             </div>
           )}
-        </Dropzone>
+        </div>
+      )}
+    </Dropzone>
+  );
+
+  return (
+    <div className="relative flex flex-col gap-4 overflow-hidden">
+      {!(hideDropzoneOnMaxFileCount && reachesMaxFileCount) && (
+        <Tabs defaultValue="file" className="w-full">
+          <TabsList className="w-full justify-start">
+            <TabsTrigger value="file" className="gap-2">
+              <FileText className="size-4" />
+              {t('fileManager.files', 'Files')}
+            </TabsTrigger>
+            <TabsTrigger value="folder" className="gap-2">
+              <FolderUp className="size-4" />
+              {t('fileManager.folder', 'Folder')}
+            </TabsTrigger>
+          </TabsList>
+          <TabsContent value="file" className="mt-1">
+            {renderDropzone(false)}
+          </TabsContent>
+          <TabsContent value="folder" className="mt-1">
+            {renderDropzone(true)}
+            <input
+              ref={folderInputRef}
+              type="file"
+              className="hidden"
+              multiple
+              onChange={handleFolderSelect}
+              {...{
+                webkitdirectory: '',
+                directory: '',
+              }}
+            />
+          </TabsContent>
+        </Tabs>
       )}
 
       {files?.length ? (
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 0977e4edd..a071391f1 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -1446,6 +1446,8 @@ Example: Virtual Hosted Style`,
       hint: 'hint',
     },
     fileManager: {
+      uploadFolderTitle: 'Upload folder',
+      folder: 'Folder',
       files: 'Files',
       name: 'Name',
       uploadDate: 'Upload date',
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index 8326a673d..8a278177f 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -1200,6 +1200,8 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于
       hint: '提示',
     },
     fileManager: {
+      uploadFolderTitle: '上传文件夹',
+      folder: '文件夹',
       files: '文件',
       name: '名称',
       uploadDate: '上传日期',