diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 3f1aef080..bc660f6e3 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -6,7 +6,7 @@ import {Constants} from "../constants"; import {onGet} from "../protyle/util/onGet"; import {hasClosestByAttribute, hasClosestByClassName} from "../protyle/util/hasClosest"; import {hideElements} from "../protyle/ui/hideElements"; -import {needLogin, needSubscribe} from "../util/needSubscribe"; +import {isPaidUser, needSubscribe} from "../util/needSubscribe"; import {fullscreen} from "../protyle/breadcrumb/action"; import {MenuItem} from "../menus/Menu"; import {escapeHtml} from "../util/escape"; @@ -394,7 +394,7 @@ export const bindCardEvent = (options: { }, () => { /// #if MOBILE if (type !== "-3" && - ((0 !== window.siyuan.config.sync.provider && !needLogin("")) || + ((0 !== window.siyuan.config.sync.provider && isPaidUser()) || (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/repos.ts b/app/src/config/repos.ts index 813353ceb..f91e9f19b 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -1,4 +1,4 @@ -import {needLogin, needSubscribe} from "../util/needSubscribe"; +import {isPaidUser, needSubscribe} from "../util/needSubscribe"; import {fetchPost} from "../util/fetch"; import {showMessage} from "../dialog/message"; import {bindSyncCloudListEvent, getSyncCloudList} from "../sync/syncGuide"; @@ -38,8 +38,8 @@ const renderProvider = (provider: number) => { ${window.siyuan.languages.syncOfficialProviderIntro} `; } - if (needLogin("")) { - return `
${window.siyuan.languages.needLogin}
`; + if (!isPaidUser()) { + return `
${window.siyuan.languages["_kernel"][214]}
`; } if (provider === 2) { return `
@@ -235,7 +235,7 @@ const bindProviderEvent = () => { loadingElement.classList.add("fn__none"); let nextElement = reposDataElement.nextElementSibling; while (nextElement) { - if (!needLogin("")) { + if (isPaidUser()) { nextElement.classList.remove("fn__none"); } else { nextElement.classList.add("fn__none"); diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts index f9ccf52ab..37b2f9f76 100644 --- a/app/src/protyle/wysiwyg/transaction.ts +++ b/app/src/protyle/wysiwyg/transaction.ts @@ -17,7 +17,7 @@ import {genEmptyElement, genSBElement} from "../../block/util"; import {hideElements} from "../ui/hideElements"; import {reloadProtyle} from "../util/reload"; import {countBlockWord} from "../../layout/status"; -import {needLogin, needSubscribe} from "../../util/needSubscribe"; +import {isPaidUser, needSubscribe} from "../../util/needSubscribe"; import {resize} from "../util/resize"; const removeTopElement = (updateElement: Element, protyle: IProtyle) => { @@ -74,7 +74,7 @@ const promiseTransaction = () => { promiseTransaction(); } /// #if MOBILE - if (((0 !== window.siyuan.config.sync.provider && !needLogin("")) || + if (((0 !== window.siyuan.config.sync.provider && isPaidUser()) || (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/search/assets.ts b/app/src/search/assets.ts index ff9ad040f..10be9b671 100644 --- a/app/src/search/assets.ts +++ b/app/src/search/assets.ts @@ -190,6 +190,12 @@ export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOpti orderBy: localSearch.sort }, (response) => { element.nextElementSibling.classList.add("fn__none"); + if (response.code === 1) { + element.querySelector("#searchAssetList").innerHTML = `
+ ${window.siyuan.languages["_kernel"][214]} +
`; + return; + } const nextElement = element.querySelector('[data-type="assetNext"]'); if (page < response.data.pageCount) { nextElement.removeAttribute("disabled"); diff --git a/app/src/sync/syncGuide.ts b/app/src/sync/syncGuide.ts index 298d65d1a..690e89b30 100644 --- a/app/src/sync/syncGuide.ts +++ b/app/src/sync/syncGuide.ts @@ -1,4 +1,4 @@ -import {needLogin, needSubscribe} from "../util/needSubscribe"; +import {isPaidUser, needSubscribe} from "../util/needSubscribe"; import {showMessage} from "../dialog/message"; import {fetchPost} from "../util/fetch"; import {Dialog} from "../dialog"; @@ -147,7 +147,8 @@ export const syncGuide = (app?: App) => { } /// #if MOBILE if ((0 === window.siyuan.config.sync.provider && needSubscribe()) || - (0 !== window.siyuan.config.sync.provider && needLogin())) { + (0 !== window.siyuan.config.sync.provider && !isPaidUser())) { + showMessage(window.siyuan.languages["_kernel"][214]); return; } /// #else @@ -164,10 +165,8 @@ export const syncGuide = (app?: App) => { } return; } - if (0 !== window.siyuan.config.sync.provider && needLogin("") && app) { - const dialogSetting = openSetting(app); - dialogSetting.element.querySelector('.b3-tab-bar [data-name="account"]').dispatchEvent(new CustomEvent("click")); - dialogSetting.element.querySelector('.config__tab-container[data-name="account"]').setAttribute("data-action", "go-repos"); + if (0 !== window.siyuan.config.sync.provider && !isPaidUser() && app) { + showMessage(window.siyuan.languages["_kernel"][214]); return; } /// #endif diff --git a/app/src/util/needSubscribe.ts b/app/src/util/needSubscribe.ts index 76e49ead6..6ba7848a6 100644 --- a/app/src/util/needSubscribe.ts +++ b/app/src/util/needSubscribe.ts @@ -1,16 +1,6 @@ import {showMessage} from "../dialog/message"; import {getCloudURL} from "../config/util/about"; -export const needLogin = (tip = window.siyuan.languages.needLogin) => { - if (window.siyuan.user) { - return false; - } - if (tip) { - showMessage(tip); - } - return true; -}; - export const needSubscribe = (tip = window.siyuan.languages._kernel[29]) => { if (window.siyuan.user && (window.siyuan.user.userSiYuanProExpireTime === -1 || window.siyuan.user.userSiYuanProExpireTime > 0)) { return false;