From e5f8bedb5cbc7b4a6a80406294f39414b62a46b1 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Tue, 13 May 2025 13:25:44 +0900 Subject: [PATCH] wip --- packages/frontend/src/components/MkUploadDialog.vue | 2 +- packages/frontend/src/utility/upload.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/MkUploadDialog.vue b/packages/frontend/src/components/MkUploadDialog.vue index 0ecf400427..e942a8300a 100644 --- a/packages/frontend/src/components/MkUploadDialog.vue +++ b/packages/frontend/src/components/MkUploadDialog.vue @@ -138,7 +138,7 @@ const dialog = useTemplateRef('dialog'); const firstUploadAttempted = ref(false); const isUploading = computed(() => items.value.some(item => item.uploading)); -const canRetry = computed(() => firstUploadAttempted.value && !isUploading.value && items.value.some(item => item.uploaded == null)); +const canRetry = computed(() => firstUploadAttempted.value && !items.value.some(item => item.uploading || item.waiting) && items.value.some(item => item.uploaded == null)); const compressionLevel = ref<0 | 1 | 2 | 3>(2); const compressionSettings = computed(() => { diff --git a/packages/frontend/src/utility/upload.ts b/packages/frontend/src/utility/upload.ts index 548f879226..22735db844 100644 --- a/packages/frontend/src/utility/upload.ts +++ b/packages/frontend/src/utility/upload.ts @@ -10,7 +10,7 @@ import { instance } from '@/instance.js'; import { i18n } from '@/i18n.js'; import * as os from '@/os.js'; -export function uploadFile(file: File, options: { +export function uploadFile(file: File | Blob, options: { name?: string; folderId?: string | null; onProgress?: (ctx: { total: number; loaded: number; }) => void; @@ -89,7 +89,7 @@ export function uploadFile(file: File, options: { formData.append('i', $i.token); formData.append('force', 'true'); formData.append('file', file); - formData.append('name', options.name ?? file.name); + formData.append('name', options.name ?? file.name ?? 'untitled'); if (options.folderId) formData.append('folderId', options.folderId); xhr.send(formData);