From ac2c973f2bb844dcc2fc2eb250d6c44fbbffd7e5 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Tue, 7 Jun 2022 10:59:31 +0800
Subject: [PATCH] :bug: update msg

---
 app/src/dialog/message.ts       | 9 +++++++--
 app/src/protyle/export/index.ts | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/dialog/message.ts b/app/src/dialog/message.ts
index 8ec9b39b4..62d550810 100644
--- a/app/src/dialog/message.ts
+++ b/app/src/dialog/message.ts
@@ -32,8 +32,13 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
     const messagesElement = document.getElementById("message").firstElementChild;
     const existElement = messagesElement.querySelector(`.b3-snackbar[data-id="${id}"]`)
     if (existElement) {
-        existElement.firstElementChild.innerHTML = message;
         window.clearTimeout(parseInt(existElement.getAttribute("data-timeoutid")));
+        existElement.innerHTML = `<div class="b3-snackbar__content">${message}</div>${timeout === 0 ? '<svg class="b3-snackbar__close"><use xlink:href="#iconClose"></use></svg>' : ''}`;
+        if (type === "error") {
+            existElement.classList.add("b3-snackbar--error")
+        } else {
+            existElement.classList.remove("b3-snackbar--error")
+        }
         if (timeout > 0) {
             const timeoutId = window.setTimeout(() => {
                 hideMessage(id);
@@ -49,7 +54,7 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
         const timeoutId = window.setTimeout(() => {
             hideMessage(id);
         }, timeout);
-        messageHTML.replace("<div data-id", `<div data-timeoutid="${timeoutId}" data-id`);
+        messageHTML = messageHTML.replace("<div data-id", `<div data-timeoutid="${timeoutId}" data-id`);
     }
     if (messagesElement.childElementCount === 0) {
         messagesElement.parentElement.classList.add("b3-snackbars--show");
diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts
index fc299163d..93553e3f3 100644
--- a/app/src/protyle/export/index.ts
+++ b/app/src/protyle/export/index.ts
@@ -149,7 +149,7 @@ const getExportPath = (option: { type: string, id: string }, pdfOption?: PrintTo
     });
 };
 
-const onExport = (data: IWebSocketData, filePath: string, type: string, pdfOptions?: PrintToPDFOptions, removeAssets?: boolean, msgId?:string) => {
+const onExport = (data: IWebSocketData, filePath: string, type: string, pdfOptions?: PrintToPDFOptions, removeAssets?: boolean, msgId?: string) => {
     let themeName = window.siyuan.config.appearance.themeLight;
     let mode = 0;
     if (["html", "htmlmd"].includes(type) && window.siyuan.config.appearance.mode === 1) {
@@ -342,11 +342,11 @@ pre code {
                         });
                         win.destroy();
                     }).catch((error: string) => {
-                        showMessage("Export PDF error:" + error, 0);
+                        showMessage("Export PDF error:" + error, 0, "error", msgId);
                         win.destroy();
                     });
                 } catch (e) {
-                    showMessage("Export PDF error:" + e + ". Export HTML and use Chrome's printing function to convert to PDF", 0);
+                    showMessage("Export PDF error:" + e + ". Export HTML and use Chrome's printing function to convert to PDF", 0, "error", msgId);
                 }
             }, Math.min(timeout, 10000));
         });