github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 01:21:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 https://github.com/siyuan-note/siyuan/issues/7899

Browse Source
This commit is contained in:
Vanessa 2023-04-06 15:18:20 +08:00
parent 722fba283f
commit 0bf884ec9e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/dialog/message.ts
View File

@ -27,12 +27,13 @@ export const initMessage = () => {
// type: info/error; timeout: 0 手动关闭；-1 用不关闭 // type: info/error; timeout: 0 手动关闭；-1 用不关闭
export const showMessage = (message: string, timeout = 6000, type = "info", messageId?: string) => { export const showMessage = (message: string, timeout = 6000, type = "info", messageId?: string) => {
const messageVersion = message + (type === "error" ? " v" + Constants.SIYUAN_VERSION : "");
const id = messageId || genUUID(); const id = messageId || genUUID();
const messagesElement = document.getElementById("message").firstElementChild; const messagesElement = document.getElementById("message").firstElementChild;
const existElement = messagesElement.querySelector(`.b3-snackbar[data-id="${id}"]`); const existElement = messagesElement.querySelector(`.b3-snackbar[data-id="${id}"]`);
if (existElement) { if (existElement) {
window.clearTimeout(parseInt(existElement.getAttribute("data-timeoutid"))); window.clearTimeout(parseInt(existElement.getAttribute("data-timeoutid")));
existElement.innerHTML = `<div class="b3-snackbar__content${timeout === 0 ? " b3-snackbar__content--close" : ""}">${message}</div>${timeout === 0 ? '<svg class="b3-snackbar__close"><use xlink:href="#iconCloseRound"></use></svg>' : ""}`; existElement.innerHTML = `<div class="b3-snackbar__content${timeout === 0 ? " b3-snackbar__content--close" : ""}">${messageVersion}</div>${timeout === 0 ? '<svg class="b3-snackbar__close"><use xlink:href="#iconCloseRound"></use></svg>' : ""}`;
if (type === "error") { if (type === "error") {
existElement.classList.add("b3-snackbar--error"); existElement.classList.add("b3-snackbar--error");
} else { } else {
@ -46,7 +47,7 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
} }
return; return;
} }
let messageHTML = `<div data-id="${id}" class="b3-snackbar--hide b3-snackbar${type === "error" ? " b3-snackbar--error" : ""}"><div class="b3-snackbar__content${timeout === 0 ? " b3-snackbar__content--close" : ""}">${message}</div>`; let messageHTML = `<div data-id="${id}" class="b3-snackbar--hide b3-snackbar${type === "error" ? " b3-snackbar--error" : ""}"><div class="b3-snackbar__content${timeout === 0 ? " b3-snackbar__content--close" : ""}">${messageVersion}</div>`;
if (timeout === 0) { if (timeout === 0) {
messageHTML += '<svg class="b3-snackbar__close"><use xlink:href="#iconCloseRound"></use></svg>'; messageHTML += '<svg class="b3-snackbar__close"><use xlink:href="#iconCloseRound"></use></svg>';
} else if (timeout !== -1) { // -1 时需等待请求完成后手动关闭 } else if (timeout !== -1) { // -1 时需等待请求完成后手动关闭