Skip to content

L
luna
Commit c8b8a4b3 authored by ibuler's avatar ibuler
Browse files
Options

[Bugfix] 修复窗口大小的

parent 6d8c33da
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 5 deletions
src/app/elements/term/term.component.ts
View file @ c8b8a4b3
...@@ -3,7 +3,8 @@ import {ElementRef} from '@angular/core'; ...@@ -3,7 +3,8 @@ import {ElementRef} from '@angular/core';
import {Terminal} from 'xterm'; import {Terminal} from 'xterm';
import {fit} from 'xterm/lib/addons/fit/fit'; import {fit} from 'xterm/lib/addons/fit/fit';
import {Observable} from 'rxjs/Rx'; 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/Observable';
import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/debounceTime';
import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/operator/distinctUntilChanged';
...@@ -43,9 +44,23 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -43,9 +44,23 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
this.resizeTerm(); 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() { resizeTerm() {
fit(this.term); // fit(this.term);
this.winSizeChangeTrigger.emit([this.term.cols, this.term.rows]); 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('cols', this.term.cols.toString(), 0, '/', document.domain);
this._cookie.set('rows', this.term.rows.toString(), 0, '/', document.domain); this._cookie.set('rows', this.term.rows.toString(), 0, '/', document.domain);
} }
......
src/app/pages/control/control/control.component.html
View file @ c8b8a4b3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div fxFlex="0 0 30px" class="search"> <div fxFlex="0 0 30px" class="search">
<pages-control-nav></pages-control-nav> <pages-control-nav></pages-control-nav>
</div> </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" <div class="window" *ngFor="let m of NavList.List;let i=index"
[ngClass]="{'active':i==NavList.Active}" style="height: 100%"> [ngClass]="{'active':i==NavList.Active}" style="height: 100%">
<elements-ssh-term [index]="i" <elements-ssh-term [index]="i"
......
src/index.html
View file @ c8b8a4b3
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
<span id="marker" style="display: none">marker</span> <span id="marker" style="display: none;font-size: 14px">marker</span>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment