From 08c547852071b2cdc5defa862ee9961d55a48e1a Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Sat, 27 Dec 2025 09:54:14 +0900 Subject: [PATCH 1/3] Update config.ts --- src/pkg/config/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pkg/config/config.ts b/src/pkg/config/config.ts index ee8f2b878..cd58b0f9a 100644 --- a/src/pkg/config/config.ts +++ b/src/pkg/config/config.ts @@ -236,7 +236,7 @@ export class SystemConfig { defaultCloudSync(): CloudSyncConfig { return { enable: false, - syncDelete: true, + syncDelete: false, syncStatus: true, filesystem: "webdav", params: {}, From 3abf2c8874ddc55a79640c40304ddcf84d1d9c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Wed, 7 Jan 2026 10:32:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/de-DE/translation.json | 1 + src/locales/en-US/translation.json | 1 + src/locales/ja-JP/translation.json | 1 + src/locales/ru-RU/translation.json | 1 + src/locales/vi-VN/translation.json | 1 + src/locales/zh-CN/translation.json | 1 + src/locales/zh-TW/translation.json | 1 + src/pages/options/routes/Setting.tsx | 21 ++++++++++++--------- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/locales/de-DE/translation.json b/src/locales/de-DE/translation.json index 8a3730f6a..db7e5a10c 100644 --- a/src/locales/de-DE/translation.json +++ b/src/locales/de-DE/translation.json @@ -29,6 +29,7 @@ "help_translate": "Bei der Übersetzung helfen", "script_sync": "Skript-Synchronisation", "sync_delete": "Synchronisiertes Löschen", + "sync_delete_desc": "Wenn aktiviert, wird das Skript beim Löschen als gelöscht markiert und andere Geräte erkennen diesen Status und löschen das Skript ebenfalls. Wenn deaktiviert, wird das Skript direkt aus dem lokalen und Cloud-Speicher gelöscht, was zu wiederholten Synchronisierungsproblemen führen kann, wenn mehrere Geräte verwendet werden.", "enable_script_sync_to": "Skript-Synchronisation aktivieren zu", "save": "Speichern", "save_as": "Speichern unter", diff --git a/src/locales/en-US/translation.json b/src/locales/en-US/translation.json index 21a31e130..10c859197 100644 --- a/src/locales/en-US/translation.json +++ b/src/locales/en-US/translation.json @@ -29,6 +29,7 @@ "help_translate": "Help us translate", "script_sync": "Script Sync", "sync_delete": "Sync Delete", + "sync_delete_desc": "When enabled, scripts will be marked as deleted when removed, and other devices will detect this status and delete the script accordingly. When disabled, scripts will be deleted directly from both local and cloud storage, which may cause repeated sync issues if multiple devices are in use.", "enable_script_sync_to": "Enable Script Sync to", "save": "Save", "save_as": "Save as", diff --git a/src/locales/ja-JP/translation.json b/src/locales/ja-JP/translation.json index 117c7dd3e..cc46a712c 100644 --- a/src/locales/ja-JP/translation.json +++ b/src/locales/ja-JP/translation.json @@ -29,6 +29,7 @@ "help_translate": "翻訳に協力", "script_sync": "スクリプト同期", "sync_delete": "同期削除", + "sync_delete_desc": "有効にすると、スクリプト削除時に削除マークが付けられ、他のデバイスがその状態を検出してスクリプトを削除します。無効にすると、ローカルとクラウドのスクリプトが直接削除されるため、複数のデバイスを使用している場合、スクリプトが繰り返し同期される可能性があります。", "enable_script_sync_to": "スクリプト同期を有効にする", "save": "保存", "save_as": "名前を付けて保存", diff --git a/src/locales/ru-RU/translation.json b/src/locales/ru-RU/translation.json index 8eae459ef..022177a74 100644 --- a/src/locales/ru-RU/translation.json +++ b/src/locales/ru-RU/translation.json @@ -29,6 +29,7 @@ "help_translate": "Помочь с переводом", "script_sync": "Синхронизация скриптов", "sync_delete": "Синхронизация удаления", + "sync_delete_desc": "При включении скрипт будет помечен как удаленный при удалении, и другие устройства обнаружат этот статус и удалят скрипт. При отключении скрипт будет удален непосредственно из локального и облачного хранилища, что может привести к повторной синхронизации, если используется несколько устройств.", "enable_script_sync_to": "Включить синхронизацию скриптов в", "save": "Сохранить", "save_as": "Сохранить как", diff --git a/src/locales/vi-VN/translation.json b/src/locales/vi-VN/translation.json index eb8bab518..ecc5c7411 100644 --- a/src/locales/vi-VN/translation.json +++ b/src/locales/vi-VN/translation.json @@ -29,6 +29,7 @@ "help_translate": "Giúp chúng tôi dịch", "script_sync": "Đồng bộ script", "sync_delete": "Đồng bộ xóa", + "sync_delete_desc": "Khi bật, khi xóa script sẽ đánh dấu là đã xóa, các thiết bị khác phát hiện trạng thái này sẽ xóa script tương ứng. Khi tắt, sẽ xóa trực tiếp script trên bộ nhớ cục bộ và đám mây, nếu có nhiều thiết bị có thể xảy ra tình trạng đồng bộ lặp lại.", "enable_script_sync_to": "Bật đồng bộ script tới", "save": "Lưu", "save_as": "Lưu thành", diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json index d7e855c69..6ca6c0675 100644 --- a/src/locales/zh-CN/translation.json +++ b/src/locales/zh-CN/translation.json @@ -29,6 +29,7 @@ "help_translate": "协助翻译", "script_sync": "脚本同步", "sync_delete": "同步删除", + "sync_delete_desc": "启用后,脚本删除时,会标记脚本为删除,其他设备检测到删除状态后会将脚本删除;关闭时,会直接删除本地与云端的脚本,如果有多台设备可能出现脚本反复同步的情况。", "enable_script_sync_to": "启用脚本同步至", "save": "保存", "save_as": "另存为", diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json index 01c09d6fd..34329fe39 100644 --- a/src/locales/zh-TW/translation.json +++ b/src/locales/zh-TW/translation.json @@ -29,6 +29,7 @@ "help_translate": "幫助翻譯", "script_sync": "腳本同步", "sync_delete": "同步刪除", + "sync_delete_desc": "啟用後,腳本刪除時會標記腳本為刪除,其他裝置檢測到刪除狀態後會將腳本刪除;關閉時,會直接刪除本機與雲端的腳本,如果有多台裝置可能出現腳本反覆同步的情況。", "enable_script_sync_to": "啟用腳本同步至", "save": "儲存", "save_as": "另存新檔", diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx index a92639c25..3047bd327 100644 --- a/src/pages/options/routes/Setting.tsx +++ b/src/pages/options/routes/Setting.tsx @@ -1,4 +1,4 @@ -import { Button, Card, Checkbox, ColorPicker, Input, Message, Select, Space } from "@arco-design/web-react"; +import { Button, Card, Checkbox, ColorPicker, Input, Message, Popover, Select, Space } from "@arco-design/web-react"; import { IconQuestionCircleFill } from "@arco-design/web-react/icon"; import prettier from "prettier/standalone"; import * as babel from "prettier/parser-babel"; @@ -105,6 +105,7 @@ function Setting() { for (const unhook of unhooks) unhook(); unhooks.length = 0; }; + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); return ( @@ -141,14 +142,16 @@ function Setting() { - { - setCloudSync((cloudSync) => ({ ...cloudSync, syncDelete: checked })); - }} - > - {t("sync_delete")} - + + { + setCloudSync((cloudSync) => ({ ...cloudSync, syncDelete: checked })); + }} + > + {t("sync_delete")} + + { From a336bb9bb16eab8724a83b388541784aee13fa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Wed, 7 Jan 2026 11:20:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/options/routes/Setting.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx index 3047bd327..f5f678ec5 100644 --- a/src/pages/options/routes/Setting.tsx +++ b/src/pages/options/routes/Setting.tsx @@ -142,7 +142,7 @@ function Setting() { - +
{ @@ -151,7 +151,10 @@ function Setting() { > {t("sync_delete")} - + + + +
{