diff --git a/app/src/config/index.ts b/app/src/config/index.ts index c3d08836f..f9ecee49d 100644 --- a/app/src/config/index.ts +++ b/app/src/config/index.ts @@ -14,6 +14,7 @@ import {Dialog} from "../dialog"; import {ai} from "./ai"; import {flashcard} from "./flashcard"; import {App} from "../index"; +import {isHuawei} from "../protyle/util/compatibility"; export const genItemPanel = (type: string, containerElement: Element, app: App) => { switch (type) { @@ -108,7 +109,7 @@ export const openSetting = (app: App) => {
  • ${window.siyuan.languages.assets}
  • ${window.siyuan.languages.export}
  • ${window.siyuan.languages.appearance}
  • -
  • ${window.siyuan.languages.bazaar}
  • +
  • ${window.siyuan.languages.bazaar}
  • ${window.siyuan.languages.search}
  • ${window.siyuan.languages.keymap}
  • ${window.siyuan.languages.account}
  • diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index afa9d8591..e28de2ad8 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -1,5 +1,5 @@ import {getWorkspaceName} from "../util/noRelyPCFunction"; -import {setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility"; +import {isHuawei, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility"; import {processSync} from "../dialog/processSystem"; import {goBack, goForward} from "../util/backForward"; import {syncGuide} from "../sync/syncGuide"; @@ -304,13 +304,15 @@ export const setZoom = (type: "zoomIn" | "zoomOut" | "restore") => { const openPlugin = (app: App, target: Element) => { const menu = new Menu("topBarPlugin"); - menu.addItem({ - icon: "iconSettings", - label: window.siyuan.languages.config, - click() { - openSetting(app).element.querySelector('.b3-tab-bar [data-name="bazaar"]').dispatchEvent(new CustomEvent("click")); - } - }); + if(!isHuawei()) { + menu.addItem({ + icon: "iconSettings", + label: window.siyuan.languages.config, + click() { + openSetting(app).element.querySelector('.b3-tab-bar [data-name="bazaar"]').dispatchEvent(new CustomEvent("click")); + } + }); + } menu.addItem({ icon: "iconLayoutBottom", accelerator: window.siyuan.config.keymap.general.commandPanel.custom, diff --git a/app/src/mobile/menu/index.ts b/app/src/mobile/menu/index.ts index 8d99b41ab..867c78cc2 100644 --- a/app/src/mobile/menu/index.ts +++ b/app/src/mobile/menu/index.ts @@ -16,6 +16,7 @@ import {initAbout} from "../settings/about"; import {getRecentDocs} from "./getRecentDocs"; import {initEditor} from "../settings/editor"; import {App} from "../../index"; +import {isHuawei} from "../../protyle/util/compatibility"; export const popMenu = () => { activeBlur(); @@ -40,9 +41,6 @@ export const initRightMenu = (app: App) => { let aiHTML = ``; - const isHuawei = () => { - return 0 < window.siyuan.config.system.osPlatform.toLowerCase().indexOf("huawei"); - }; if (isHuawei()) { // Access to the OpenAI API is no longer supported on Huawei devices https://github.com/siyuan-note/siyuan/issues/8192 aiHTML = ""; diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index be8234359..05702a0b2 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -89,6 +89,10 @@ export const isCtrl = (event: KeyboardEvent | MouseEvent) => { } }; +export const isHuawei = () => { + return window.siyuan.config.system.osPlatform.toLowerCase().indexOf("huawei") > -1; +}; + export const isMac = () => { return navigator.platform.toUpperCase().indexOf("MAC") > -1; };