github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-25 14:04:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

✨ fix https://github.com/siyuan-note/siyuan/issues/5773

Browse Source
This commit is contained in:
Vanessa 2022-09-04 21:51:18 +08:00
parent 00a4d42abb
commit 67f0c26360
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/assets/scss/_layout.scss
View File

@ -118,11 +118,16 @@
flex: 1;
min-height: 30px;
&:not(:last-child) {
&:not(:last-child),
&:last-child:not(.item--focus):not(.item--readonly) {
box-shadow: 2px -26px 0px 0px var(--b3-theme-surface), 1px -4px 1px 0px var(--b3-theme-on-surface-light);
}
&:hover:not(.item--focus) {
&:last-child:not(.item--readonly) {
margin-right: 2px;
}
&:hover:not(.item--focus):not(.item--readonly) {
background-color: var(--b3-list-hover);
box-shadow: none;
border-radius: 4px 4px 0 0;

40
app/src/layout/Wnd.ts
View File

@ -26,6 +26,8 @@ import {getAllModels} from "./getAll";
import {countBlockWord} from "./status";
import {saveScroll} from "../protyle/scroll/saveScroll";
import {Asset} from "../asset";
import {newFile} from "../util/newFile";
import {MenuItem} from "../menus/Menu";
export class Wnd {
public id: string;
@ -45,7 +47,15 @@ export class Wnd {
dragHTML = "";
}
this.element.innerHTML = `<div data-type="wnd" data-id="${this.id}" class="fn__flex-column fn__flex fn__flex-1">
<ul class="fn__flex layout-tab-bar"></ul>
<div class="fn__flex fn__none">
<ul class="fn__flex layout-tab-bar fn__flex-1"></ul>
<ul class="layout-tab-bar">
<li class="item item--readonly">
<span data-type="new" class="item__close" title="${window.siyuan.languages.newFile}"><svg style="height: 10px;width: 10px;padding: 3px"><use xlink:href="#iconAdd"></use></svg></span>
<span data-type="more" data-menu="true" class="item__close" title="${window.siyuan.languages.more}"><svg><use xlink:href="#iconDown"></use></svg></span>
</li>
</ul>
</div>
<div class="layout-tab-container fn__flex-1">${dragHTML}</div>
</div>`;
this.headersElement = this.element.querySelector(".layout-tab-bar");
@ -70,10 +80,16 @@ export class Wnd {
this.headersElement.addEventListener("mousewheel", (event: WheelEvent) => {
this.headersElement.scrollLeft = this.headersElement.scrollLeft + event.deltaY;
}, {passive: true});
this.headersElement.addEventListener("click", (event) => {
this.headersElement.parentElement.addEventListener("click", (event) => {
let target = event.target as HTMLElement;
while (target && !target.isEqualNode(this.headersElement)) {
if (target.tagName === "LI") {
if (target.classList.contains("item__close") && target.getAttribute("data-type") === "new") {
newFile(undefined, undefined, true);
break;
} else if (target.classList.contains("item__close") && target.getAttribute("data-type") === "more") {
this.renderTabList(event);
break;
} else if (target.tagName === "LI" && target.getAttribute("data-id")) {
this.switchTab(target, true);
break;
}
@ -394,6 +410,7 @@ export class Wnd {
this.children.splice(oldFocusIndex + 1, 0, tab);
if (tab.headElement) {
this.headersElement.parentElement.classList.remove("fn__none");
if (this.headersElement.childElementCount === 0) {
this.headersElement.append(tab.headElement);
} else {
@ -436,6 +453,23 @@ export class Wnd {
}
}
private renderTabList(event: MouseEvent) {
window.siyuan.menus.menu.remove()
Array.from(this.headersElement.children).forEach((item: HTMLElement) => {
window.siyuan.menus.menu.append(new MenuItem({
label: item.querySelector(".item__text").textContent,
click: () => {
this.switchTab(item, true);
},
current: item.classList.contains("item--focus")
}).element);
})
window.siyuan.menus.menu.popup({
x: event.clientX,
y: event.clientY,
});
}
private removeOverCounter(oldFocusIndex?: number) {
if (typeof oldFocusIndex === "undefined") {
this.children.forEach((item, index) => {