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());