Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 00:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/5712

Browse source
This commit is contained in:
Vanessa 2022-08-24 11:15:52 +08:00
parent e8774ab643
commit c5e2c860a9
3 changed files with 45 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,19 +166,19 @@ ${window.siyuan.languages.account8}`;
</div> </div>
</div>`; </div>`;
}, },
bindEvent: () => { bindEvent: (element: Element) => {
const trialSubElement = account.element.querySelector("#trialSub"); const trialSubElement = element.querySelector("#trialSub");
if (trialSubElement) { if (trialSubElement) {
trialSubElement.addEventListener("click", () => { trialSubElement.addEventListener("click", () => {
fetchPost("/api/account/startFreeTrial", {}, () => { fetchPost("/api/account/startFreeTrial", {}, () => {
account.element.querySelector("#refresh").dispatchEvent(new Event("click")); element.querySelector("#refresh").dispatchEvent(new Event("click"));
}); });
}); });
} }
const agreeLoginElement = account.element.querySelector("#agreeLogin") as HTMLInputElement; const agreeLoginElement = element.querySelector("#agreeLogin") as HTMLInputElement;
const userNameElement = account.element.querySelector("#userName") as HTMLInputElement; const userNameElement = element.querySelector("#userName") as HTMLInputElement;
if (!userNameElement) { if (!userNameElement) {
const refreshElement = account.element.querySelector("#refresh"); const refreshElement = element.querySelector("#refresh");
refreshElement.addEventListener("click", () => { refreshElement.addEventListener("click", () => {
const svgElement = refreshElement.firstElementChild; const svgElement = refreshElement.firstElementChild;
if (svgElement.classList.contains("fn__rotate")) { if (svgElement.classList.contains("fn__rotate")) {
@ -189,27 +189,27 @@ ${window.siyuan.languages.account8}`;
token: window.siyuan.user.userToken, token: window.siyuan.user.userToken,
}, response => { }, response => {
window.siyuan.user = response.data; window.siyuan.user = response.data;
account.element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(); account.bindEvent(element);
showMessage(window.siyuan.languages.refreshUser, 3000); showMessage(window.siyuan.languages.refreshUser, 3000);
account.onSetaccount(); account.onSetaccount();
}); });
}); });
account.element.querySelector("#logout").addEventListener("click", () => { element.querySelector("#logout").addEventListener("click", () => {
fetchPost("/api/setting/logoutCloudUser", {}, () => { fetchPost("/api/setting/logoutCloudUser", {}, () => {
fetchPost("/api/setting/getCloudUser", {}, response => { fetchPost("/api/setting/getCloudUser", {}, response => {
window.siyuan.user = response.data; window.siyuan.user = response.data;
account.element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(); account.bindEvent(element);
account.onSetaccount(); account.onSetaccount();
}); });
}); });
}); });
account.element.querySelectorAll("input[type='checkbox']").forEach(item => { element.querySelectorAll("input[type='checkbox']").forEach(item => {
item.addEventListener("change", () => { item.addEventListener("change", () => {
fetchPost("/api/setting/setAccount", { fetchPost("/api/setting/setAccount", {
displayTitle: (account.element.querySelector("#displayTitle") as HTMLInputElement).checked, displayTitle: (element.querySelector("#displayTitle") as HTMLInputElement).checked,
displayVIP: (account.element.querySelector("#displayVIP") as HTMLInputElement).checked, displayVIP: (element.querySelector("#displayVIP") as HTMLInputElement).checked,
}, (response) => { }, (response) => {
window.siyuan.config.account.displayTitle = response.data.displayTitle; window.siyuan.config.account.displayTitle = response.data.displayTitle;
window.siyuan.config.account.displayVIP = response.data.displayVIP; window.siyuan.config.account.displayVIP = response.data.displayVIP;
@ -217,7 +217,7 @@ ${window.siyuan.languages.account8}`;
}); });
}); });
}); });
const activationCodeElement = account.element.querySelector("#activationCode"); const activationCodeElement = element.querySelector("#activationCode");
activationCodeElement.addEventListener("click", () => { activationCodeElement.addEventListener("click", () => {
const activationCodeInput = (activationCodeElement.previousElementSibling as HTMLInputElement); const activationCodeInput = (activationCodeElement.previousElementSibling as HTMLInputElement);
fetchPost("/api/account/checkActivationcode", {data: activationCodeInput.value}, (response) => { fetchPost("/api/account/checkActivationcode", {data: activationCodeInput.value}, (response) => {
@ -236,12 +236,12 @@ ${window.siyuan.languages.account8}`;
return; return;
} }
const userPasswordElement = account.element.querySelector("#userPassword") as HTMLInputElement; const userPasswordElement = element.querySelector("#userPassword") as HTMLInputElement;
const captchaImgElement = account.element.querySelector("#captchaImg") as HTMLInputElement; const captchaImgElement = element.querySelector("#captchaImg") as HTMLInputElement;
const captchaElement = account.element.querySelector("#captcha") as HTMLInputElement; const captchaElement = element.querySelector("#captcha") as HTMLInputElement;
const twofactorAuthCodeElement = account.element.querySelector("#twofactorAuthCode") as HTMLInputElement; const twofactorAuthCodeElement = element.querySelector("#twofactorAuthCode") as HTMLInputElement;
const loginBtnElement = account.element.querySelector("#login") as HTMLButtonElement; const loginBtnElement = element.querySelector("#login") as HTMLButtonElement;
const login2BtnElement = account.element.querySelector("#login2") as HTMLButtonElement; const login2BtnElement = element.querySelector("#login2") as HTMLButtonElement;
agreeLoginElement.addEventListener("click", () => { agreeLoginElement.addEventListener("click", () => {
if (agreeLoginElement.checked) { if (agreeLoginElement.checked) {
loginBtnElement.removeAttribute("disabled"); loginBtnElement.removeAttribute("disabled");
@ -319,8 +319,8 @@ ${window.siyuan.languages.account8}`;
} }
if (data.code === 10) { if (data.code === 10) {
// 两步验证 // 两步验证
account.element.querySelector("#form1").classList.add("fn__none"); element.querySelector("#form1").classList.add("fn__none");
account.element.querySelector("#form2").classList.remove("fn__none"); element.querySelector("#form2").classList.remove("fn__none");
twofactorAuthCodeElement.focus(); twofactorAuthCodeElement.focus();
token = data.data.token; token = data.data.token;
return; return;
@ -330,8 +330,8 @@ ${window.siyuan.languages.account8}`;
token: data.data.token, token: data.data.token,
}, response => { }, response => {
window.siyuan.user = response.data; window.siyuan.user = response.data;
account.element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(); account.bindEvent(element);
account.onSetaccount(); account.onSetaccount();
}); });
}); });
@ -346,8 +346,8 @@ ${window.siyuan.languages.account8}`;
token: response.data.token, token: response.data.token,
}, userResponse => { }, userResponse => {
window.siyuan.user = userResponse.data; window.siyuan.user = userResponse.data;
account.element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(); account.bindEvent(element);
account.onSetaccount(); account.onSetaccount();
}); });
}); });

2
app/src/config/index.ts
View file

@ -103,7 +103,7 @@ export const openSetting = () => {
case "account": case "account":
containerElement.innerHTML = account.genHTML(); containerElement.innerHTML = account.genHTML();
account.element = dialog.element.querySelector('.b3-tab-container[data-name="account"]'); account.element = dialog.element.querySelector('.b3-tab-container[data-name="account"]');
account.bindEvent(); account.bindEvent(account.element);
break; break;
case "repos": case "repos":
containerElement.innerHTML = repos.genHTML(); containerElement.innerHTML = repos.genHTML();

20
app/src/sync/syncGuide.ts
View file

@ -4,6 +4,7 @@ import {fetchPost} from "../util/fetch";
import {Dialog} from "../dialog"; import {Dialog} from "../dialog";
import {confirmDialog} from "../dialog/confirmDialog"; import {confirmDialog} from "../dialog/confirmDialog";
import {isMobile} from "../util/functions"; import {isMobile} from "../util/functions";
import {account} from "../config/account";
export const addCloudName = (cloudPanelElement: Element) => { export const addCloudName = (cloudPanelElement: Element) => {
const dialog = new Dialog({ const dialog = new Dialog({
@ -73,7 +74,7 @@ export const bindSyncCloudListEvent = (cloudPanelElement: Element) => {
}); });
}; };
export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?:() =>void) => { export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?: () => void) => {
if (!reload && cloudPanelElement.firstElementChild.tagName !== "IMG") { if (!reload && cloudPanelElement.firstElementChild.tagName !== "IMG") {
return; return;
} }
@ -111,7 +112,20 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
}; };
export const syncGuide = (element?: Element) => { export const syncGuide = (element?: Element) => {
if (needSubscribe() || (element && element.classList.contains("fn__rotate"))) { if (element && element.classList.contains("fn__rotate")) {
return;
}
if (isMobile()) {
if (needSubscribe()) {
return;
}
} else if (needSubscribe("")) {
const dialog = new Dialog({
title: window.siyuan.languages.account,
content: `<div class="account" style="background-color: var(--b3-theme-background)">${account.genHTML()}</div>`,
width: "80vw",
});
account.bindEvent(dialog.element.querySelector(".account"));
return; return;
} }
if (!window.siyuan.config.repo.key) { if (!window.siyuan.config.repo.key) {
@ -151,7 +165,7 @@ const setSync = (key?: string, dialog?: Dialog) => {
} }
const contentElement = dialog.element.querySelector(".b3-dialog__content").lastElementChild; const contentElement = dialog.element.querySelector(".b3-dialog__content").lastElementChild;
bindSyncCloudListEvent(contentElement); bindSyncCloudListEvent(contentElement);
const btnElement = dialog.element.querySelector(".b3-button"); const btnElement = dialog.element.querySelector(".b3-button");
getSyncCloudList(contentElement, false, () => { getSyncCloudList(contentElement, false, () => {
if (contentElement.querySelector("input[checked]")) { if (contentElement.querySelector("input[checked]")) {
btnElement.removeAttribute("disabled"); btnElement.removeAttribute("disabled");