mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-03-06 22:10:57 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat: support check wysiwyg edit before wync

Browse source 
closes #576
This commit is contained in:
lin onetwo 2024-11-24 17:11:16 +08:00
parent db6982a04a
commit a1cea40a71
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
localization/locales/en/translation.json
View file

@ -381,7 +381,7 @@
"SyncBeforeShutdown": "Sync Before Shutdown",
"SyncBeforeShutdownDescription": "Automatically synchronize data before turning off the computer. Note that manually exiting the application will not trigger the synchronization, so as to prevent the wrong data from being synchronized when the application makes an error. \nWindows system does not support this function.",
"SyncOnlyWhenNoDraft": "Sync only when there are no drafts",
"SyncOnlyWhenNoDraftDescription": "Check if there are drafts before synchronizing, if so, it will not be synchronized this time, preventing the drafts from being synchronized to your blog. \n(Not working for sync-before-shutdown, for you may want to bring drafts from one computer to another to continue editing)",
"SyncOnlyWhenNoDraftDescription": "Check if there are drafts or WYSIWYG editing before synchronizing, if so, it will not be synchronized this time, preventing the drafts from being synchronized to your blog. \n(Not working for sync-before-shutdown, for you may want to bring drafts from one computer to another to continue editing)",
"MoreWorkspaceSyncSettingsDescription": "Please right-click the workspace icon, open its workspace setting by click on \"Edit Workspace\" context menu item, and configure its independent synchronization settings in it.",
"MoreWorkspaceSyncSettings": "More Workspace Sync Settings",
"ShowSideBarIcon": "Show sidebar workspace icons",

2
localization/locales/zh_CN/translation.json
View file

@ -422,7 +422,7 @@
"MoreWorkspaceSyncSettings": "更多工作区同步设置",
"MoreWorkspaceSyncSettingsDescription": "请右键工作区图标，点右键菜单里的「编辑工作区」来打开工作区设置，在里面配各个工作区的同步设置。",
"SyncOnlyWhenNoDraft": "在没有草稿时才同步",
"SyncOnlyWhenNoDraftDescription": "在同步前检查有没有草稿，如果有则本次不同步，防止将草稿同步到你的博客里。（对关机前自动同步无效，毕竟你很可能希望将草稿从一台电脑上带到另一台电脑上继续编辑）",
"SyncOnlyWhenNoDraftDescription": "在同步前检查有没有草稿或处于所见即所得编辑状态的条目，如果有则本次不同步，防止将草稿同步到你的博客里。（对关机前自动同步无效，毕竟你很可能希望将草稿从一台电脑上带到另一台电脑上继续编辑）",
"OpenV8CacheFolder": "打开V8缓存文件夹",
"OpenV8CacheFolderDetail": "V8缓存文件夹存有加速应用启动的快取文件",
"RunOnBackground": "保持后台运行",

5
src/services/sync/index.ts
View file

@ -100,7 +100,10 @@ export class Sync implements ISyncService {
public async checkCanSyncDueToNoDraft(workspaceID: string): Promise<boolean> {
try {
const draftTitles = await this.wikiService.wikiOperationInServer(WikiChannel.runFilter, workspaceID, ['[all[]is[draft]]']);
const draftTitles = (await Promise.all([
this.wikiService.wikiOperationInServer(WikiChannel.runFilter, workspaceID, ['[all[]is[draft]]']),
this.wikiService.wikiOperationInBrowser(WikiChannel.runFilter, workspaceID, ['[list[$:/StoryList]has:field[wysiwyg]]']),
])).flat();
// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
if (Array.isArray(draftTitles) && draftTitles.length > 0) {
return false;