From 86b4ae37bc9375ed03587b170561e93b380c0d27 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 4 Jun 2025 09:15:13 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=80=E3=83=BC=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=81=AE=E6=A9=9F=E8=83=BD=E8=A8=AD=E5=AE=9A=E3=81=A7?=
 =?UTF-8?q?=E3=82=A6=E3=82=A9=E3=83=BC=E3=82=BF=E3=83=BC=E3=83=9E=E3=83=BC?=
 =?UTF-8?q?=E3=82=AF=E3=81=8C=E7=84=A1=E5=8A=B9=E3=81=AA=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=A7=E3=82=82=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E3=83=97=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E3=81=8C?=
 =?UTF-8?q?=E9=81=A9=E7=94=A8=E3=81=95=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=86=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/MkUploaderDialog.vue     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkUploaderDialog.vue b/packages/frontend/src/components/MkUploaderDialog.vue
index 1c97f2a529..3b5b012593 100644
--- a/packages/frontend/src/components/MkUploaderDialog.vue
+++ b/packages/frontend/src/components/MkUploaderDialog.vue
@@ -157,7 +157,7 @@ const emit = defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-const items = ref<{
+type UploaderItem = {
 	id: string;
 	name: string;
 	uploadName?: string;
@@ -174,7 +174,9 @@ const items = ref<{
 	file: File;
 	watermarkPresetId: string | null;
 	abort?: (() => void) | null;
-}[]>([]);
+};
+
+const items = ref<UploaderItem[]>([]);
 
 const dialog = useTemplateRef('dialog');
 
@@ -268,7 +270,7 @@ async function done() {
 	dialog.value?.close();
 }
 
-function showMenu(ev: MouseEvent, item: typeof items.value[0]) {
+function showMenu(ev: MouseEvent, item: UploaderItem) {
 	const menu: MenuItem[] = [];
 
 	menu.push({
@@ -624,9 +626,9 @@ function initializeFile(file: File) {
 		uploaded: null,
 		uploadFailed: false,
 		compressionLevel: prefer.s.defaultImageCompressionLevel,
-		watermarkPresetId: prefer.s.defaultWatermarkPresetId,
+		watermarkPresetId: uploaderFeatures.value.watermark ? prefer.s.defaultWatermarkPresetId : null,
 		file: markRaw(file),
-	};
+	} satisfies UploaderItem;
 	items.value.push(item);
 	preprocess(item).then(() => {
 		triggerRef(items);