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

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

Browse source
This commit is contained in:
Vanessa 2023-01-19 11:49:31 +08:00
parent 3a93650d9d
commit f3366c05b6
12 changed files with 376 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/appearance/langs/en_US.json
View file

@ -573,6 +573,7 @@
"--b3-protyle-inline-blockref-color": "Block Ref", "--b3-protyle-inline-blockref-color": "Block Ref",
"sync": "Sync", "sync": "Sync",
"syncNow": "Sync now", "syncNow": "Sync now",
"waitSync": "The editing data has not been synchronized to the cloud",
"cloudBook": "Cloud Notebook", "cloudBook": "Cloud Notebook",
"paymentSum": "Cumulatively paid", "paymentSum": "Cumulatively paid",
"refresh": "Refresh", "refresh": "Refresh",

1
app/appearance/langs/es_ES.json
View file

@ -573,6 +573,7 @@
"--b3-protyle-inline-blockref-color": "Bloque Ref", "--b3-protyle-inline-blockref-color": "Bloque Ref",
"sync": "Sincronización", "sync": "Sincronización",
"syncNow": "Sincronizar ahora", "syncNow": "Sincronizar ahora",
"waitSync": "Los datos de edición no se han sincronizado con la nube",
"cloudBook": "Cuaderno de notas en la nube", "cloudBook": "Cuaderno de notas en la nube",
"paymentSum": "Pagado acumulativamente", "paymentSum": "Pagado acumulativamente",
"refresh": "Actualizar", "refresh": "Actualizar",

1
app/appearance/langs/fr_FR.json
View file

@ -573,6 +573,7 @@
"--b3-protyle-inline-blockref-color": "Ref Bloc", "--b3-protyle-inline-blockref-color": "Ref Bloc",
"sync": "Synchro", "sync": "Synchro",
"syncNow": "Synchro maintenant", "syncNow": "Synchro maintenant",
"waitSync": "Les données d'édition n'ont pas été synchronisées avec le cloud",
"cloudBook": "Carnet de notes du Cloud", "cloudBook": "Carnet de notes du Cloud",
"paymentSum": "Cumulativement payé", "paymentSum": "Cumulativement payé",
"refresh": "Rafraîchir", "refresh": "Rafraîchir",

1
app/appearance/langs/zh_CHT.json
View file

@ -573,6 +573,7 @@
"--b3-protyle-inline-blockref-color": "引用塊", "--b3-protyle-inline-blockref-color": "引用塊",
"sync": "同步", "sync": "同步",
"syncNow": "立即同步", "syncNow": "立即同步",
"waitSync": "編輯數據尚未同步到雲端",
"cloudBook": "雲端筆記本", "cloudBook": "雲端筆記本",
"payment": "累計已支付", "payment": "累計已支付",
"refresh": "重新整理", "refresh": "重新整理",

1
app/appearance/langs/zh_CN.json
View file

@ -573,6 +573,7 @@
"--b3-protyle-inline-blockref-color": "引用块", "--b3-protyle-inline-blockref-color": "引用块",
"sync": "同步", "sync": "同步",
"syncNow": "立即同步", "syncNow": "立即同步",
"waitSync": "编辑数据尚未同步到云端",
"cloudBook": "云端笔记本", "cloudBook": "云端笔记本",
"paymentSum": "累计已支付", "paymentSum": "累计已支付",
"refresh": "刷新", "refresh": "刷新",

15
app/src/assets/scss/mobile.scss
View file

@ -246,6 +246,21 @@
} }
} }
#transactionTip {
position: fixed;
top: 73px;
border-radius: 4px;
box-sizing: border-box;
background: var(--b3-theme-background);
padding: 4px;
box-shadow: var(--b3-point-shadow);
z-index: 1;
line-height: 28px;
left: 8px;
right: 8px;
text-align: center;
}
.svg { .svg {
fill: currentColor; fill: currentColor;
display: inline-block; display: inline-block;

1
app/src/assets/template/mobile/index.tpl
View file

@ -72,5 +72,6 @@
<button data-type="redo"><svg><use xlink:href="#iconRedo"></use></svg></button> <button data-type="redo"><svg><use xlink:href="#iconRedo"></use></svg></button>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
</div> </div>
<div id="transactionTip" class="fn__none"></div>
</body> </body>
</html> </html>

9
app/src/mobile/index.ts
View file

@ -55,9 +55,12 @@ class App {
loadAssets(confResponse.data.conf.appearance); loadAssets(confResponse.data.conf.appearance);
initMessage(); initMessage();
initAssets(); initAssets();
fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { fetchPost("/api/setting/getCloudUser", {}, userResponse => {
window.siyuan.emojis = emojiResponse.data as IEmoji[]; window.siyuan.user = userResponse.data;
initFramework(); fetchPost("/api/system/getEmojiConf", {}, emojiResponse => {
window.siyuan.emojis = emojiResponse.data as IEmoji[];
initFramework();
});
}); });
addGA(); addGA();
}); });

6
app/src/mobile/util/initFramework.ts
View file

@ -19,6 +19,7 @@ import {MobileBookmarks} from "./MobileBookmarks";
import {MobileTags} from "./MobileTags"; import {MobileTags} from "./MobileTags";
import {hideKeyboardToolbar, initKeyboardToolbar} from "./showKeyboardToolbar"; import {hideKeyboardToolbar, initKeyboardToolbar} from "./showKeyboardToolbar";
import {getSearch} from "../../util/functions"; import {getSearch} from "../../util/functions";
import {syncGuide} from "../../sync/syncGuide";
export const initFramework = () => { export const initFramework = () => {
setInlineStyle(); setInlineStyle();
@ -154,6 +155,11 @@ export const initFramework = () => {
if (window.siyuan.config.newbie) { if (window.siyuan.config.newbie) {
mountHelp(); mountHelp();
} }
const transactionTipElement = document.getElementById("transactionTip");
transactionTipElement.innerHTML = `${window.siyuan.languages.waitSync} <button class="b3-button">${window.siyuan.languages.syncNow}</button>`
transactionTipElement.querySelector(".b3-button").addEventListener(getEventName(), () => {
syncGuide();
});
}; };
const initEditorName = () => { const initEditorName = () => {

667
app/src/mobile/util/menu.ts
View file

@ -121,20 +121,18 @@ export const popMenu = () => {
return; return;
} }
fetchPost("/api/setting/getCloudUser", {}, userResponse => { let accountHTML = "";
window.siyuan.user = userResponse.data; if (window.siyuan.user) {
let accountHTML = ""; accountHTML = `<div class="b3-list-item b3-list-item--big" id="menuAccount">
if (window.siyuan.user) {
accountHTML = `<div class="b3-list-item b3-list-item--big" id="menuAccount">
<img class="b3-list-item__graphic" src="${window.siyuan.user.userAvatarURL}"/> <img class="b3-list-item__graphic" src="${window.siyuan.user.userAvatarURL}"/>
<span class="b3-list-item__text">${window.siyuan.user.userName}</span> <span class="b3-list-item__text">${window.siyuan.user.userName}</span>
</div>`; </div>`;
} else { } else {
accountHTML = `<div class="b3-list-item b3-list-item--big" id="menuAccount"> accountHTML = `<div class="b3-list-item b3-list-item--big" id="menuAccount">
<svg class="b3-list-item__graphic"><use xlink:href="#iconAccount"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.login}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconAccount"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.login}</span>
</div>`; </div>`;
} }
menuElement.innerHTML = `<div id="menuSearch" class="b3-list-item b3-list-item--big"> menuElement.innerHTML = `<div id="menuSearch" class="b3-list-item b3-list-item--big">
<svg class="b3-list-item__graphic"><use xlink:href="#iconSearch"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.search}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconSearch"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.search}</span>
</div> </div>
<div id="menuNewDaily" class="b3-list-item b3-list-item--big"> <div id="menuNewDaily" class="b3-list-item b3-list-item--big">
@ -172,35 +170,35 @@ ${accountHTML}
<div class="b3-list-item b3-list-item--big" id="menuSafeQuit"> <div class="b3-list-item b3-list-item--big" id="menuSafeQuit">
<svg class="b3-list-item__graphic"><use xlink:href="#iconQuit"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.safeQuit}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconQuit"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.safeQuit}</span>
</div>`; </div>`;
// 只能用 click，否则无法上下滚动 https://github.com/siyuan-note/siyuan/issues/6628 // 只能用 click，否则无法上下滚动 https://github.com/siyuan-note/siyuan/issues/6628
menuElement.addEventListener("click", (event) => { menuElement.addEventListener("click", (event) => {
let target = event.target as HTMLElement; let target = event.target as HTMLElement;
while (target && !target.isEqualNode(menuElement)) { while (target && !target.isEqualNode(menuElement)) {
if (target.id === "menuSearch") { if (target.id === "menuSearch") {
popSearch(modelElement, modelMainElement); popSearch(modelElement, modelMainElement);
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "menuAppearance") { } else if (target.id === "menuAppearance") {
initAppearance(modelElement, modelMainElement); initAppearance(modelElement, modelMainElement);
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "menuSafeQuit") { } else if (target.id === "menuSafeQuit") {
exitSiYuan(); exitSiYuan();
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "menuAbout") { } else if (target.id === "menuAbout") {
closePanel(); closePanel();
if (!window.siyuan.config.localIPs || window.siyuan.config.localIPs.length === 0 || if (!window.siyuan.config.localIPs || window.siyuan.config.localIPs.length === 0 ||
(window.siyuan.config.localIPs.length === 1 && window.siyuan.config.localIPs[0] === "")) { (window.siyuan.config.localIPs.length === 1 && window.siyuan.config.localIPs[0] === "")) {
window.siyuan.config.localIPs = ["127.0.0.1"]; window.siyuan.config.localIPs = ["127.0.0.1"];
} }
modelElement.style.top = "0"; modelElement.style.top = "0";
modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconInfo"></use>'; modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconInfo"></use>';
modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.about; modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.about;
modelMainElement.innerHTML = `<div class="b3-label fn__flex"> modelMainElement.innerHTML = `<div class="b3-label fn__flex">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about11} ${window.siyuan.languages.about11}
<div class="b3-label__text">${window.siyuan.languages.about12}</div> <div class="b3-label__text">${window.siyuan.languages.about12}</div>
@ -318,261 +316,261 @@ ${accountHTML}
<div style="color:var(--b3-theme-surface);font-family: cursive;">会泽百家&nbsp;至公天下</div> <div style="color:var(--b3-theme-surface);font-family: cursive;">会泽百家&nbsp;至公天下</div>
${window.siyuan.languages.about1} ${window.siyuan.languages.about1}
</div>`; </div>`;
const workspaceDirElement = modelMainElement.querySelector("#workspaceDir"); const workspaceDirElement = modelMainElement.querySelector("#workspaceDir");
genWorkspace(workspaceDirElement); genWorkspace(workspaceDirElement);
const importKeyElement = modelMainElement.querySelector("#importKey"); const importKeyElement = modelMainElement.querySelector("#importKey");
modelMainElement.addEventListener("click", (event) => { modelMainElement.addEventListener("click", (event) => {
let target = event.target as HTMLElement; let target = event.target as HTMLElement;
while (target && !target.isSameNode(modelMainElement)) { while (target && !target.isSameNode(modelMainElement)) {
if (target.id === "authCode") { if (target.id === "authCode") {
setAccessAuthCode(); setAccessAuthCode();
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (target.id === "importKey") { } else if (target.id === "importKey") {
const passwordDialog = new Dialog({ const passwordDialog = new Dialog({
title: "🔑 " + window.siyuan.languages.key, title: "🔑 " + window.siyuan.languages.key,
content: `<div class="b3-dialog__content"> content: `<div class="b3-dialog__content">
<textarea class="b3-text-field fn__block" placeholder="${window.siyuan.languages.keyPlaceholder}"></textarea> <textarea class="b3-text-field fn__block" placeholder="${window.siyuan.languages.keyPlaceholder}"></textarea>
</div> </div>
<div class="b3-dialog__action"> <div class="b3-dialog__action">
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "80vw",
}); });
const textAreaElement = passwordDialog.element.querySelector("textarea"); const textAreaElement = passwordDialog.element.querySelector("textarea");
textAreaElement.focus(); textAreaElement.focus();
const btnsElement = passwordDialog.element.querySelectorAll(".b3-button"); const btnsElement = passwordDialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
passwordDialog.destroy();
});
btnsElement[1].addEventListener("click", () => {
fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => {
window.siyuan.config.repo.key = textAreaElement.value;
importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
passwordDialog.destroy(); passwordDialog.destroy();
}); });
btnsElement[1].addEventListener("click", () => { });
fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => { event.preventDefault();
window.siyuan.config.repo.key = textAreaElement.value; event.stopPropagation();
importKeyElement.parentElement.classList.add("fn__none"); break;
importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none"); } else if (target.id === "initKey") {
passwordDialog.destroy(); confirmDialog("🔑 " + window.siyuan.languages.genKey, window.siyuan.languages.initRepoKeyTip, () => {
}); fetchPost("/api/repo/initRepoKey", {}, (response) => {
window.siyuan.config.repo.key = response.data.key;
importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
}); });
event.preventDefault(); });
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "initKey") { break;
confirmDialog("🔑 " + window.siyuan.languages.genKey, window.siyuan.languages.initRepoKeyTip, () => { } else if (target.id === "initKeyByPW") {
fetchPost("/api/repo/initRepoKey", {}, (response) => { const initDialog = new Dialog({
window.siyuan.config.repo.key = response.data.key; title: "🔑 " + window.siyuan.languages.genKeyByPW,
importKeyElement.parentElement.classList.add("fn__none"); content: `<div class="b3-dialog__content">
importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
});
});
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "initKeyByPW") {
const initDialog = new Dialog({
title: "🔑 " + window.siyuan.languages.genKeyByPW,
content: `<div class="b3-dialog__content">
<input class="b3-text-field fn__block" placeholder="${window.siyuan.languages.password}"> <input class="b3-text-field fn__block" placeholder="${window.siyuan.languages.password}">
</div> </div>
<div class="b3-dialog__action"> <div class="b3-dialog__action">
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "80vw",
}); });
const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement; const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement;
inputElement.focus(); inputElement.focus();
const btnsElement = initDialog.element.querySelectorAll(".b3-button"); const btnsElement = initDialog.element.querySelectorAll(".b3-button");
initDialog.bindInput(inputElement, () => { initDialog.bindInput(inputElement, () => {
(btnsElement[1] as HTMLButtonElement).click(); (btnsElement[1] as HTMLButtonElement).click();
}); });
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
initDialog.destroy();
});
btnsElement[1].addEventListener("click", () => {
if (!inputElement.value) {
showMessage(window.siyuan.languages._kernel[142]);
return;
}
confirmDialog("🔑 " + window.siyuan.languages.genKeyByPW, window.siyuan.languages.initRepoKeyTip, () => {
initDialog.destroy(); initDialog.destroy();
}); fetchPost("/api/repo/initRepoKeyFromPassphrase", {pass: inputElement.value}, (response) => {
btnsElement[1].addEventListener("click", () => { window.siyuan.config.repo.key = response.data.key;
if (!inputElement.value) { importKeyElement.parentElement.classList.add("fn__none");
showMessage(window.siyuan.languages._kernel[142]); importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
return;
}
confirmDialog("🔑 " + window.siyuan.languages.genKeyByPW, window.siyuan.languages.initRepoKeyTip, () => {
initDialog.destroy();
fetchPost("/api/repo/initRepoKeyFromPassphrase", {pass: inputElement.value}, (response) => {
window.siyuan.config.repo.key = response.data.key;
importKeyElement.parentElement.classList.add("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.remove("fn__none");
});
}); });
}); });
event.preventDefault(); });
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "copyKey") { break;
showMessage(window.siyuan.languages.copied); } else if (target.id === "copyKey") {
writeText(window.siyuan.config.repo.key); showMessage(window.siyuan.languages.copied);
event.preventDefault(); writeText(window.siyuan.config.repo.key);
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "removeKey") { break;
confirmDialog("⚠️ " + window.siyuan.languages.resetRepo, window.siyuan.languages.resetRepoTip, () => { } else if (target.id === "removeKey") {
fetchPost("/api/repo/resetRepo", {}, () => { confirmDialog("⚠️ " + window.siyuan.languages.resetRepo, window.siyuan.languages.resetRepoTip, () => {
window.siyuan.config.repo.key = ""; fetchPost("/api/repo/resetRepo", {}, () => {
window.siyuan.config.sync.enabled = false; window.siyuan.config.repo.key = "";
importKeyElement.parentElement.classList.remove("fn__none"); window.siyuan.config.sync.enabled = false;
importKeyElement.parentElement.nextElementSibling.classList.add("fn__none"); importKeyElement.parentElement.classList.remove("fn__none");
}); importKeyElement.parentElement.nextElementSibling.classList.add("fn__none");
}); });
event.preventDefault(); });
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "token") { break;
showMessage(window.siyuan.languages.copied); } else if (target.id === "token") {
writeText(window.siyuan.config.api.token); showMessage(window.siyuan.languages.copied);
event.preventDefault(); writeText(window.siyuan.config.api.token);
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "exportData") { break;
fetchPost("/api/export/exportData", {}, response => { } else if (target.id === "exportData") {
openByMobile(response.data.zip); fetchPost("/api/export/exportData", {}, response => {
}); openByMobile(response.data.zip);
event.preventDefault(); });
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "exportLog") { break;
fetchPost("/api/system/exportLog", {}, (response) => { } else if (target.id === "exportLog") {
openByMobile(response.data.zip); fetchPost("/api/system/exportLog", {}, (response) => {
}); openByMobile(response.data.zip);
event.preventDefault(); });
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.id === "creatWorkspace") { break;
const createWorkspaceDialog = new Dialog({ } else if (target.id === "creatWorkspace") {
title: window.siyuan.languages.new, const createWorkspaceDialog = new Dialog({
content: `<div class="b3-dialog__content"> title: window.siyuan.languages.new,
content: `<div class="b3-dialog__content">
<input class="b3-text-field fn__block"> <input class="b3-text-field fn__block">
</div> </div>
<div class="b3-dialog__action"> <div class="b3-dialog__action">
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button> <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>`, </div>`,
width: "80vw", width: "80vw",
}); });
const inputElement = createWorkspaceDialog.element.querySelector("input"); const inputElement = createWorkspaceDialog.element.querySelector("input");
inputElement.focus(); inputElement.focus();
const btnsElement = createWorkspaceDialog.element.querySelectorAll(".b3-button"); const btnsElement = createWorkspaceDialog.element.querySelectorAll(".b3-button");
btnsElement[0].addEventListener("click", () => { btnsElement[0].addEventListener("click", () => {
createWorkspaceDialog.destroy();
});
btnsElement[1].addEventListener("click", () => {
fetchPost("/api/system/createWorkspaceDir", {
path: pathPosix().join(pathPosix().dirname(window.siyuan.config.system.workspaceDir), inputElement.value)
}, () => {
genWorkspace(workspaceDirElement);
createWorkspaceDialog.destroy(); createWorkspaceDialog.destroy();
}); });
btnsElement[1].addEventListener("click", () => { });
fetchPost("/api/system/createWorkspaceDir", { event.preventDefault();
path: pathPosix().join(pathPosix().dirname(window.siyuan.config.system.workspaceDir), inputElement.value) event.stopPropagation();
}, () => { break;
genWorkspace(workspaceDirElement); } else if (target.getAttribute("data-type") === "remove") {
createWorkspaceDialog.destroy(); const p = target.parentElement.getAttribute("data-path");
}); fetchPost("/api/system/removeWorkspaceDir", {path: p}, () => {
genWorkspace(workspaceDirElement);
});
event.preventDefault();
event.stopPropagation();
break;
} else if (target.classList.contains("b3-list-item") && !target.classList.contains("b3-list-item--focus")) {
confirmDialog(window.siyuan.languages.confirm, `${pathPosix().basename(window.siyuan.config.system.workspaceDir)} -> ${pathPosix().basename(target.getAttribute("data-path"))}?`, () => {
fetchPost("/api/system/setWorkspaceDir", {
path: target.getAttribute("data-path")
}, () => {
exitSiYuan();
}); });
event.preventDefault(); });
event.stopPropagation(); event.preventDefault();
break; event.stopPropagation();
} else if (target.getAttribute("data-type") === "remove") { break;
const p = target.parentElement.getAttribute("data-path");
fetchPost("/api/system/removeWorkspaceDir", {path: p}, () => {
genWorkspace(workspaceDirElement);
});
event.preventDefault();
event.stopPropagation();
break;
} else if (target.classList.contains("b3-list-item") && !target.classList.contains("b3-list-item--focus")) {
confirmDialog(window.siyuan.languages.confirm, `${pathPosix().basename(window.siyuan.config.system.workspaceDir)} -> ${pathPosix().basename(target.getAttribute("data-path"))}?`, () => {
fetchPost("/api/system/setWorkspaceDir", {
path: target.getAttribute("data-path")
}, () => {
exitSiYuan();
});
});
event.preventDefault();
event.stopPropagation();
break;
}
target = target.parentElement;
} }
}); target = target.parentElement;
modelMainElement.querySelector("#importData").addEventListener("change", (event: InputEvent & { target: HTMLInputElement }) => {
const formData = new FormData();
formData.append("file", event.target.files[0]);
fetchPost("/api/import/importData", formData);
});
const networkServeElement = modelMainElement.querySelector("#networkServe") as HTMLInputElement;
networkServeElement.addEventListener("change", () => {
fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
exitSiYuan();
});
});
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuNewDaily") {
newDailyNote();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuCard") {
openCard();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuNewNotebook") {
newNotebook();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuHelp") {
mountHelp();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuLock") {
lockScreen();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuSync") {
closePanel();
modelElement.style.top = "0";
modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconCloud"></use>';
modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.cloud;
modelMainElement.innerHTML = repos.genHTML();
repos.element = modelMainElement;
repos.bindEvent();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuSyncNow") {
syncGuide();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuHistory" && !window.siyuan.config.readonly) {
openHistory();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuAccount") {
event.preventDefault();
event.stopPropagation();
closePanel();
if (document.querySelector("#menuAccount img")) {
showAccountInfo(modelElement, modelMainElement);
return;
} }
modelElement.style.top = "0"; });
modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconAccount"></use>'; modelMainElement.querySelector("#importData").addEventListener("change", (event: InputEvent & { target: HTMLInputElement }) => {
modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.login; const formData = new FormData();
modelMainElement.innerHTML = `<div class="b3-form__space" id="form1"> formData.append("file", event.target.files[0]);
fetchPost("/api/import/importData", formData);
});
const networkServeElement = modelMainElement.querySelector("#networkServe") as HTMLInputElement;
networkServeElement.addEventListener("change", () => {
fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
exitSiYuan();
});
});
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuNewDaily") {
newDailyNote();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuCard") {
openCard();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuNewNotebook") {
newNotebook();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuHelp") {
mountHelp();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuLock") {
lockScreen();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuSync") {
closePanel();
modelElement.style.top = "0";
modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconCloud"></use>';
modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.cloud;
modelMainElement.innerHTML = repos.genHTML();
repos.element = modelMainElement;
repos.bindEvent();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuSyncNow") {
syncGuide();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuHistory" && !window.siyuan.config.readonly) {
openHistory();
closePanel();
event.preventDefault();
event.stopPropagation();
break;
} else if (target.id === "menuAccount") {
event.preventDefault();
event.stopPropagation();
closePanel();
if (document.querySelector("#menuAccount img")) {
showAccountInfo(modelElement, modelMainElement);
return;
}
modelElement.style.top = "0";
modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconAccount"></use>';
modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.login;
modelMainElement.innerHTML = `<div class="b3-form__space" id="form1">
<div class="b3-form__icon"> <div class="b3-form__icon">
<svg class="b3-form__icon-icon"><use xlink:href="#iconAccount"></use></svg> <svg class="b3-form__icon-icon"><use xlink:href="#iconAccount"></use></svg>
<input id="userName" class="b3-text-field fn__block b3-form__icon-input" placeholder="${window.siyuan.languages.accountName}"> <input id="userName" class="b3-text-field fn__block b3-form__icon-input" placeholder="${window.siyuan.languages.accountName}">
@ -611,86 +609,85 @@ ${accountHTML}
<div class="fn__hr--b"></div> <div class="fn__hr--b"></div>
<button id="login2" class="b3-button fn__block">${window.siyuan.languages.login}</button> <button id="login2" class="b3-button fn__block">${window.siyuan.languages.login}</button>
</div>`; </div>`;
const agreeLoginElement = modelMainElement.querySelector("#agreeLogin") as HTMLInputElement; const agreeLoginElement = modelMainElement.querySelector("#agreeLogin") as HTMLInputElement;
const userNameElement = modelMainElement.querySelector("#userName") as HTMLInputElement; const userNameElement = modelMainElement.querySelector("#userName") as HTMLInputElement;
const userPasswordElement = modelMainElement.querySelector("#userPassword") as HTMLInputElement; const userPasswordElement = modelMainElement.querySelector("#userPassword") as HTMLInputElement;
const captchaImgElement = modelMainElement.querySelector("#captchaImg") as HTMLInputElement; const captchaImgElement = modelMainElement.querySelector("#captchaImg") as HTMLInputElement;
const captchaElement = modelMainElement.querySelector("#captcha") as HTMLInputElement; const captchaElement = modelMainElement.querySelector("#captcha") as HTMLInputElement;
const twofactorAuthCodeElement = modelMainElement.querySelector("#twofactorAuthCode") as HTMLInputElement; const twofactorAuthCodeElement = modelMainElement.querySelector("#twofactorAuthCode") as HTMLInputElement;
const loginBtnElement = modelMainElement.querySelector("#login") as HTMLButtonElement; const loginBtnElement = modelMainElement.querySelector("#login") as HTMLButtonElement;
const login2BtnElement = modelMainElement.querySelector("#login2") as HTMLButtonElement; const login2BtnElement = modelMainElement.querySelector("#login2") as HTMLButtonElement;
userNameElement.focus(); userNameElement.focus();
let token: string; let token: string;
let needCaptcha: string; let needCaptcha: string;
agreeLoginElement.addEventListener("click", () => { agreeLoginElement.addEventListener("click", () => {
if (agreeLoginElement.checked) { if (agreeLoginElement.checked) {
loginBtnElement.removeAttribute("disabled"); loginBtnElement.removeAttribute("disabled");
} else { } else {
loginBtnElement.setAttribute("disabled", "disabled"); loginBtnElement.setAttribute("disabled", "disabled");
}
});
captchaImgElement.addEventListener("click", () => {
captchaImgElement.setAttribute("src", `https://ld246.com/captcha/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`);
});
loginBtnElement.addEventListener("click", () => {
fetchPost("/api/account/login", {
userName: userNameElement.value.replace(/(^\s*)|(\s*$)/g, ""),
userPassword: md5(userPasswordElement.value),
captcha: captchaElement.value.replace(/(^\s*)|(\s*$)/g, ""),
}, (data) => {
if (data.code === 1) {
showMessage(data.msg);
if (data.data.needCaptcha) {
// 验证码
needCaptcha = data.data.needCaptcha;
captchaElement.parentElement.classList.remove("fn__none");
captchaElement.previousElementSibling.setAttribute("src",
`https://ld246.com/captcha/login?needCaptcha=${data.data.needCaptcha}`);
captchaElement.value = "";
return;
}
return;
} }
}); if (data.code === 10) {
captchaImgElement.addEventListener("click", () => { // 两步验证
captchaImgElement.setAttribute("src", `https://ld246.com/captcha/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`); modelMainElement.querySelector("#form1").classList.add("fn__none");
}); modelMainElement.querySelector("#form2").classList.remove("fn__none");
loginBtnElement.addEventListener("click", () => { twofactorAuthCodeElement.focus();
fetchPost("/api/account/login", { token = data.data.token;
userName: userNameElement.value.replace(/(^\s*)|(\s*$)/g, ""), return;
userPassword: md5(userPasswordElement.value), }
captcha: captchaElement.value.replace(/(^\s*)|(\s*$)/g, ""), fetchPost("/api/setting/getCloudUser", {
}, (data) => { token: data.data.token,
if (data.code === 1) { }, response => {
showMessage(data.msg); window.siyuan.user = response.data;
if (data.data.needCaptcha) { closePanel();
// 验证码 document.getElementById("menuAccount").innerHTML = `<img class="b3-list-item__graphic" src="${window.siyuan.user.userAvatarURL}"/>
needCaptcha = data.data.needCaptcha;
captchaElement.parentElement.classList.remove("fn__none");
captchaElement.previousElementSibling.setAttribute("src",
`https://ld246.com/captcha/login?needCaptcha=${data.data.needCaptcha}`);
captchaElement.value = "";
return;
}
return;
}
if (data.code === 10) {
// 两步验证
modelMainElement.querySelector("#form1").classList.add("fn__none");
modelMainElement.querySelector("#form2").classList.remove("fn__none");
twofactorAuthCodeElement.focus();
token = data.data.token;
return;
}
fetchPost("/api/setting/getCloudUser", {
token: data.data.token,
}, response => {
window.siyuan.user = response.data;
closePanel();
document.getElementById("menuAccount").innerHTML = `<img class="b3-list-item__graphic" src="${window.siyuan.user.userAvatarURL}"/>
<span class="b3-list-item__text">${window.siyuan.user.userName}</span>`; <span class="b3-list-item__text">${window.siyuan.user.userName}</span>`;
});
}); });
}); });
});
login2BtnElement.addEventListener("click", () => { login2BtnElement.addEventListener("click", () => {
fetchPost("/api/setting/login2faCloudUser", { fetchPost("/api/setting/login2faCloudUser", {
code: twofactorAuthCodeElement.value, code: twofactorAuthCodeElement.value,
token, token,
}, faResponse => { }, faResponse => {
fetchPost("/api/setting/getCloudUser", { fetchPost("/api/setting/getCloudUser", {
token: faResponse.data.token, token: faResponse.data.token,
}, response => { }, response => {
window.siyuan.user = response.data; window.siyuan.user = response.data;
closePanel(); closePanel();
document.getElementById("menuAccount").innerHTML = `<img class="b3-list-item__graphic" src="${window.siyuan.user.userAvatarURL}"/> document.getElementById("menuAccount").innerHTML = `<img class="b3-list-item__graphic" src="${window.siyuan.user.userAvatarURL}"/>
<span class="b3-list-item__text">${window.siyuan.user.userName}</span>`; <span class="b3-list-item__text">${window.siyuan.user.userName}</span>`;
});
}); });
}); });
break; });
} break;
target = target.parentElement;
} }
}); target = target.parentElement;
menuElement.style.right = "0"; }
scrimElement.classList.remove("fn__none");
}); });
menuElement.style.right = "0";
scrimElement.classList.remove("fn__none");
}; };

4
app/src/mobile/util/onMessage.ts
View file

@ -13,8 +13,12 @@ export const onMessage = (data: IWebSocketData) => {
document.querySelector("#menuSyncNow svg").classList.add("fn__rotate"); document.querySelector("#menuSyncNow svg").classList.add("fn__rotate");
} else { } else {
document.querySelector("#menuSyncNow svg").classList.remove("fn__rotate"); document.querySelector("#menuSyncNow svg").classList.remove("fn__rotate");
} }
} }
if (data.code !== 0) {
document.getElementById("transactionTip").classList.add("fn__none")
}
break; break;
case "create": case "create":
case "createdailynote": case "createdailynote":

7
app/src/protyle/wysiwyg/transaction.ts
View file

@ -17,6 +17,7 @@ import {genEmptyElement, genSBElement} from "../../block/util";
import {hideElements} from "../ui/hideElements"; import {hideElements} from "../ui/hideElements";
import {reloadProtyle} from "../util/reload"; import {reloadProtyle} from "../util/reload";
import {countBlockWord} from "../../layout/status"; import {countBlockWord} from "../../layout/status";
import {needSubscribe} from "../../util/needSubscribe";
const removeTopElement = (updateElement: Element, protyle: IProtyle) => { const removeTopElement = (updateElement: Element, protyle: IProtyle) => {
// 移动到其他文档中，该块需移除 // 移动到其他文档中，该块需移除
@ -73,6 +74,12 @@ const promiseTransaction = () => {
return; return;
} }
countBlockWord([], protyle.block.rootID, true); countBlockWord([], protyle.block.rootID, true);
/// #if MOBILE
if ((0 !== window.siyuan.config.sync.provider || (0 === window.siyuan.config.sync.provider && !needSubscribe(""))) &&
window.siyuan.config.repo.key && window.siyuan.config.sync.enabled) {
document.getElementById("transactionTip").classList.remove("fn__none")
}
/// #endif
if (response.data[0].doOperations[0].action === "setAttrs") { if (response.data[0].doOperations[0].action === "setAttrs") {
const gutterFoldElement = protyle.gutter.element.querySelector('[data-type="fold"]'); const gutterFoldElement = protyle.gutter.element.querySelector('[data-type="fold"]');
if (gutterFoldElement) { if (gutterFoldElement) {