Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/9586

Browse source
This commit is contained in:
Vanessa 2023-11-17 10:57:18 +08:00
parent cb3d412458
commit 2e8463949f
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/menus/tab.ts
View file

@ -130,29 +130,18 @@ const splitSubMenu = (app: App, tab: Tab) => {
}
});
}
let wndCounter = 0;
tab.parent.parent.children.find(item => {
if (item instanceof Wnd) {
wndCounter++;
}
if (wndCounter > 1) {
return true;
}
});
if (wndCounter > 1) {
if (tab.parent.parent.children.length > 1) {
subMenus.push({
label: window.siyuan.languages.unsplit,
click: () => {
unsplitWnd(tab.parent.parent.children[0], tab.parent.parent);
unsplitWnd(tab.parent.parent.children[0], tab.parent.parent, true);
resizeTabs();
}
});
}
if (tab.parent.parent.children.length > 1) {
subMenus.push({
label: window.siyuan.languages.unsplitAll,
click: () => {
unsplitWnd(window.siyuan.layout.centerLayout, window.siyuan.layout.centerLayout);
unsplitWnd(window.siyuan.layout.centerLayout, window.siyuan.layout.centerLayout, false);
resizeTabs();
}
});
@ -217,15 +206,15 @@ export const initTabMenu = (app: App, tab: Tab) => {
return window.siyuan.menus.menu;
};
const unsplitWnd = (target: Wnd | Layout, layout: Layout) => {
const unsplitWnd = (target: Wnd | Layout, layout: Layout, onlyWnd: boolean) => {
let wnd: Wnd = target as Wnd;
while (wnd instanceof Layout) {
wnd = wnd.children[0] as Wnd;
}
for (let i = 0; i < layout.children.length; i++) {
const item = layout.children[i];
if (item instanceof Layout) {
unsplitWnd(wnd, item);
if (item instanceof Layout && !onlyWnd) {
unsplitWnd(wnd, item, onlyWnd);
} else if (item instanceof Wnd && item.id !== wnd.id && item.children.length > 0) {
for (let j = 0; j < item.children.length; j++) {
const tab = item.children[j];