zotan/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Pull requests Activity

client: refactor drive drag&drop

Browse source
This commit is contained in:
Johann150 2022-12-22 17:06:52 +01:00
parent 7b39483966
commit 240cf98920
Signed by untrusted user: Johann150
GPG key ID: 9EE6577A2A06F8F1
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/client/src/components/drive.vue
View file

@ -210,9 +210,8 @@ function onStreamDriveFolderDeleted(folderId: string) {
function onDragover(ev: DragEvent): any { function onDragover(ev: DragEvent): any {
if (!ev.dataTransfer) return; if (!ev.dataTransfer) return;
// ドラッグ元が自分自身の所有するアイテムだったら
if (isDragSource) { if (isDragSource) {
// 自分自身にはドロップさせない // We are the drag source, do not allow to drop.
ev.dataTransfer.dropEffect = 'none'; ev.dataTransfer.dropEffect = 'none';
return; return;
} }
@ -257,17 +256,16 @@ function onDrop(ev: DragEvent): any {
if (!ev.dataTransfer) return; if (!ev.dataTransfer) return;
// ドロップされてきたものがファイルだったら const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
const driveFolder = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
if (ev.dataTransfer.files.length > 0) { if (ev.dataTransfer.files.length > 0) {
// dropping operating system files
for (const file of Array.from(ev.dataTransfer.files)) { for (const file of Array.from(ev.dataTransfer.files)) {
upload(file, folder); upload(file, folder);
} }
return; } else if (driveFile != null && driveFile !== '') {
} // dropping drive files
//#region ドライブのファイル
const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
if (driveFile != null && driveFile !== '') {
const file = JSON.parse(driveFile); const file = JSON.parse(driveFile);
// cannot move file within parent folder // cannot move file within parent folder
@ -278,18 +276,14 @@ function onDrop(ev: DragEvent): any {
fileId: file.id, fileId: file.id,
folderId: folder?.id ?? null, folderId: folder?.id ?? null,
}); });
} } else if (driveFolder != null && driveFolder !== '') {
//#endregion // dropping drive folders
//#region ドライブのフォルダ
const driveFolder = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
if (driveFolder != null && driveFolder !== '') {
const droppedFolder = JSON.parse(driveFolder); const droppedFolder = JSON.parse(driveFolder);
// cannot move folder into itself // cannot move folder into itself
if (droppedFolder.id === folder?.id) return false; if (droppedFolder.id === folder?.id) return false;
// cannot move folder within parent folder // cannot move folder within parent folder
if (foldersPaginationElem.items.some(f => f.id === droppedFolder.id)) return false; if (folder.id === droppedFolder.parentId) return false;
removeFolder(droppedFolder.id); removeFolder(droppedFolder.id);
os.api('drive/folders/update', { os.api('drive/folders/update', {
@ -311,7 +305,6 @@ function onDrop(ev: DragEvent): any {
} }
}); });
} }
//#endregion
} }
function selectLocalFile() { function selectLocalFile() {