Skip to content

v4.10.16-lts #1505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baijiangjie merged 1 commit into from
Mar 4, 2026
Merged

v4.10.16-lts #1505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 7 additions & 26 deletions src/app/elements/content/content.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,8 @@ export class ElementContentComponent implements OnInit, OnDestroy {
this.toggleMenu.emit();

setTimeout(async () => {
// 如果已经打开了 15 个，那么弹出一个确认框，点击确认重新再一个新的浏览器 tab 下打开 luna 应用
if (this.viewList.length >= 15) {
const msg = await this._i18nSvc.t('tabLimits');
const ok = window.confirm(msg);

if (ok) {
window.open(window.location.href, '_blank');
}
} else {
this._viewSvc.addView(view);
this.setViewActive(view);
}
this._viewSvc.addView(view);
this.setViewActive(view);
}, 100);
}

Expand Down Expand Up @@ -226,20 +216,11 @@ export class ElementContentComponent implements OnInit, OnDestroy {
const oldView = this.viewList.find(i => i.id === oldId);
const oldConnectToken = oldView.connectToken;

if (this.viewList.length >= 15) {
const msg = await this._i18nSvc.t('tabLimits');
const ok = window.confirm(msg);

if (ok) {
window.open(window.location.href, '_blank');
}
} else {
this._connectTokenSvc.exchange(oldConnectToken).then(newConnectToken => {
const newView = new View(oldView.asset, oldView.connectData, newConnectToken);
this._viewSvc.addView(newView);
this.setViewActive(newView);
});
}
this._connectTokenSvc.exchange(oldConnectToken).then(newConnectToken => {
const newView = new View(oldView.asset, oldView.connectData, newConnectToken);
this._viewSvc.addView(newView);
this.setViewActive(newView);
});
}
},
{
Expand Down
Loading