fix: update

parent 4a36650c
...@@ -8351,11 +8351,6 @@ ...@@ -8351,11 +8351,6 @@
"chart.js": "2.7.1" "chart.js": "2.7.1"
} }
}, },
"ng2-cookies": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/ng2-cookies/-/ng2-cookies-1.0.12.tgz",
"integrity": "sha1-Pz5hPgE3sGSbcFxngHS0vQgUnMw="
},
"ngx-bootstrap": { "ngx-bootstrap": {
"version": "1.9.3", "version": "1.9.3",
"resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-1.9.3.tgz", "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-1.9.3.tgz",
......
import {AfterViewInit, Component, Input, OnInit, ViewChild} from '@angular/core'; import {AfterViewInit, Component, Input, OnInit, ViewChild} from '@angular/core';
import {ElementRef} from '@angular/core'; import {ElementRef} from '@angular/core';
import {term, Terminal, TermWS} from '../../globals'; import {term, Terminal, TermWS} from '../../globals';
import {Cookie} from 'ng2-cookies/ng2-cookies';
import {NavList} from '../../ControlPage/control/control.component'; import {NavList} from '../../ControlPage/control/control.component';
import * as jQuery from 'jquery/dist/jquery.min.js'; import * as jQuery from 'jquery/dist/jquery.min.js';
import {UUIDService} from '../../app.service'; import {UUIDService} from '../../app.service';
import {CookieService} from 'ngx-cookie-service';
@Component({ @Component({
selector: 'app-element-term', selector: 'app-element-term',
...@@ -22,7 +22,8 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -22,7 +22,8 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
secret: string; secret: string;
term: any; term: any;
constructor(private _uuid: UUIDService) { constructor(private _uuid: UUIDService,
private _cookie: CookieService) {
} }
ngOnInit() { ngOnInit() {
...@@ -38,11 +39,11 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -38,11 +39,11 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
ngAfterViewInit() { ngAfterViewInit() {
if (this.host || this.token) { if (this.host || this.token) {
if (Cookie.get('cols')) { if (this._cookie.get('cols')) {
term.col = parseInt(Cookie.get('cols'), 10); term.col = parseInt(this._cookie.get('cols'), 10);
} }
if (Cookie.get('rows')) { if (this._cookie.get('rows')) {
term.row = parseInt(Cookie.get('rows'), 10); term.row = parseInt(this._cookie.get('rows'), 10);
} }
} else { } else {
term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3; term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
...@@ -62,8 +63,8 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -62,8 +63,8 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
} }
that.term.resize(term.col, term.row); that.term.resize(term.col, term.row);
if (that.host) { if (that.host) {
Cookie.set('cols', term.col.toString(), 99, '/', document.domain); this._cookie.set('cols', term.col.toString(), 99, '/', document.domain);
Cookie.set('rows', term.row.toString(), 99, '/', document.domain); this._cookie.set('rows', term.row.toString(), 99, '/', document.domain);
TermWS.emit('resize', {'cols': term.col, 'rows': term.row}); TermWS.emit('resize', {'cols': term.col, 'rows': term.row});
} }
}; };
...@@ -75,6 +76,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -75,6 +76,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
} }
if (this.token) { if (this.token) {
TermWS.emit('token', {'token': this.token, 'secret': this.secret}); TermWS.emit('token', {'token': this.token, 'secret': this.secret});
console.log(this.token);
} }
if (this.monitor) { if (this.monitor) {
TermWS.emit('monitor', {'token': this.monitor, 'secret': this.secret}); TermWS.emit('monitor', {'token': this.monitor, 'secret': this.secret});
......
<app-element-term <app-element-term
[token]="token" [token]="token"
[index]="0"> [index]="0">
</app-element-term> </app-element-term>
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