diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 373d4aa18..cd9b3c0c9 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "cloudConfigTip": "Please configure in [Settings - Cloud]", "confirmUninstall": "Are you sure you want to uninstall ${name}?", "scrollGetMore": "Don't panic... scroll up and down to load more", "flashcardNewCard": "New", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 7e14f393c..454f1712d 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "cloudConfigTip": "Configure en [Configuración - Nube]", "confirmUninstall": "¿Está seguro de que desea desinstalar ${name}?", "scrollGetMore": "No se asuste... desplácese hacia arriba y hacia abajo para cargar más", "flashcardNewCard": "Nueva Tarjeta", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d193d0232..f4be1adb9 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "cloudConfigTip": "Veuillez configurer dans [Paramètres - Cloud]", "confirmUninstall": "Êtes-vous sûr de vouloir désinstaller ${name} ?", "scrollGetMore": "Ne paniquez pas... faites défiler de haut en bas pour en charger plus", "flashcardNewCard": "Nouvelle carte", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 7deba67d8..e65f120b4 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "cloudConfigTip": "請在 [設置 - 雲端] 中進行配置", "confirmUninstall": "確定卸載 ${name} ？", "scrollGetMore": "不要驚慌...上下滾動即可加載更多內容", "flashcardNewCard": "新卡", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index c31c73050..7d58d8036 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "cloudConfigTip": "请在 [设置 - 云端] 中进行配置", "confirmUninstall": "确定卸载 ${name} ？", "scrollGetMore": "不要惊慌...上下滚动即可加载更多内容", "flashcardNewCard": "新卡", diff --git a/app/src/boot/globalShortcut.ts b/app/src/boot/globalShortcut.ts index ee29953f9..83289bb7f 100644 --- a/app/src/boot/globalShortcut.ts +++ b/app/src/boot/globalShortcut.ts @@ -593,7 +593,7 @@ export const globalShortcut = (app: App) => { if (!isTabWindow && matchHotKey(window.siyuan.config.keymap.general.syncNow.custom, event)) { event.preventDefault(); - syncGuide(document.querySelector("#barSync")); + syncGuide(app); return; } if (matchHotKey(window.siyuan.config.keymap.general.editMode.custom, event)) { diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 2aeca7c05..3e04960ea 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -362,22 +362,16 @@ ${window.siyuan.languages.account9} _afterLogin(userResponse: IWebSocketData, element: Element) { window.siyuan.user = userResponse.data; processSync(); - if (element.classList.contains("account") && !needSubscribe("")) { - const dialogElement = hasClosestByClassName(element, "b3-dialog--open"); - if (dialogElement) { - window.siyuan.dialogs.find((item) => { - if (item.element.isSameNode(dialogElement)) { - item.destroy(); - return true; - } - }); - syncGuide(); - return; - } - } element.innerHTML = account.genHTML(); account.bindEvent(element); account.onSetaccount(); + if (element.getAttribute("data-action") === "go-repos") { + const dialogElement = hasClosestByClassName(element, "b3-dialog--open"); + if (dialogElement) { + dialogElement.querySelector('.b3-tab-bar [data-name="repos"]').dispatchEvent(new CustomEvent("click")); + element.removeAttribute("data-action"); + } + } }, onSetaccount() { if (repos.element) { diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 3663fa199..0312ce774 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -73,7 +73,7 @@ export const initBar = (app: App) => { event.stopPropagation(); break; } else if (target.id === "barSync") { - syncGuide(target); + syncGuide(app); event.stopPropagation(); break; } else if (target.id === "barWorkspace") { diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.ts index a55081aa1..abb133184 100644 --- a/app/src/mobile/index.ts +++ b/app/src/mobile/index.ts @@ -74,7 +74,7 @@ class App { window.siyuan.user = userResponse.data; fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { window.siyuan.emojis = emojiResponse.data as IEmoji[]; - initFramework(); + initFramework(siyuanApp); initRightMenu(); loadPlugins(siyuanApp); openChangelog(); diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts index 371498073..fa099bba5 100644 --- a/app/src/mobile/util/initFramework.ts +++ b/app/src/mobile/util/initFramework.ts @@ -18,8 +18,9 @@ import {MobileTags} from "../dock/MobileTags"; import {activeBlur, hideKeyboardToolbar, initKeyboardToolbar} from "./keyboardToolbar"; import {syncGuide} from "../../sync/syncGuide"; import {Inbox} from "../../layout/dock/Inbox"; +import {App} from "../../index"; -export const initFramework = () => { +export const initFramework = (app: App) => { setInlineStyle(); renderSnippet(); initKeyboardToolbar(); @@ -122,7 +123,7 @@ export const initFramework = () => { fetchPost("/api/setting/setEditor", window.siyuan.config.editor); }); document.getElementById("toolbarSync").addEventListener(getEventName(), () => { - syncGuide(); + syncGuide(app); }); if (navigator.userAgent.indexOf("iPhone") > -1 && !window.siyuan.config.readonly && !window.siyuan.config.editor.readOnly) { // 不知道为什么 iPhone 中如果是编辑状态，点击文档后无法点击标题 diff --git a/app/src/sync/syncGuide.ts b/app/src/sync/syncGuide.ts index a00bf6cea..148b3d813 100644 --- a/app/src/sync/syncGuide.ts +++ b/app/src/sync/syncGuide.ts @@ -4,8 +4,9 @@ import {fetchPost} from "../util/fetch"; import {Dialog} from "../dialog"; import {confirmDialog} from "../dialog/confirmDialog"; import {isMobile} from "../util/functions"; -import {account} from "../config/account"; import {processSync} from "../dialog/processSystem"; +import {openSetting} from "../config"; +import {App} from "../index"; export const addCloudName = (cloudPanelElement: Element) => { const dialog = new Dialog({ @@ -82,7 +83,15 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb? fetchPost("/api/sync/listCloudSyncDir", {}, (response) => { let syncListHTML = `
`; if (response.code === 1) { - syncListHTML = `
`; + syncListHTML = `
+`; } else if (response.code !== 1) { syncListHTML = '