diff --git a/web/src/components/file-upload-modal/index.tsx b/web/src/components/file-upload-modal/index.tsx index 7577dcea2..8dba74846 100644 --- a/web/src/components/file-upload-modal/index.tsx +++ b/web/src/components/file-upload-modal/index.tsx @@ -28,7 +28,7 @@ const FileUpload = ({ directory: boolean; fileList: UploadFile[]; setFileList: Dispatch>; - uploadProgress: number; + uploadProgress?: number; }) => { const { t } = useTranslate('fileManager'); const props: UploadProps = { @@ -41,7 +41,6 @@ const FileUpload = ({ }, beforeUpload: (file: UploadFile) => { setFileList((pre) => { - console.log(file); return [...pre, file]; }); @@ -69,12 +68,11 @@ const FileUpload = ({ ); }; -interface IFileUploadModalProps extends Omit, 'onOk'> { - uploadFileList: UploadFile[]; - setUploadFileList: Dispatch>; - uploadProgress: number; - setUploadProgress: Dispatch>; - onOk?: (fileList: UploadFile[]) => Promise | boolean | void; +interface IFileUploadModalProps extends IModalProps { + uploadFileList?: UploadFile[]; + setUploadFileList?: Dispatch>; + uploadProgress?: number; + setUploadProgress?: Dispatch>; } const FileUploadModal = ({ @@ -82,21 +80,26 @@ const FileUploadModal = ({ hideModal, loading, onOk: onFileUploadOk, + uploadFileList: fileList, + setUploadFileList: setFileList, uploadProgress, setUploadProgress, }: IFileUploadModalProps) => { const { t } = useTranslate('fileManager'); const [value, setValue] = useState('local'); const [parseOnCreation, setParseOnCreation] = useState(false); - const [fileList, setFileList] = useState([]); + const [currentFileList, setCurrentFileList] = useState([]); + const [directoryFileList, setDirectoryFileList] = useState([]); const clearFileList = () => { - setFileList([]); - if (typeof setUploadProgress === 'function') { - setUploadProgress(0); + if (setFileList) { + setFileList([]); + setUploadProgress?.(0); + } else { + setCurrentFileList([]); } + setDirectoryFileList([]); }; - console.log(fileList); const onOk = async () => { if (uploadProgress === 100) { @@ -104,7 +107,9 @@ const FileUploadModal = ({ return; } - const ret = await onFileUploadOk?.(fileList); + const ret = await onFileUploadOk?.( + fileList ? parseOnCreation : [...currentFileList, ...directoryFileList], + ); return ret; }; @@ -119,8 +124,8 @@ const FileUploadModal = ({ children: ( ), @@ -131,8 +136,8 @@ const FileUploadModal = ({ children: ( ), diff --git a/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts b/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts index c0100b505..a7697dd7a 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts +++ b/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts @@ -238,7 +238,7 @@ export const useHandleUploadDocument = () => { return code; }, - [uploadDocument, hideDocumentUploadModal, fileList], + [fileList, uploadDocument, hideDocumentUploadModal, runDocumentByIds], ); return {