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

🐛 fix https://github.com/siyuan-note/siyuan/issues/6393

Browse source
This commit is contained in:
Vanessa 2022-10-29 01:30:35 +08:00
parent bca18514bd
commit 0531591755
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,9 +55,7 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
}, timeout);
messageHTML = messageHTML.replace("<div data-id", `<div data-timeoutid="${timeoutId}" data-id`);
}
if (messagesElement.childElementCount === 0) {
messagesElement.parentElement.classList.add("b3-snackbars--show");
}
messagesElement.parentElement.classList.add("b3-snackbars--show");
messagesElement.insertAdjacentHTML("afterbegin", messageHTML + "</div>");
setTimeout(() => {
messagesElement.querySelectorAll(".b3-snackbar--hide").forEach(item => {
@ -83,9 +81,21 @@ export const hideMessage = (id?: string) => {
messageElement.classList.add("b3-snackbar--hide");
setTimeout(() => {
messageElement.remove();
if (messagesElement.childElementCount === 0) {
hideMessage();
}
}, Constants.TIMEOUT_INPUT);
}
if (messagesElement.childElementCount < 2) {
let hasShowItem = false
Array.from(messagesElement.children).find(item => {
if (!item.classList.contains("b3-snackbar--hide")) {
hasShowItem = true
return true;
}
})
if (hasShowItem) {
messagesElement.parentElement.classList.add("b3-snackbars--show");
} else {
messagesElement.parentElement.classList.remove("b3-snackbars--show");
}
} else {

2
app/src/protyle/upload/index.ts
View file

@ -68,7 +68,7 @@ const validateFile = (protyle: IProtyle, files: File[]) => {
}
let msgId;
if (errorTip !== "" || uploadingStr !== "") {
msgId = showMessage(`<ul>${errorTip}${uploadingStr}</ul>`);
msgId = showMessage(`<ul>${errorTip}${uploadingStr}</ul>`, -1);
}
return {files: uploadFileList, msgId};