diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 173831ff5..78284d4ff 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -573,6 +573,7 @@ "--b3-protyle-inline-blockref-color": "Block Ref", "sync": "Sync", "syncNow": "Sync now", + "waitSync": "The editing data has not been synchronized to the cloud", "cloudBook": "Cloud Notebook", "paymentSum": "Cumulatively paid", "refresh": "Refresh", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 21d86f88c..70d85d13a 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -573,6 +573,7 @@ "--b3-protyle-inline-blockref-color": "Bloque Ref", "sync": "Sincronización", "syncNow": "Sincronizar ahora", + "waitSync": "Los datos de edición no se han sincronizado con la nube", "cloudBook": "Cuaderno de notas en la nube", "paymentSum": "Pagado acumulativamente", "refresh": "Actualizar", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 61d1078fb..e12a21882 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -573,6 +573,7 @@ "--b3-protyle-inline-blockref-color": "Ref Bloc", "sync": "Synchro", "syncNow": "Synchro maintenant", + "waitSync": "Les données d'édition n'ont pas été synchronisées avec le cloud", "cloudBook": "Carnet de notes du Cloud", "paymentSum": "Cumulativement payé", "refresh": "Rafraîchir", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index e3cbfc792..0c8adee30 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -573,6 +573,7 @@ "--b3-protyle-inline-blockref-color": "引用塊", "sync": "同步", "syncNow": "立即同步", + "waitSync": "編輯數據尚未同步到雲端", "cloudBook": "雲端筆記本", "payment": "累計已支付", "refresh": "重新整理", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index b2fc65f66..1c750a43c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -573,6 +573,7 @@ "--b3-protyle-inline-blockref-color": "引用块", "sync": "同步", "syncNow": "立即同步", + "waitSync": "编辑数据尚未同步到云端", "cloudBook": "云端笔记本", "paymentSum": "累计已支付", "refresh": "刷新", diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index cf3aad3c8..1fc4c2072 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -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 { fill: currentColor; display: inline-block; diff --git a/app/src/assets/template/mobile/index.tpl b/app/src/assets/template/mobile/index.tpl index 3ebad2d7a..75d5a5846 100644 --- a/app/src/assets/template/mobile/index.tpl +++ b/app/src/assets/template/mobile/index.tpl @@ -72,5 +72,6 @@ +
diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.ts index c33cee426..2055c8150 100644 --- a/app/src/mobile/index.ts +++ b/app/src/mobile/index.ts @@ -55,9 +55,12 @@ class App { loadAssets(confResponse.data.conf.appearance); initMessage(); initAssets(); - fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { - window.siyuan.emojis = emojiResponse.data as IEmoji[]; - initFramework(); + fetchPost("/api/setting/getCloudUser", {}, userResponse => { + window.siyuan.user = userResponse.data; + fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { + window.siyuan.emojis = emojiResponse.data as IEmoji[]; + initFramework(); + }); }); addGA(); }); diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts index fb42cce9b..f70db127d 100644 --- a/app/src/mobile/util/initFramework.ts +++ b/app/src/mobile/util/initFramework.ts @@ -19,6 +19,7 @@ import {MobileBookmarks} from "./MobileBookmarks"; import {MobileTags} from "./MobileTags"; import {hideKeyboardToolbar, initKeyboardToolbar} from "./showKeyboardToolbar"; import {getSearch} from "../../util/functions"; +import {syncGuide} from "../../sync/syncGuide"; export const initFramework = () => { setInlineStyle(); @@ -154,6 +155,11 @@ export const initFramework = () => { if (window.siyuan.config.newbie) { mountHelp(); } + const transactionTipElement = document.getElementById("transactionTip"); + transactionTipElement.innerHTML = `${window.siyuan.languages.waitSync} ` + transactionTipElement.querySelector(".b3-button").addEventListener(getEventName(), () => { + syncGuide(); + }); }; const initEditorName = () => { diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts index aa95eebb6..a040ee67d 100644 --- a/app/src/mobile/util/menu.ts +++ b/app/src/mobile/util/menu.ts @@ -121,20 +121,18 @@ export const popMenu = () => { return; } - fetchPost("/api/setting/getCloudUser", {}, userResponse => { - window.siyuan.user = userResponse.data; - let accountHTML = ""; - if (window.siyuan.user) { - accountHTML = `
+ let accountHTML = ""; + if (window.siyuan.user) { + accountHTML = `
${window.siyuan.user.userName}
`; - } else { - accountHTML = `
+ } else { + accountHTML = `
${window.siyuan.languages.login}
`; - } - menuElement.innerHTML = `
+ } + menuElement.innerHTML = `
${window.siyuan.languages.search}
@@ -172,35 +170,35 @@ ${accountHTML}
${window.siyuan.languages.safeQuit}
`; - // 只能用 click，否则无法上下滚动 https://github.com/siyuan-note/siyuan/issues/6628 - menuElement.addEventListener("click", (event) => { - let target = event.target as HTMLElement; - while (target && !target.isEqualNode(menuElement)) { - if (target.id === "menuSearch") { - popSearch(modelElement, modelMainElement); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "menuAppearance") { - initAppearance(modelElement, modelMainElement); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "menuSafeQuit") { - exitSiYuan(); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "menuAbout") { - closePanel(); - 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 = ["127.0.0.1"]; - } - modelElement.style.top = "0"; - modelElement.querySelector(".toolbar__icon").innerHTML = ''; - modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.about; - modelMainElement.innerHTML = `
+ // 只能用 click，否则无法上下滚动 https://github.com/siyuan-note/siyuan/issues/6628 + menuElement.addEventListener("click", (event) => { + let target = event.target as HTMLElement; + while (target && !target.isEqualNode(menuElement)) { + if (target.id === "menuSearch") { + popSearch(modelElement, modelMainElement); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "menuAppearance") { + initAppearance(modelElement, modelMainElement); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "menuSafeQuit") { + exitSiYuan(); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "menuAbout") { + closePanel(); + 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 = ["127.0.0.1"]; + } + modelElement.style.top = "0"; + modelElement.querySelector(".toolbar__icon").innerHTML = ''; + modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.about; + modelMainElement.innerHTML = `
${window.siyuan.languages.about11}
${window.siyuan.languages.about12}
@@ -318,261 +316,261 @@ ${accountHTML}
会泽百家 至公天下
${window.siyuan.languages.about1}
`; - const workspaceDirElement = modelMainElement.querySelector("#workspaceDir"); - genWorkspace(workspaceDirElement); - const importKeyElement = modelMainElement.querySelector("#importKey"); - modelMainElement.addEventListener("click", (event) => { - let target = event.target as HTMLElement; - while (target && !target.isSameNode(modelMainElement)) { - if (target.id === "authCode") { - setAccessAuthCode(); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "importKey") { - const passwordDialog = new Dialog({ - title: "🔑 " + window.siyuan.languages.key, - content: `
+ const workspaceDirElement = modelMainElement.querySelector("#workspaceDir"); + genWorkspace(workspaceDirElement); + const importKeyElement = modelMainElement.querySelector("#importKey"); + modelMainElement.addEventListener("click", (event) => { + let target = event.target as HTMLElement; + while (target && !target.isSameNode(modelMainElement)) { + if (target.id === "authCode") { + setAccessAuthCode(); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "importKey") { + const passwordDialog = new Dialog({ + title: "🔑 " + window.siyuan.languages.key, + content: `
`, - width: "80vw", - }); - const textAreaElement = passwordDialog.element.querySelector("textarea"); - textAreaElement.focus(); - const btnsElement = passwordDialog.element.querySelectorAll(".b3-button"); - btnsElement[0].addEventListener("click", () => { + width: "80vw", + }); + const textAreaElement = passwordDialog.element.querySelector("textarea"); + textAreaElement.focus(); + const btnsElement = passwordDialog.element.querySelectorAll(".b3-button"); + 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(); }); - 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(); - }); + }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "initKey") { + 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(); - break; - } else if (target.id === "initKey") { - 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(); - break; - } else if (target.id === "initKeyByPW") { - const initDialog = new Dialog({ - title: "🔑 " + window.siyuan.languages.genKeyByPW, - content: `
+ }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "initKeyByPW") { + const initDialog = new Dialog({ + title: "🔑 " + window.siyuan.languages.genKeyByPW, + content: `
`, - width: "80vw", - }); - const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement; - inputElement.focus(); - const btnsElement = initDialog.element.querySelectorAll(".b3-button"); - initDialog.bindInput(inputElement, () => { - (btnsElement[1] as HTMLButtonElement).click(); - }); - btnsElement[0].addEventListener("click", () => { + width: "80vw", + }); + const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement; + inputElement.focus(); + const btnsElement = initDialog.element.querySelectorAll(".b3-button"); + initDialog.bindInput(inputElement, () => { + (btnsElement[1] as HTMLButtonElement).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(); - }); - 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(); - 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"); - }); + 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(); - break; - } else if (target.id === "copyKey") { - showMessage(window.siyuan.languages.copied); - writeText(window.siyuan.config.repo.key); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "removeKey") { - confirmDialog("⚠️ " + window.siyuan.languages.resetRepo, window.siyuan.languages.resetRepoTip, () => { - fetchPost("/api/repo/resetRepo", {}, () => { - window.siyuan.config.repo.key = ""; - window.siyuan.config.sync.enabled = false; - importKeyElement.parentElement.classList.remove("fn__none"); - importKeyElement.parentElement.nextElementSibling.classList.add("fn__none"); - }); + }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "copyKey") { + showMessage(window.siyuan.languages.copied); + writeText(window.siyuan.config.repo.key); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "removeKey") { + confirmDialog("⚠️ " + window.siyuan.languages.resetRepo, window.siyuan.languages.resetRepoTip, () => { + fetchPost("/api/repo/resetRepo", {}, () => { + window.siyuan.config.repo.key = ""; + window.siyuan.config.sync.enabled = false; + importKeyElement.parentElement.classList.remove("fn__none"); + importKeyElement.parentElement.nextElementSibling.classList.add("fn__none"); }); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "token") { - showMessage(window.siyuan.languages.copied); - writeText(window.siyuan.config.api.token); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "exportData") { - fetchPost("/api/export/exportData", {}, response => { - openByMobile(response.data.zip); - }); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "exportLog") { - fetchPost("/api/system/exportLog", {}, (response) => { - openByMobile(response.data.zip); - }); - event.preventDefault(); - event.stopPropagation(); - break; - } else if (target.id === "creatWorkspace") { - const createWorkspaceDialog = new Dialog({ - title: window.siyuan.languages.new, - content: `
+ }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "token") { + showMessage(window.siyuan.languages.copied); + writeText(window.siyuan.config.api.token); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "exportData") { + fetchPost("/api/export/exportData", {}, response => { + openByMobile(response.data.zip); + }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "exportLog") { + fetchPost("/api/system/exportLog", {}, (response) => { + openByMobile(response.data.zip); + }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.id === "creatWorkspace") { + const createWorkspaceDialog = new Dialog({ + title: window.siyuan.languages.new, + content: `
`, - width: "80vw", - }); - const inputElement = createWorkspaceDialog.element.querySelector("input"); - inputElement.focus(); - const btnsElement = createWorkspaceDialog.element.querySelectorAll(".b3-button"); - btnsElement[0].addEventListener("click", () => { + width: "80vw", + }); + const inputElement = createWorkspaceDialog.element.querySelector("input"); + inputElement.focus(); + const btnsElement = createWorkspaceDialog.element.querySelectorAll(".b3-button"); + 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(); }); - btnsElement[1].addEventListener("click", () => { - fetchPost("/api/system/createWorkspaceDir", { - path: pathPosix().join(pathPosix().dirname(window.siyuan.config.system.workspaceDir), inputElement.value) - }, () => { - genWorkspace(workspaceDirElement); - createWorkspaceDialog.destroy(); - }); + }); + event.preventDefault(); + event.stopPropagation(); + break; + } else if (target.getAttribute("data-type") === "remove") { + 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; - } else if (target.getAttribute("data-type") === "remove") { - 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; + }); + event.preventDefault(); + event.stopPropagation(); + break; } - }); - 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 = ''; - 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; + target = target.parentElement; } - modelElement.style.top = "0"; - modelElement.querySelector(".toolbar__icon").innerHTML = ''; - modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.login; - modelMainElement.innerHTML = `
+ }); + 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 = ''; + 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 = ''; + modelElement.querySelector(".toolbar__text").textContent = window.siyuan.languages.login; + modelMainElement.innerHTML = `
@@ -611,86 +609,85 @@ ${accountHTML}
`; - const agreeLoginElement = modelMainElement.querySelector("#agreeLogin") as HTMLInputElement; - const userNameElement = modelMainElement.querySelector("#userName") as HTMLInputElement; - const userPasswordElement = modelMainElement.querySelector("#userPassword") as HTMLInputElement; - const captchaImgElement = modelMainElement.querySelector("#captchaImg") as HTMLInputElement; - const captchaElement = modelMainElement.querySelector("#captcha") as HTMLInputElement; - const twofactorAuthCodeElement = modelMainElement.querySelector("#twofactorAuthCode") as HTMLInputElement; - const loginBtnElement = modelMainElement.querySelector("#login") as HTMLButtonElement; - const login2BtnElement = modelMainElement.querySelector("#login2") as HTMLButtonElement; - userNameElement.focus(); - let token: string; - let needCaptcha: string; - agreeLoginElement.addEventListener("click", () => { - if (agreeLoginElement.checked) { - loginBtnElement.removeAttribute("disabled"); - } else { - loginBtnElement.setAttribute("disabled", "disabled"); + const agreeLoginElement = modelMainElement.querySelector("#agreeLogin") as HTMLInputElement; + const userNameElement = modelMainElement.querySelector("#userName") as HTMLInputElement; + const userPasswordElement = modelMainElement.querySelector("#userPassword") as HTMLInputElement; + const captchaImgElement = modelMainElement.querySelector("#captchaImg") as HTMLInputElement; + const captchaElement = modelMainElement.querySelector("#captcha") as HTMLInputElement; + const twofactorAuthCodeElement = modelMainElement.querySelector("#twofactorAuthCode") as HTMLInputElement; + const loginBtnElement = modelMainElement.querySelector("#login") as HTMLButtonElement; + const login2BtnElement = modelMainElement.querySelector("#login2") as HTMLButtonElement; + userNameElement.focus(); + let token: string; + let needCaptcha: string; + agreeLoginElement.addEventListener("click", () => { + if (agreeLoginElement.checked) { + loginBtnElement.removeAttribute("disabled"); + } else { + 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; } - }); - 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) { - // 两步验证 - 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 = ` + 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 = ` ${window.siyuan.user.userName}`; - }); }); }); + }); - login2BtnElement.addEventListener("click", () => { - fetchPost("/api/setting/login2faCloudUser", { - code: twofactorAuthCodeElement.value, - token, - }, faResponse => { - fetchPost("/api/setting/getCloudUser", { - token: faResponse.data.token, - }, response => { - window.siyuan.user = response.data; - closePanel(); - document.getElementById("menuAccount").innerHTML = ` + login2BtnElement.addEventListener("click", () => { + fetchPost("/api/setting/login2faCloudUser", { + code: twofactorAuthCodeElement.value, + token, + }, faResponse => { + fetchPost("/api/setting/getCloudUser", { + token: faResponse.data.token, + }, response => { + window.siyuan.user = response.data; + closePanel(); + document.getElementById("menuAccount").innerHTML = ` ${window.siyuan.user.userName}`; - }); }); }); - break; - } - target = target.parentElement; + }); + break; } - }); - menuElement.style.right = "0"; - scrimElement.classList.remove("fn__none"); + target = target.parentElement; + } }); + menuElement.style.right = "0"; + scrimElement.classList.remove("fn__none"); }; diff --git a/app/src/mobile/util/onMessage.ts b/app/src/mobile/util/onMessage.ts index 69ac3d941..cf0363ea7 100644 --- a/app/src/mobile/util/onMessage.ts +++ b/app/src/mobile/util/onMessage.ts @@ -13,8 +13,12 @@ export const onMessage = (data: IWebSocketData) => { document.querySelector("#menuSyncNow svg").classList.add("fn__rotate"); } else { document.querySelector("#menuSyncNow svg").classList.remove("fn__rotate"); + } } + if (data.code !== 0) { + document.getElementById("transactionTip").classList.add("fn__none") + } break; case "create": case "createdailynote": diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts index b20f1c1fb..0ed73e978 100644 --- a/app/src/protyle/wysiwyg/transaction.ts +++ b/app/src/protyle/wysiwyg/transaction.ts @@ -17,6 +17,7 @@ import {genEmptyElement, genSBElement} from "../../block/util"; import {hideElements} from "../ui/hideElements"; import {reloadProtyle} from "../util/reload"; import {countBlockWord} from "../../layout/status"; +import {needSubscribe} from "../../util/needSubscribe"; const removeTopElement = (updateElement: Element, protyle: IProtyle) => { // 移动到其他文档中，该块需移除 @@ -73,6 +74,12 @@ const promiseTransaction = () => { return; } 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") { const gutterFoldElement = protyle.gutter.element.querySelector('[data-type="fold"]'); if (gutterFoldElement) {