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

🐛 子菜单位置

Browse source
This commit is contained in:
Vanessa 2022-07-27 01:33:12 +08:00
parent 6652ac5352
commit 05958328f5
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/menus/Menu.ts
View file

@ -34,7 +34,8 @@ export class Menu {
const rect = subMenuElement.getBoundingClientRect(); const rect = subMenuElement.getBoundingClientRect();
let style = ""; let style = "";
const leftPosition = rect.left - this.element.clientWidth - rect.width const leftPosition = rect.left - this.element.clientWidth - rect.width
if (rect.right > window.innerWidth && Math.abs(leftPosition) < (rect.right - window.innerWidth)) { if (rect.right > window.innerWidth && (
leftPosition > 0 || Math.abs(leftPosition) < (rect.right - window.innerWidth))) {
if (leftPosition >= 0) { if (leftPosition >= 0) {
style = "left:auto;right:100%;"; style = "left:auto;right:100%;";
} else { } else {

4
app/src/protyle/markdown/highlightRender.ts
View file

@ -64,15 +64,15 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) =
language = "plaintext"; language = "plaintext";
} }
block.classList.add("hljs"); block.classList.add("hljs");
// TODO 等待讨论是否需要渲染 if (!hasClosestByAttribute(block, "id", "searchPreview", true) || isPreview) {
block.innerHTML = hljs.highlight( block.innerHTML = hljs.highlight(
block.textContent + (block.textContent.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609 block.textContent + (block.textContent.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609
{ {
language, language,
ignoreIllegals: true ignoreIllegals: true
}).value; }).value;
// }
block.setAttribute("data-render", "true"); block.setAttribute("data-render", "true");
const autoEnter = block.parentElement.getAttribute("linewrap"); const autoEnter = block.parentElement.getAttribute("linewrap");
const ligatures = block.parentElement.getAttribute("ligatures"); const ligatures = block.parentElement.getAttribute("ligatures");
const lineNumber = block.parentElement.getAttribute("linenumber"); const lineNumber = block.parentElement.getAttribute("linenumber");