Skip to content

Fixed: Complete the type #1432

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
ZhaoJiSen merged 1 commit into from
Aug 19, 2025
Merged

Fixed: Complete the type #1432

Show file tree
Hide file tree
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
16 changes: 8 additions & 8 deletions src/app/pages/connect/connect.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<elements-chat></elements-chat>

<div #contentWindow *ngIf="isDirect">
<div class="terminal-connect" *ngIf="view && view.connectMethod?.component === 'koko'">
<div *ngIf="view.connectMethod?.value === 'web_sftp'" style="height: 100%; width: 100%">
<div class="terminal-connect" *ngIf="view && isTerminalComponent()">
<div *ngIf="isWebSftp()" style="height: 100%; width: 100%">
<elements-content-window *ngIf="view" [view]="view"></elements-content-window>
</div>

<div *ngIf="view.connectMethod?.value === 'web_cli'" style="height: 100%; width: 100%">
<div *ngIf="isWebCliOrGui()" style="height: 100%; width: 100%">
<div class="card-header">
<div class="card-header-left">
<div class="card-title">
Expand Down Expand Up @@ -70,7 +70,7 @@
</div>
</div>

<div class="gui" *ngIf="view && (view.connectMethod?.component === 'lion')">
<div class="gui" *ngIf="view && isGuiComponent()">
<div class="timer-container">
<div class="timer">
<div [class.active]="isActive" class="status-dot"></div>
Expand Down Expand Up @@ -103,12 +103,12 @@
<div #contentWindow *ngIf="view">
<app-face-monitor></app-face-monitor>

<div class="terminal-connect" *ngIf="view && view.connectMethod?.component === 'koko'">
<div *ngIf="view.connectMethod?.value === 'web_sftp'" style="height: 100%; width: 100%">
<div class="terminal-connect" *ngIf="view && isTerminalComponent()">
<div *ngIf="isWebSftp()" style="height: 100%; width: 100%">
<elements-content-window *ngIf="view" [view]="view"></elements-content-window>
</div>

<div *ngIf="view.connectMethod?.value === 'web_cli'" style="height: 100%; width: 100%">
<div *ngIf="isWebCliOrGui()" style="height: 100%; width: 100%">
<div class="card-header">
<div class="card-header-left">
<div class="card-title">
Expand Down Expand Up @@ -175,7 +175,7 @@
</div>
</div>

<div class="gui" *ngIf="view && (view.connectMethod?.component === 'lion' || view.connectMethod?.component === 'tinker')">
<div class="gui" *ngIf="view && isGuiComponent()">
<div class="timer-container">
<div class="timer">
<div [class.active]="isActive" class="status-dot"></div>
Expand Down
40 changes: 39 additions & 1 deletion src/app/pages/connect/connect.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export class PagesConnectComponent implements OnInit, OnDestroy {
public isActive: boolean = true;
public isTimerStopped: boolean = false;
public showActionIcons: boolean = false;
private readonly guiComponents: Set<string> = new Set(['lion', 'tinker', 'razor', 'panda']);
private readonly terminalComponents: Set<string> = new Set(['koko', 'chen', 'magnus', 'nec']);

// Direct 模式相关属性
public endpoint: Endpoint;
Expand Down Expand Up @@ -106,7 +108,8 @@ export class PagesConnectComponent implements OnInit, OnDestroy {
private checkDirectMode() {
const params = this._route.snapshot.queryParams;
// 检查是否有 direct: true 参数，或者同时有 account, asset, protocol 参数
this.isDirect = params['direct'] === 'true' || !!(params['account'] && params['asset'] && params['protocol']);
this.isDirect =
params['direct'] === 'true' || !!(params['account'] && params['asset'] && params['protocol']);

if (this.isDirect) {
this.accountId = params['account'];
Expand Down Expand Up @@ -342,6 +345,8 @@ export class PagesConnectComponent implements OnInit, OnDestroy {
this.view.active = true;
}

console.log('view', this.view);

if (this.view) {
this._viewSrv.addView(this.view);
this._viewSrv.activeView(this.view);
Expand Down Expand Up @@ -562,4 +567,37 @@ export class PagesConnectComponent implements OnInit, OnDestroy {
return ['k8s', 'website'].includes(assetInfo.protocol);
}
}

/**
* 判断当前视图是否为 GUI 组件
*/
public isGuiComponent(): boolean {
const componentName = this.view?.connectMethod?.component as string | undefined;
return !!componentName && this.guiComponents.has(componentName);
}

/**
* 判断当前视图是否为终端类组件
*/
public isTerminalComponent(): boolean {
const componentName = this.view?.connectMethod?.component as string | undefined;
return !!componentName && this.terminalComponents.has(componentName);
}

/**
* 是否为 Web SFTP
*/
public isWebSftp(): boolean {
return this.view?.connectMethod?.value === 'web_sftp';
}

/**
* 是否为 Web CLI 或 Web GUI
*/
public isWebCliOrGui(): boolean {
const value = this.view?.connectMethod?.value as string | undefined;
return (
value === 'web_cli' || value === 'web_gui' || value === 'db_guide' || value === 'vnc_guide'
);
}
}