From 676cbb7468e5cce37ee806bf75cb2853b4b3670c Mon Sep 17 00:00:00 2001
From: shixiaohua <shi_xiaohua@qq.com>
Date: Wed, 10 Apr 2024 09:21:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=8C=E6=AD=A5=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BC=82=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 elsrc/sync/tencent/UploadUtils.js             | 30 +++++++++++--------
 .../Note/Hlexical/plugins/SaveFilePlugin.js   |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/elsrc/sync/tencent/UploadUtils.js b/elsrc/sync/tencent/UploadUtils.js
index fcc990c..748d104 100644
--- a/elsrc/sync/tencent/UploadUtils.js
+++ b/elsrc/sync/tencent/UploadUtils.js
@@ -201,24 +201,28 @@ class UploadUtils {
                         return
                     }
                     console.log("fileList[0].ETag", onlineMd5)
-                    let number = dialog.showMessageBoxSync({
+                    dialog.showMessageBox({
                         "message": "云文件已修改是否同步到本地",
                         "type": "info",
                         "buttons": ["是", "否"],
                         "defaultId": 0
-                    });
-                    if (number === 0) {
-                        UploadUtils.selfDownLoadFile(activeFile)
-                    } else if (number === 1) {
-                        if (dialog.showMessageBoxSync({
-                            "message": "是否使用本地文件覆盖远程文件",
-                            "type": "info",
-                            "buttons": ["是", "否"],
-                            "defaultId": 0
-                        }) === 0) {
-                            UploadUtils.selfUploadFile(activeFile,fileMd5)
+                    }).then(result=>{
+                        let number = result.response
+                        if (number === 0) {
+                            UploadUtils.selfDownLoadFile(activeFile)
+                        } else if (number === 1) {
+                            dialog.showMessageBox({
+                                "message": "是否使用本地文件覆盖远程文件",
+                                "type": "info",
+                                "buttons": ["是", "否"],
+                                "defaultId": 0
+                            }).then(result=>{
+                                if (result.response===0){
+                                    UploadUtils.selfUploadFile(activeFile,fileMd5)
+                                }
+                            })
                         }
-                    }
+                    });
                 } else {
                     UploadUtils.selfUploadFile(activeFile,fileMd5)
                 }
diff --git a/src/pages/Note/Hlexical/plugins/SaveFilePlugin.js b/src/pages/Note/Hlexical/plugins/SaveFilePlugin.js
index ed46947..9044619 100644
--- a/src/pages/Note/Hlexical/plugins/SaveFilePlugin.js
+++ b/src/pages/Note/Hlexical/plugins/SaveFilePlugin.js
@@ -89,7 +89,7 @@ const SaveFilePlugin=(props)=> {
       let save =true;
       let oldFileMd5
       let newFileMd5 =md5(resultSave)
-      if (!value){
+      if (!isEmpty(value)){
         if (props.filePath.endsWith(".md")){
           // editorState
           oldFileMd5 = md5(value.toString());