15308555518/ frontend
1
0
Fork 0
mirror of https://github.com/cloudreve/frontend.git synced 2025-12-25 19:52:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(uploader): drag and drop might upload duplicated files into root folder (cloudreve/cloudreve#2759)

This commit is contained in:
Aaron Liu 2025-08-29 10:15:37 +08:00
parent 3802850692
commit 7fdd0efd0b
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/component/Uploader/Uploader.tsx
View File

@ -232,6 +232,12 @@ const Uploader = () => {
);
}, 2000);
}
return () => {
if (uploadManager) {
uploadManager.destroy();
}
};
}, []);
useEffect(() => {

48
src/component/Uploader/core/index.ts
View File

@ -53,6 +53,7 @@ export default class UploadManager {
private id = ++UploadManager.id;
// used for proactive upload (drop, paste)
private currentPath?: string;
private options: Option;
constructor(private o: Option) {
this.logger = new Logger(o.logLevel, "MANAGER");
@ -62,33 +63,26 @@ export default class UploadManager {
this.fileInput = getFileInput(this.id, false);
this.directoryInput = getFileInput(this.id, true);
this.overwrite = o.overwrite;
this.options = o;
if (o.dropZone) {
this.logger.info(`Drag and drop container set to:`, o.dropZone);
o.dropZone.addEventListener("dragenter", (e) => {
if (isFileDrop(e) && this.currentPath) {
e.preventDefault();
if (o.onDropOver) {
o.onDropOver(e);
}
}
});
o.dropZone.addEventListener("dragleave", (e) => {
if (isFileDrop(e) && this.currentPath) {
e.preventDefault();
if (o.onDropLeave) {
o.onDropLeave(e);
}
}
});
o.dropZone.addEventListener("dragenter", this.dragEnter);
o.dropZone.addEventListener("dragleave", this.dragLeave);
o.dropZone.addEventListener("drop", this.onFileDroppedIn);
}
window.addEventListener("beforeunload", this.beforeLeave);
}
destroy() {
if (this.options.dropZone) {
this.options.dropZone.removeEventListener("dragenter", this.dragEnter);
this.options.dropZone.removeEventListener("dragleave", this.dragLeave);
this.options.dropZone.removeEventListener("drop", this.onFileDroppedIn);
}
}
beforeLeave = (e: BeforeUnloadEvent) => {
if (this.pool.processing.length == 0) {
return;
@ -217,6 +211,24 @@ export default class UploadManager {
this.o.onProactiveFileAdded && this.o.onProactiveFileAdded(uploaders);
};
private dragEnter = (e: DragEvent) => {
if (isFileDrop(e) && this.currentPath) {
e.preventDefault();
if (this.options.onDropOver) {
this.options.onDropOver(e);
}
}
};
private dragLeave = (e: DragEvent) => {
if (isFileDrop(e) && this.currentPath) {
e.preventDefault();
if (this.options.onDropLeave) {
this.options.onDropLeave(e);
}
}
};
private addFiles = (
ev: Event | File[],
dst: string,