From 6e7e154a3cace35d108d97d56ec3541ef3bf7764 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sun, 9 Oct 2022 10:33:01 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/6111

---
 app/src/config/repos.ts  | 14 ++++++++++++++
 app/src/config/search.ts |  1 +
 app/src/types/index.d.ts |  1 +
 3 files changed, 16 insertions(+)

diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts
index be4a84c20..8609c02ab 100644
--- a/app/src/config/repos.ts
+++ b/app/src/config/repos.ts
@@ -108,6 +108,14 @@ export const repos = {
     <span class="fn__space"></span>
     <input type="checkbox" id="reposCloudSyncSwitch"${window.siyuan.config.sync.enabled ? " checked='checked'" : ""} class="b3-switch fn__flex-center">
 </label>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.generateConflictDoc}
+        <div class="b3-label__text">${window.siyuan.languages.generateConflictDocTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input type="checkbox" id="generateConflictDoc"${window.siyuan.config.sync.generateConflictDoc ? " checked='checked'" : ""} class="b3-switch fn__flex-center">
+</label>
 ${syncModeHTML}
 <div class="b3-label">
     <div class="fn__flex">
@@ -146,6 +154,12 @@ ${syncModeHTML}
                 }
             });
         });
+        const switchConflictElement = repos.element.querySelector("#generateConflictDoc") as HTMLInputElement;
+        switchConflictElement.addEventListener("change", () => {
+            fetchPost("/api/sync/setSyncGenerateConflictDoc", {enabled: switchConflictElement.checked}, (response) => {
+                window.siyuan.config.sync.generateConflictDoc = switchConflictElement.checked;
+            });
+        });
         const syncModeElement = repos.element.querySelector("#syncMode") as HTMLSelectElement;
         syncModeElement.addEventListener("change", () => {
             fetchPost("/api/sync/setSyncMode", {mode: parseInt(syncModeElement.value, 10)}, (response) => {
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index 2c516e217..be2d2e7ad 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -58,6 +58,7 @@ export const initConfigSearch = (element: HTMLElement) => {
         // 云端
         getLang(["cloudStorage", "trafficStat", "sync", "backup", "cdn", "total", "sizeLimit", "cloudBackup",
             "cloudBackupTip", "updatePath", "cloudSync", "upload", "download", "syncMode", "syncModeTip",
+            "generateConflictDoc", "generateConflictDocTip",
             "syncMode1", "syncMode2", "reposTip", "openSyncTip1", "openSyncTip2", "cloudSyncDir", "config"]),
 
         // 账号
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 1fc0c28a5..e1405403b 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -303,6 +303,7 @@ declare interface IConfig {
         key: string
     },
     sync: {
+        generateConflictDoc: boolean
         enabled: boolean
         mode: number
         synced: number