diff --git a/src/app/elements/content/content-tab/content-tab.component.html b/src/app/elements/content/content-tab/content-tab.component.html index de94a7eda..1db3bc788 100644 --- a/src/app/elements/content/content-tab/content-tab.component.html +++ b/src/app/elements/content/content-tab/content-tab.component.html @@ -5,9 +5,9 @@ [ngClass]="{'active': view.active,'disconnected': !view.connected, 'hidden': view.closed != false}" [title]="view.name" > - + - {{ view.name | truncatechars:100 }} + {{ view.name | truncatechars:16 }} span { display: flex; align-items: center; - height: 30px; - overflow: hidden; - white-space: nowrap; + gap:4px; + color: #cacaca; font-size: 13px; cursor: pointer; - color: #cacaca; .view_icon { margin-right: 5px; - line-height: 30px; font-style: normal; + .tab-text{ + min-width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + &::before { display: inline-block; color: var(--el-icon-color); @@ -62,7 +68,6 @@ li { & a.close { display: flex; align-items: center; - padding: 0 10px; line-height: 30px; font-family: "Roboto", sans-serif; font-size: 13px; diff --git a/src/app/elements/content/content-window/koko/koko.component.ts b/src/app/elements/content/content-window/koko/koko.component.ts index 3cda9e69d..795c73856 100644 --- a/src/app/elements/content/content-window/koko/koko.component.ts +++ b/src/app/elements/content/content-window/koko/koko.component.ts @@ -165,10 +165,12 @@ export class ElementConnectorKokoComponent implements OnInit { }); if (this.protocol === 'k8s') { - return (this.iframeURL = `${this.baseUrl}/k8s/?` + query); + // return (this.iframeURL = `${this.baseUrl}/k8s/?` + query); + return (this.iframeURL = `http://localhost:9530/koko/k8s/?` + query); } - this.iframeURL = `${this.baseUrl}/connect/?` + query; + // this.iframeURL = `${this.baseUrl}/connect/?` + query; + this.iframeURL = `http://localhost:9530/koko/connect/?` + query; } generateFileManagerURL() { diff --git a/src/app/elements/iframe/iframe.component.ts b/src/app/elements/iframe/iframe.component.ts index 5fdddd435..9048945a9 100644 --- a/src/app/elements/iframe/iframe.component.ts +++ b/src/app/elements/iframe/iframe.component.ts @@ -194,7 +194,7 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy ); this.subscription = this._iframeSvc.message$.subscribe(message => { - this._logger.info('[Luna] Send msg to iframe: ', message); + // this._logger.info('[Luna] Send msg to iframe: ', message); this.iframeWindow.postMessage(message, '*'); }); diff --git a/src/app/pipes/truncatechars.pipe.ts b/src/app/pipes/truncatechars.pipe.ts index 813fc9d39..2810b0081 100644 --- a/src/app/pipes/truncatechars.pipe.ts +++ b/src/app/pipes/truncatechars.pipe.ts @@ -10,6 +10,6 @@ export class TruncatecharsPipe implements PipeTransform { if (value.length < length) { return value; } - return value.slice(0, length) + '..'; + return value.slice(0, length) + '...'; } } diff --git a/src/app/router.module.ts b/src/app/router.module.ts index 2436574da..d04b66ab8 100644 --- a/src/app/router.module.ts +++ b/src/app/router.module.ts @@ -4,6 +4,9 @@ import { RouterModule, Routes } from '@angular/router'; import { PageMainComponent } from './pages/main/main.component'; import { PagesBlankComponent } from './pages/blank/blank.component'; import { PagesShareComponent } from './pages/share/share.component'; +import { PagesConnectComponent } from './pages/connect/connect.component'; +import { PageDirectComponent } from './pages/direct/direct.component'; +import { PagesReplayComponent } from './pages/replay/replay.component'; const appRoutes: Routes = [ { path: '', component: PageMainComponent }, @@ -13,18 +16,21 @@ const appRoutes: Routes = [ }, { path: 'connect', - loadComponent: () => - import('./pages/connect/connect.component').then(m => m.PagesConnectComponent) + component: PagesConnectComponent + // loadComponent: () => + // import('./pages/connect/connect.component').then(m => m.PagesConnectComponent) }, { path: 'undefined', component: PagesBlankComponent }, { path: 'share/:id', component: PagesShareComponent }, { path: 'replay/:sid', - loadComponent: () => import('./pages/replay/replay.component').then(m => m.PagesReplayComponent) + component: PagesReplayComponent + // loadComponent: () => import('./pages/replay/replay.component').then(m => m.PagesReplayComponent) }, { path: 'admin-connect', - loadComponent: () => import('./pages/direct/direct.component').then(m => m.PageDirectComponent) + component: PageDirectComponent + // loadComponent: () => import('./pages/direct/direct.component').then(m => m.PageDirectComponent) }, { path: 'monitor/:sid',