This commit is contained in:
Vanessa 2022-06-05 00:49:57 +08:00
parent bb09e1e102
commit b7b85c5650
11 changed files with 20 additions and 21 deletions

View file

@ -299,7 +299,7 @@ ${window.siyuan.languages.account8}`;
userPassword: md5(userPasswordElement.value), userPassword: md5(userPasswordElement.value),
captcha: captchaElement.value.replace(/(^\s*)|(\s*$)/g, ""), captcha: captchaElement.value.replace(/(^\s*)|(\s*$)/g, ""),
}, (data) => { }, (data) => {
let messageId let messageId;
if (data.code === 1) { if (data.code === 1) {
messageId = showMessage(data.msg); messageId = showMessage(data.msg);
if (data.data.needCaptcha) { if (data.data.needCaptcha) {

View file

@ -166,7 +166,7 @@ export const exportConfig = {
fetchPost("/api/export/exportDataInFolder", { fetchPost("/api/export/exportDataInFolder", {
folder: result.filePath folder: result.filePath
}, () => { }, () => {
hideMessage(id) hideMessage(id);
afterExport(result.filePath); afterExport(result.filePath);
}); });
} }

View file

@ -1,6 +1,6 @@
import {hotKey2Electron, isCtrl, isMac, updateHotkeyTip} from "../protyle/util/compatibility"; import {hotKey2Electron, isCtrl, isMac, updateHotkeyTip} from "../protyle/util/compatibility";
import {Constants} from "../constants"; import {Constants} from "../constants";
import {hideMessage, showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {fetchPost} from "../util/fetch"; import {fetchPost} from "../util/fetch";
import {ipcRenderer} from "electron"; import {ipcRenderer} from "electron";

View file

@ -1,29 +1,29 @@
import {genUUID} from "../util/genID"; import {genUUID} from "../util/genID";
export const initMessage = () => { export const initMessage = () => {
const messageElement = document.getElementById("message") const messageElement = document.getElementById("message");
messageElement.innerHTML = `<div class="fn__flex-1"></div> messageElement.innerHTML = `<div class="fn__flex-1"></div>
<div class="fn__hr fn__flex-shrink"></div> <div class="fn__hr fn__flex-shrink"></div>
<button class="fn__flex-center b3-button b3-button--cancel"> <button class="fn__flex-center b3-button b3-button--cancel">
${window.siyuan.languages.close} ${window.siyuan.languages.close}
</button>` </button>`;
messageElement.addEventListener("click", (event) => { messageElement.addEventListener("click", (event) => {
let target = event.target as HTMLElement let target = event.target as HTMLElement;
while (target && !target.isEqualNode(messageElement)) { while (target && !target.isEqualNode(messageElement)) {
if (target.classList.contains("b3-snackbar__close")) { if (target.classList.contains("b3-snackbar__close")) {
hideMessage(target.parentElement.getAttribute("data-id")) hideMessage(target.parentElement.getAttribute("data-id"));
event.preventDefault(); event.preventDefault();
break; break;
} else if (target.isSameNode(messageElement.lastElementChild)) { } else if (target.isSameNode(messageElement.lastElementChild)) {
target.parentElement.classList.add("fn__none"); target.parentElement.classList.add("fn__none");
target.parentElement.innerHTML = ''; target.parentElement.innerHTML = "";
event.preventDefault(); event.preventDefault();
break; break;
} }
target = target.parentElement; target = target.parentElement;
} }
}) });
} };
export const showMessage = (message: string, timeout = 6000, type = "info") => { export const showMessage = (message: string, timeout = 6000, type = "info") => {
const id = genUUID(); const id = genUUID();
@ -35,9 +35,9 @@ export const showMessage = (message: string, timeout = 6000, type = "info") => {
hideMessage(id); hideMessage(id);
}, timeout); }, timeout);
} }
const messagesElement = document.getElementById("message").firstElementChild const messagesElement = document.getElementById("message").firstElementChild;
if (messagesElement.childElementCount === 0) { if (messagesElement.childElementCount === 0) {
messagesElement.parentElement.classList.remove("fn__none") messagesElement.parentElement.classList.remove("fn__none");
} }
messagesElement.insertAdjacentHTML("afterbegin", messageHTML + "</div>"); messagesElement.insertAdjacentHTML("afterbegin", messageHTML + "</div>");
messagesElement.scrollTop = 0; messagesElement.scrollTop = 0;
@ -45,12 +45,12 @@ export const showMessage = (message: string, timeout = 6000, type = "info") => {
}; };
export const hideMessage = (id: string) => { export const hideMessage = (id: string) => {
const messagesElement = document.getElementById("message").firstElementChild const messagesElement = document.getElementById("message").firstElementChild;
const messageElement = messagesElement.querySelector(`[data-id="${id}"]`); const messageElement = messagesElement.querySelector(`[data-id="${id}"]`);
if (messageElement) { if (messageElement) {
messageElement.remove(); messageElement.remove();
} }
if (messagesElement.childElementCount === 0) { if (messagesElement.childElementCount === 0) {
messagesElement.parentElement.classList.add("fn__none") messagesElement.parentElement.classList.add("fn__none");
} }
}; };

View file

@ -13,7 +13,7 @@ import {repos} from "./config/repos";
import {openFileById} from "./editor/util"; import {openFileById} from "./editor/util";
import {bootSync, downloadProgress, progressLoading, setTitle, transactionError} from "./dialog/processSystem"; import {bootSync, downloadProgress, progressLoading, setTitle, transactionError} from "./dialog/processSystem";
import {promiseTransactions} from "./protyle/wysiwyg/transaction"; import {promiseTransactions} from "./protyle/wysiwyg/transaction";
import {initMessage, showMessage} from "./dialog/message"; import {initMessage} from "./dialog/message";
class App { class App {
constructor() { constructor() {

View file

@ -8,7 +8,7 @@ import {newFile} from "../../util/newFile";
import {initFileMenu, initNavigationMenu} from "../../menus/navigation"; import {initFileMenu, initNavigationMenu} from "../../menus/navigation";
import {MenuItem} from "../../menus/Menu"; import {MenuItem} from "../../menus/Menu";
import {Editor} from "../../editor"; import {Editor} from "../../editor";
import {hideMessage, showMessage} from "../../dialog/message"; import {showMessage} from "../../dialog/message";
import {fetchPost} from "../../util/fetch"; import {fetchPost} from "../../util/fetch";
import {openEmojiPanel, unicode2Emoji} from "../../emoji"; import {openEmojiPanel, unicode2Emoji} from "../../emoji";
import {newNotebook} from "../../util/mount"; import {newNotebook} from "../../util/mount";

View file

@ -5,7 +5,7 @@ import {Constants} from "../../constants";
import {getDisplayName, pathPosix, setNoteBook} from "../../util/pathName"; import {getDisplayName, pathPosix, setNoteBook} from "../../util/pathName";
import {newFile} from "../../util/newFile"; import {newFile} from "../../util/newFile";
import {initFileMenu, initNavigationMenu} from "../../menus/navigation"; import {initFileMenu, initNavigationMenu} from "../../menus/navigation";
import {hideMessage, showMessage} from "../../dialog/message"; import {showMessage} from "../../dialog/message";
import {fetchPost} from "../../util/fetch"; import {fetchPost} from "../../util/fetch";
import {genUUID} from "../../util/genID"; import {genUUID} from "../../util/genID";
import {openMobileFileById} from "../editor"; import {openMobileFileById} from "../editor";

View file

@ -166,7 +166,7 @@ export class Breadcrumb {
icon: "iconRecord", icon: "iconRecord",
label: this.mediaRecorder?.isRecording ? window.siyuan.languages.endRecord : window.siyuan.languages.startRecord, label: this.mediaRecorder?.isRecording ? window.siyuan.languages.endRecord : window.siyuan.languages.startRecord,
click: () => { click: () => {
let messageId = '' let messageId = "";
if (!this.mediaRecorder) { if (!this.mediaRecorder) {
navigator.mediaDevices.getUserMedia({audio: true}).then((mediaStream: MediaStream) => { navigator.mediaDevices.getUserMedia({audio: true}).then((mediaStream: MediaStream) => {
this.mediaRecorder = new RecordMedia(mediaStream); this.mediaRecorder = new RecordMedia(mediaStream);

View file

@ -2,7 +2,6 @@ import {hasClosestByClassName} from "../util/hasClosest";
import {getRandom, isMobile} from "../../util/functions"; import {getRandom, isMobile} from "../../util/functions";
import {hideElements} from "../ui/hideElements"; import {hideElements} from "../ui/hideElements";
import {uploadFiles} from "../upload"; import {uploadFiles} from "../upload";
import {hideMessage} from "../../dialog/message";
import {fetchPost} from "../../util/fetch"; import {fetchPost} from "../../util/fetch";
import {getRandomEmoji, openEmojiPanel, unicode2Emoji, updateFileTreeEmoji, updateOutlineEmoji} from "../../emoji"; import {getRandomEmoji, openEmojiPanel, unicode2Emoji, updateFileTreeEmoji, updateOutlineEmoji} from "../../emoji";
import {upDownHint} from "../../util/upDownHint"; import {upDownHint} from "../../util/upDownHint";

View file

@ -1,5 +1,5 @@
import {insertHTML} from "../util/insertHTML"; import {insertHTML} from "../util/insertHTML";
import {hideMessage, showMessage} from "../../dialog/message"; import {showMessage} from "../../dialog/message";
import {Constants} from "../../constants"; import {Constants} from "../../constants";
import {destroy} from "../util/destroy"; import {destroy} from "../util/destroy";
import {fetchPost} from "../../util/fetch"; import {fetchPost} from "../../util/fetch";

View file

@ -1,4 +1,4 @@
import {hideMessage, showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {exportLayout} from "../layout/util"; import {exportLayout} from "../layout/util";
import {isMobile} from "./functions"; import {isMobile} from "./functions";