0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 hide msg

Browse source
This commit is contained in:
Vanessa 2022-09-09 10:10:38 +08:00
parent 2be531a0cc
commit 1fbe68f728
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/dialog/message.ts
View file

@ -75,16 +75,23 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
return id;
};
export const hideMessage = (id: string) => {
export const hideMessage = (id?: string) => {
const messagesElement = document.getElementById("message").firstElementChild;
const messageElement = messagesElement.querySelector(`[data-id="${id}"]`);
if (messageElement) {
messageElement.classList.add("b3-snackbar--hide");
if (id) {
const messageElement = messagesElement.querySelector(`[data-id="${id}"]`);
if (messageElement) {
messageElement.classList.add("b3-snackbar--hide");
setTimeout(() => {
messageElement.remove();
}, Constants.TIMEOUT_INPUT);
}
if (messagesElement.childElementCount < 2) {
messagesElement.parentElement.classList.remove("b3-snackbars--show");
}
} else {
messagesElement.parentElement.classList.remove("b3-snackbars--show");
setTimeout(() => {
messageElement.remove();
messagesElement.innerHTML = "";
}, Constants.TIMEOUT_INPUT);
}
if (messagesElement.childElementCount < 2) {
messagesElement.parentElement.classList.remove("b3-snackbars--show");
}
};

3
app/src/dialog/processSystem.ts
View file

@ -5,7 +5,7 @@ import {getAllModels} from "../layout/getAll";
import {ipcRenderer} from "electron";
import {exportLayout} from "../layout/util";
/// #endif
import {showMessage} from "./message";
import {hideMessage, showMessage} from "./message";
import {Dialog} from "./index";
import {isMobile} from "../util/functions";
import {confirmDialog} from "./confirmDialog";
@ -102,6 +102,7 @@ export const exitSiYuan = () => {
});
}
} else if (response.code === 2) { // 提示新安装包
hideMessage();
confirmDialog(window.siyuan.languages.tip, response.msg, () => {
fetchPost("/api/system/exit", {
force: true,