Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-26 08:54:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ https://github.com/siyuan-note/siyuan/issues/5071

Browse source
This commit is contained in:
Vanessa 2022-06-05 00:48:29 +08:00
parent 64ae905921
commit ff3cd4d4e9
21 changed files with 117 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/config/account.ts
View file

@ -299,8 +299,9 @@ ${window.siyuan.languages.account8}`;
userPassword: md5(userPasswordElement.value),
captcha: captchaElement.value.replace(/(^\s*)|(\s*$)/g, ""),
}, (data) => {
let messageId
if (data.code === 1) {
showMessage(data.msg);
messageId = showMessage(data.msg);
if (data.data.needCaptcha) {
// 验证码
needCaptcha = data.data.needCaptcha;
@ -320,7 +321,7 @@ ${window.siyuan.languages.account8}`;
token = data.data.token;
return;
}
hideMessage();
hideMessage(messageId);
fetchPost("/api/setting/getCloudUser", {
token: data.data.token,
}, response => {

5
app/src/config/exportConfig.ts
View file

@ -5,7 +5,7 @@ import {SaveDialogReturnValue, shell} from "electron";
import {afterExport} from "../protyle/export/util";
/// #endif
import {isBrowser} from "../util/functions";
import {showMessage} from "../dialog/message";
import {hideMessage, showMessage} from "../dialog/message";
export const exportConfig = {
element: undefined as Element,
@ -162,10 +162,11 @@ export const exportConfig = {
properties: ["showOverwriteConfirmation"],
}).then((result: SaveDialogReturnValue) => {
if (!result.canceled) {
showMessage(window.siyuan.languages.exporting, -1);
const id = showMessage(window.siyuan.languages.exporting, -1);
fetchPost("/api/export/exportDataInFolder", {
folder: result.filePath
}, () => {
hideMessage(id)
afterExport(result.filePath);
});
}

1
app/src/config/keymap.ts
View file

@ -160,7 +160,6 @@ export const keymap = {
item.addEventListener("keydown", function (event) {
event.stopPropagation();
event.preventDefault();
hideMessage();
let keymapStr = "";
if (event.ctrlKey && !event.metaKey && isMac()) {
keymapStr += "⌃";