diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index b4d409a94..62bf81b35 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "needLogin": "This feature requires login", "calcResultCountAll": "COUNT", "calcResultCountValues": "VALUES", "calcResultCountUniqueValues": "UNIQUE", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 5fd5fb926..385c51098 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "needLogin": "Esta función requiere iniciar sesión", "calcResultCountAll": "CONTAR", "calcResultCountValues": "VALORES", "calcResultCountUniqueValues": "ÚNICO", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index b3c33e7ef..6eceb3b28 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "needLogin": "Cette fonctionnalité nécessite une connexion", "calcResultCountAll": "COUNT", "calcResultCountValues": "VALEURS", "calcResultCountUniqueValues": "UNIQUE", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 83e5acfc5..407337b32 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "needLogin": "該功能需要登錄", "calcResultCountAll": "行計數", "calcResultCountValues": "值計數", "calcResultCountUniqueValues": "唯一值計數", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 8cc5cdaf9..98865aaca 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "needLogin": "该功能需要登录", "calcResultCountAll": "行计数", "calcResultCountValues": "值计数", "calcResultCountUniqueValues": "唯一值计数", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 660ae09f4..415cfe3b2 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: '@electron/remote': specifier: ^2.0.9 @@ -4463,7 +4467,3 @@ packages: dependencies: buffer-crc32: 0.2.13 fd-slicer: 1.1.0 - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss index dd4668a6f..e7d3ece09 100644 --- a/app/src/assets/scss/component/_menu.scss +++ b/app/src/assets/scss/component/_menu.scss @@ -116,7 +116,6 @@ height: 17px; width: 17px; margin: 0 16px 0 8px; - border-radius: var(--b3-border-radius); &--arrow { width: 12px; diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 889eaf96c..1427ea4ce 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -6,7 +6,7 @@ import {Constants} from "../constants"; import {disabledProtyle, onGet} from "../protyle/util/onGet"; import {hasClosestByAttribute, hasClosestByClassName} from "../protyle/util/hasClosest"; import {hideElements} from "../protyle/ui/hideElements"; -import {needSubscribe} from "../util/needSubscribe"; +import {needLogin, needSubscribe} from "../util/needSubscribe"; import {fullscreen} from "../protyle/breadcrumb/action"; import {MenuItem} from "../menus/Menu"; import {escapeHtml} from "../util/escape"; @@ -358,7 +358,8 @@ export const bindCardEvent = (options: { }, () => { /// #if MOBILE if (type !== "-3" && - (0 !== window.siyuan.config.sync.provider || (0 === window.siyuan.config.sync.provider && !needSubscribe(""))) && + ((0 !== window.siyuan.config.sync.provider && !needLogin("")) || + (0 === window.siyuan.config.sync.provider && !needSubscribe(""))) && window.siyuan.config.repo.key && window.siyuan.config.sync.enabled) { document.getElementById("toolbarSync").classList.remove("fn__none"); } diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 7ebb3b794..a6c777fb5 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -384,7 +384,7 @@ ${renewHTML} account.bindEvent(element); account.onSetaccount(); if (element.getAttribute("data-action") === "go-repos") { - if (needSubscribe()) { + if (needSubscribe("") && 0 === window.siyuan.config.sync.provider) { const dialogElement = hasClosestByClassName(element, "b3-dialog--open"); if (dialogElement) { dialogElement.querySelector('.b3-tab-bar [data-name="repos"]').dispatchEvent(new CustomEvent("click")); diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index 4a39db84b..2b1d8884c 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -1,4 +1,4 @@ -import {needSubscribe} from "../util/needSubscribe"; +import {needLogin, needSubscribe} from "../util/needSubscribe"; import {fetchPost} from "../util/fetch"; import {showMessage} from "../dialog/message"; import {bindSyncCloudListEvent, getSyncCloudList} from "../sync/syncGuide"; @@ -37,15 +37,18 @@ const renderProvider = (provider: number) => { return `