Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 17:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ https://github.com/siyuan-note/siyuan/issues/8898

Browse source
This commit is contained in:
Vanessa 2023-08-03 12:37:14 +08:00
parent 85ad37af0a
commit cdbb363ad9
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/config/index.ts
View file

@ -14,6 +14,7 @@ import {Dialog} from "../dialog";
import {ai} from "./ai"; import {ai} from "./ai";
import {flashcard} from "./flashcard"; import {flashcard} from "./flashcard";
import {App} from "../index"; import {App} from "../index";
import {isHuawei} from "../protyle/util/compatibility";
export const genItemPanel = (type: string, containerElement: Element, app: App) => { export const genItemPanel = (type: string, containerElement: Element, app: App) => {
switch (type) { switch (type) {
@ -108,7 +109,7 @@ export const openSetting = (app: App) => {
<li data-name="image" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconImage"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.assets}</span></li> <li data-name="image" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconImage"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.assets}</span></li>
<li data-name="export" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconUpload"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.export}</span></li> <li data-name="export" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconUpload"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.export}</span></li>
<li data-name="appearance" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconTheme"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.appearance}</span></li> <li data-name="appearance" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconTheme"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.appearance}</span></li>
<li data-name="bazaar" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconBazaar"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.bazaar}</span></li> <li data-name="bazaar" class="b3-list-item${isHuawei() ? " fn__none" : ""}"><svg class="b3-list-item__graphic"><use xlink:href="#iconBazaar"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.bazaar}</span></li>
<li data-name="search" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconSearch"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.search}</span></li> <li data-name="search" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconSearch"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.search}</span></li>
<li data-name="keymap" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconKeymap"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.keymap}</span></li> <li data-name="keymap" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconKeymap"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.keymap}</span></li>
<li data-name="account" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconAccount"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.account}</span></li> <li data-name="account" class="b3-list-item"><svg class="b3-list-item__graphic"><use xlink:href="#iconAccount"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.account}</span></li>

18
app/src/layout/topBar.ts
View file

@ -1,5 +1,5 @@
import {getWorkspaceName} from "../util/noRelyPCFunction"; 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 {processSync} from "../dialog/processSystem";
import {goBack, goForward} from "../util/backForward"; import {goBack, goForward} from "../util/backForward";
import {syncGuide} from "../sync/syncGuide"; import {syncGuide} from "../sync/syncGuide";
@ -304,13 +304,15 @@ export const setZoom = (type: "zoomIn" | "zoomOut" | "restore") => {
const openPlugin = (app: App, target: Element) => { const openPlugin = (app: App, target: Element) => {
const menu = new Menu("topBarPlugin"); const menu = new Menu("topBarPlugin");
menu.addItem({ if(!isHuawei()) {
icon: "iconSettings", menu.addItem({
label: window.siyuan.languages.config, icon: "iconSettings",
click() { label: window.siyuan.languages.config,
openSetting(app).element.querySelector('.b3-tab-bar [data-name="bazaar"]').dispatchEvent(new CustomEvent("click")); click() {
} openSetting(app).element.querySelector('.b3-tab-bar [data-name="bazaar"]').dispatchEvent(new CustomEvent("click"));
}); }
});
}
menu.addItem({ menu.addItem({
icon: "iconLayoutBottom", icon: "iconLayoutBottom",
accelerator: window.siyuan.config.keymap.general.commandPanel.custom, accelerator: window.siyuan.config.keymap.general.commandPanel.custom,

4
app/src/mobile/menu/index.ts
View file

@ -16,6 +16,7 @@ import {initAbout} from "../settings/about";
import {getRecentDocs} from "./getRecentDocs"; import {getRecentDocs} from "./getRecentDocs";
import {initEditor} from "../settings/editor"; import {initEditor} from "../settings/editor";
import {App} from "../../index"; import {App} from "../../index";
import {isHuawei} from "../../protyle/util/compatibility";
export const popMenu = () => { export const popMenu = () => {
activeBlur(); activeBlur();
@ -40,9 +41,6 @@ export const initRightMenu = (app: App) => {
let aiHTML = `<div class="b3-menu__item${window.siyuan.config.readonly ? " fn__none" : ""}" id="menuAI"> let aiHTML = `<div class="b3-menu__item${window.siyuan.config.readonly ? " fn__none" : ""}" id="menuAI">
<svg class="b3-menu__icon"><use xlink:href="#iconSparkles"></use></svg><span class="b3-menu__label">AI</span> <svg class="b3-menu__icon"><use xlink:href="#iconSparkles"></use></svg><span class="b3-menu__label">AI</span>
</div>`; </div>`;
const isHuawei = () => {
return 0 < window.siyuan.config.system.osPlatform.toLowerCase().indexOf("huawei");
};
if (isHuawei()) { if (isHuawei()) {
// Access to the OpenAI API is no longer supported on Huawei devices https://github.com/siyuan-note/siyuan/issues/8192 // Access to the OpenAI API is no longer supported on Huawei devices https://github.com/siyuan-note/siyuan/issues/8192
aiHTML = ""; aiHTML = "";

4
app/src/protyle/util/compatibility.ts
View file

@ -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 = () => { export const isMac = () => {
return navigator.platform.toUpperCase().indexOf("MAC") > -1; return navigator.platform.toUpperCase().indexOf("MAC") > -1;
}; };