From b96aecb830f8fd2a6c48a92362283990741a66a3 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Thu, 29 Jul 2021 16:28:25 +0800
Subject: [PATCH] update notify.html

---
 electron/notifycation.html | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/electron/notifycation.html b/electron/notifycation.html
index e92f645..8a86046 100644
--- a/electron/notifycation.html
+++ b/electron/notifycation.html
@@ -249,10 +249,17 @@
     const conflictMsgBtn = domId('conflictMsgBtn');
     const conflictMsgText = domId('conflictMsgText');
 
-    syncMsgView.classList.add('hide');
-    conflictMsgView.classList.add('hide');
-    syncResult.classList.add('hide');
-    syncIncoming.classList.add('hide');
+    function resetDomStatus() {
+      syncMsgView.classList.add('hide');
+      syncMsgView.classList.remove('success');
+      syncMsgView.classList.remove('error');
+      syncMsgView.classList.remove('incomming');
+      syncResult.classList.add('hide');
+      syncIncoming.classList.add('hide');
+      conflictMsgView.classList.add('hide');
+      conflictMsgBtn.classList.add('hide');
+    }
+    resetDomStatus();
 
     function closeWindow() {
       window.ipcRenderer.invoke('window:hide');
@@ -307,15 +314,7 @@
       const extension = message.extension;
       return `${message.archName}${extension ? '.' + extension : ''}`;
     }
-    function resetDomStatus() {
-      syncMsgView.classList.add('hide');
-      syncMsgView.classList.remove('success');
-      syncMsgView.classList.remove('error');
-      syncMsgView.classList.remove('incomming');
-      syncResult.classList.add('hide');
-      syncIncoming.classList.add('hide');
-      conflictMsgView.classList.add('hide');
-    }
+    
 
     function renderTaskSuccess(message) {
       useView(syncMsgView);
@@ -341,7 +340,12 @@
     }
     function renderConflictMsg(message) {
       useView(conflictMsgView);
-      conflictMsgText.innerText = `「${fileFullName(message)}」存在版本冲突，请先下载该文件最新版本，修改后再上传！`;
+      if(message.notifyType === 3) { // 下载冲突
+        conflictMsgText.innerText = `「${fileFullName(message)}」存在版本冲突，请合并冲突文件至目标文件！`;
+      } else { // 上传冲突
+        useView(conflictMsgBtn);
+        conflictMsgText.innerText = `「${fileFullName(message)}」存在版本冲突，请先下载该文件最新版本，修改后再上传！`;
+      }
     }
 
   </script>