Merge pull request #263 from jumpserver/pr@dev@perf_event_listner

perf: 优化事件监听
jumpserver · Sep 15, 2020 · cfdd038 · cfdd038
2 parents ff6b542 + 5d251ff
commit cfdd038
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts
@@ -326,7 +326,7 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
       view.connected = true;
       view.editable = false;
       view.closed = false;
-      view.shareroomId = node.id;
+      view.shareRoomId = node.id;
       view.type = 'ssh';
       this.onNewView.emit(view);
   }

diff --git a/src/app/elements/content-window/content-window.component.html b/src/app/elements/content-window/content-window.component.html
@@ -4,7 +4,7 @@
     [token]="view.token"
     [sysUser]="view.user"
     [host]="view.host"
-    [shareroomId] = "view.shareroomId"
+    [shareRoomId] = "view.shareRoomId"
     *ngIf="view.type=='ssh' || view.type=='database'|| view.type=='k8s'"
   >
   </elements-ssh-term>

diff --git a/src/app/elements/ssh-term/ssh-term.component.html b/src/app/elements/ssh-term/ssh-term.component.html
@@ -1,2 +1,2 @@
 <!--<elements-term (winSizeChangeTrigger)="changeWinSize($event)"  (contextmenu)="contextMenu($event)" [term]="term"></elements-term>-->
-<iframe #terminal [src]="target" *ngIf="target" width="100%" height="100%"  scrolling="no" [id]="terminalID"></iframe>
+<iframe #terminal [src]="target" *ngIf="target" (load)="listenEvent()" width="100%" height="100%" [id]="terminalID"></iframe>
diff --git a/src/app/elements/ssh-term/ssh-term.component.scss b/src/app/elements/ssh-term/ssh-term.component.scss
@@ -1,3 +1,3 @@
-iframe{
+iframe {
   border-width: 0;
 }
diff --git a/src/app/elements/ssh-term/ssh-term.component.ts b/src/app/elements/ssh-term/ssh-term.component.ts
@@ -10,12 +10,12 @@ import {DomSanitizer} from '@angular/platform-browser';
   templateUrl: './ssh-term.component.html',
   styleUrls: ['./ssh-term.component.scss']
 })
-export class ElementSshTermComponent implements OnInit, AfterViewInit {
+export class ElementSshTermComponent implements OnInit {
   @Input() view: View;
   @Input() host: any;
   @Input() sysUser: any;
   @Input() token: string;
-  @Input() shareroomId: string;
+  @Input() shareRoomId: string;
   @ViewChild('terminal') iframe: ElementRef;
 
   target: any;
@@ -55,9 +55,9 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit {
             break;
         }
       }
-      if (this.shareroomId) {
+      if (this.shareRoomId) {
         this.target =  this.trust(
-          `${document.location.origin}/koko/terminal/?target_id=${this.shareroomId}&type=shareroom`
+          `${document.location.origin}/koko/terminal/?target_id=${this.shareRoomId}&type=shareroom`
         );
       }
       if (this.token) {
@@ -70,12 +70,6 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit {
 
   }
 
-  ngAfterViewInit() {
-    setTimeout(() => {
-      this.listenEvent();
-    }, 2000);
-  }
-
   listenEvent() {
     const isIFrame = (input: HTMLElement | null): input is HTMLIFrameElement =>
       input !== null && input.tagName === 'IFRAME';

diff --git a/src/app/model.ts b/src/app/model.ts
@@ -121,7 +121,7 @@ export class View {
   token: any;
   DatabaseApp: string;
   K8SApp: string;
-  shareroomId: string;
+  shareRoomId: string;
   termComp: ElementSshTermComponent;
 }
 

diff --git a/src/app/pages/connect/connect.component.ts b/src/app/pages/connect/connect.component.ts
@@ -30,7 +30,7 @@ export class PagesConnectComponent implements OnInit {
     this.system = this._appService.getQueryString('system');
     this.token = this._appService.getQueryString('token');
     const assetId = this._appService.getQueryString('asset');
-    const shareroomId = this._appService.getQueryString('shareroom');
+    const shareRoomId = this._appService.getQueryString('shareroom');
     const remoteAppId = this._appService.getQueryString('remote_app');
     const databaseAppId = this._appService.getQueryString('database_app');
     const k8sId = this._appService.getQueryString('k8s_app');
@@ -49,9 +49,9 @@ export class PagesConnectComponent implements OnInit {
         }
       );
     }
-    if (shareroomId) {
+    if (shareRoomId) {
       const node = new TreeNode;
-      node.id = shareroomId;
+      node.id = shareRoomId;
       node.meta = {
         type: 'shareroom'
       };