From 370df7866cf1a916637ac8ed1eb6f87d59053da8 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 20 Jun 2022 22:10:20 +0800 Subject: [PATCH] :bug: fix https://github.com/siyuan-note/siyuan/issues/5254 --- app/src/assets/scss/base.scss | 2 ++ app/src/mobile/editor.ts | 2 ++ app/src/mobile/util/MobileFiles.ts | 3 +++ 3 files changed, 7 insertions(+) diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 932581d8f..a8670d344 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -46,6 +46,7 @@ ctrl+p 搜索: 199 // 需大于 .block__popover .b3-menu: 210 +// 需小于 .b3-dialog 关于中的锁屏密码设置 .side-panel: 220 // 需小于 #windowControls @@ -53,6 +54,7 @@ ctrl+p 搜索: 199 .b3-dialog: 305 // 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107 +// 移动端排序和菜单需临时大于 .side-panel https://github.com/siyuan-note/siyuan/issues/5254 .b3-menu: 310 // 需大于 .b3-dialog diff --git a/app/src/mobile/editor.ts b/app/src/mobile/editor.ts index 6584e1d4b..0032e6752 100644 --- a/app/src/mobile/editor.ts +++ b/app/src/mobile/editor.ts @@ -11,10 +11,12 @@ import {scrollCenter} from "../util/highlightById"; import {lockFile} from "../dialog/processSystem"; import {hasClosestByAttribute} from "../protyle/util/hasClosest"; import {setEditMode} from "../protyle/util/setEditMode"; +import {hideElements} from "../protyle/ui/hideElements"; export const openMobileFileById = (id: string, hasContext?: boolean, action = [Constants.CB_GET_HL], pushStack = true) => { window.localStorage.setItem(Constants.LOCAL_DOCINFO, JSON.stringify({id, hasContext, action})); if (window.siyuan.mobileEditor) { + hideElements(["toolbar", "hint", "util"], window.siyuan.mobileEditor.protyle); if (window.siyuan.mobileEditor.protyle.contentElement.classList.contains("fn__none")) { setEditMode(window.siyuan.mobileEditor.protyle, "wysiwyg"); } diff --git a/app/src/mobile/util/MobileFiles.ts b/app/src/mobile/util/MobileFiles.ts index 5d523576c..bdf9c3484 100644 --- a/app/src/mobile/util/MobileFiles.ts +++ b/app/src/mobile/util/MobileFiles.ts @@ -178,6 +178,7 @@ export class MobileFiles extends Model { newFile(notebookId, pathString, true); } else if (type === "more-root") { initNavigationMenu(target.parentElement).popup({x, y}); + window.siyuan.menus.menu.element.style.zIndex = "310"; } } if (type === "more-file") { @@ -185,6 +186,7 @@ export class MobileFiles extends Model { x, y }); + window.siyuan.menus.menu.element.style.zIndex = "310"; } } event.preventDefault(); @@ -310,6 +312,7 @@ export class MobileFiles extends Model { clickEvent(6); } }).element); + window.siyuan.menus.menu.element.style.zIndex = "310"; window.siyuan.menus.menu.popup({x: event.clientX, y: event.clientY}); }