Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/presenter/tabPresenter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,14 @@ export class TabPresenter implements ITabPresenter {
return await this.destroyTab(tabId)
}

/**
* 销毁标签页
*/
async closeTabs(windowId: number): Promise<void> {
const tabs = [...(this.windowTabs.get(windowId) ?? [])]
tabs.forEach((t) => this.closeTab(t))
}

/**
* 激活标签页
*/
Expand Down
1 change: 1 addition & 0 deletions src/main/presenter/windowPresenter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ export class WindowPresenter implements IWindowPresenter {
console.log(
`Window ${windowId}: Allowing default close behavior (app is quitting or macOS last window configured to quit).`
)
presenter.tabPresenter.closeTabs(windowId)
}
} else {
// 如果 isQuitting 为 true,表示应用正在主动退出,允许窗口正常关闭
Expand Down
1 change: 1 addition & 0 deletions src/shared/presenter.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ export interface IWindowPresenter {
export interface ITabPresenter {
createTab(windowId: number, url: string, options?: TabCreateOptions): Promise<number | null>
closeTab(tabId: number): Promise<boolean>
closeTabs(windowId: number): Promise<void>
switchTab(tabId: number): Promise<boolean>
getTab(tabId: number): Promise<BrowserView | undefined>
detachTab(tabId: number): Promise<boolean>
Expand Down