♻️: merge branch 'next' into feat-popup-menu

This commit is contained in:
sight 2022-07-01 18:11:15 +08:00
parent 9b02804d17
commit 03ffdb5a9f

View File

@ -344,7 +344,9 @@ export function removeNotifiyFromQueen(layerId: string | undefined) {
// 间隙 // 间隙
let transOffsetTop = 15; let transOffsetTop = 15;
// @ts-ignore 删除项的高度 // @ts-ignore 删除项的高度
let offsetHeight = document.getElementById(layerId)?.firstElementChild?.firstElementChild?.offsetHeight; let offsetHeight =
document.getElementById(layerId)?.firstElementChild?.firstElementChild
?.offsetHeight;
// @ts-ignore // @ts-ignore
window.NotifiyQueen = window.NotifiyQueen || []; window.NotifiyQueen = window.NotifiyQueen || [];
// @ts-ignore // @ts-ignore
@ -364,10 +366,14 @@ export function removeNotifiyFromQueen(layerId: string | undefined) {
?.firstElementChild; ?.firstElementChild;
if (offsetType === "rt" || offsetType === "lt") { if (offsetType === "rt" || offsetType === "lt") {
// @ts-ignore // @ts-ignore
dom.style["top"] = parseFloat(dom.style["top"]) - transOffsetTop - offsetHeight + "px"; dom.style["top"] =
parseFloat(dom.style["top"]) - transOffsetTop - offsetHeight + "px";
} else { } else {
// @ts-ignore // @ts-ignore
let bottom = parseFloat(dom.style["top"].split(" - ")[1]) - transOffsetTop - offsetHeight; let bottom =
parseFloat(dom.style["top"].split(" - ")[1]) -
transOffsetTop -
offsetHeight;
// @ts-ignore // @ts-ignore
dom.style["top"] = "calc(100vh - " + bottom + "px)"; dom.style["top"] = "calc(100vh - " + bottom + "px)";
} }