[Bugfix] 修复窗口大小的

c8b8a4b3 · ibuler · 6d8c33da · c8b8a4b3 · c8b8a4b3 · c8b8a4b3
Commit c8b8a4b3 authored May 23, 2018 by ibuler
Showing with 20 additions and 5 deletions

term.component.ts src/app/elements/term/term.component.ts +18 -3

control.component.html src/app/pages/control/control/control.component.html +1 -1

index.html src/index.html +1 -1

No files found.
--- a/src/app/elements/term/term.component.ts
+++ b/src/app/elements/term/term.component.ts
@@ -3,7 +3,8 @@ import {ElementRef} from '@angular/core';
 import {Terminal} from 'xterm';
 import {fit} from 'xterm/lib/addons/fit/fit';
 import {Observable} from 'rxjs/Rx';
-import { CookieService } from 'ngx-cookie-service';
+import {CookieService} from 'ngx-cookie-service';
+import * as $ from 'jquery/dist/jquery.min.js';
 import 'rxjs/Observable';
 import 'rxjs/add/operator/debounceTime';
 import 'rxjs/add/operator/distinctUntilChanged';
@@ -43,9 +44,23 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
    this.resizeTerm();
  }

+  getWinSize() {
+    const activeEle = $('#winContainer');
+    const markerEle = $('#marker');
+    const cols = parseInt(activeEle.width() / markerEle.width() * 6, 10) - 6;
+    const rows = parseInt(activeEle.height() / markerEle.height(), 10) - 1;
+    return [cols, rows];
+  }
+
  resizeTerm() {
-    fit(this.term);
-    this.winSizeChangeTrigger.emit([this.term.cols, this.term.rows]);
+    // fit(this.term);
+    const size = this.getWinSize();
+    if (isNaN(size[0])) {
+      fit(this.term);
+    } else {
+      this.term.resize(size[0], size[1]);
+      this.winSizeChangeTrigger.emit([this.term.cols, this.term.rows]);
+    }
    this._cookie.set('cols', this.term.cols.toString(), 0, '/', document.domain);
    this._cookie.set('rows', this.term.rows.toString(), 0, '/', document.domain);
  }

--- a/src/app/pages/control/control/control.component.html
+++ b/src/app/pages/control/control/control.component.html
@@ -2,7 +2,7 @@
  <div fxFlex="0 0 30px" class="search">
    <pages-control-nav></pages-control-nav>
  </div>
-  <div fxFlex="0 0 calc(100%-35px)">
+  <div fxFlex="0 0 calc(100%-35px)" id="winContainer">
    <div class="window" *ngFor="let m of NavList.List;let i=index"
         [ngClass]="{'active':i==NavList.Active}" style="height: 100%">
      <elements-ssh-term [index]="i"

--- a/src/index.html
+++ b/src/index.html
@@ -10,7 +10,7 @@
 </head>
 <body>
 <app-root></app-root>
-<span id="marker" style="display: none">marker</span>
+<span id="marker" style="display: none;font-size: 14px">marker</span>

 </body>
 </html>