feat: update

parent b4f28ca7
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {Logger} from 'angular2-logger/core'; import {Logger} from 'angular2-logger/core';
import {AppService, HttpService} from '../../app.service'; import {AppService, HttpService} from '../../app.service';
import {SearchComponent} from '../search/search.component'; import {SearchComponent} from '../search/search.component';
import {DataStore} from '../../globals'; import {DataStore} from '../../globals';
import {version} from '../../../environments/environment'; import {version} from '../../../environments/environment';
import * as jQuery from 'jquery/dist/jquery.min.js'; import * as jQuery from 'jquery/dist/jquery.min.js';
import * as layer from 'layui-layer/src/layer.js'; import * as layer from 'layui-layer/src/layer.js';
import * as UUID from 'uuid-js/lib/uuid.js';
import {ElementServerMenuComponent} from '../../elements/server-menu/server-menu.component'; import {ElementServerMenuComponent} from '../../elements/server-menu/server-menu.component';
import {NavList, View} from '../control/control.component'; import {NavList, View} from '../control/control.component';
...@@ -119,9 +119,9 @@ export class CleftbarComponent implements OnInit { ...@@ -119,9 +119,9 @@ export class CleftbarComponent implements OnInit {
Connect(host) { Connect(host) {
// console.log(host); // console.log(host);
let user: any; let user: any;
let options = '';
const that = this; const that = this;
if (host.system_users_granted.length > 1) { if (host.system_users_granted.length > 1) {
let options = '';
user = this.checkPriority(host.system_users_granted); user = this.checkPriority(host.system_users_granted);
if (user) { if (user) {
this.login(host, user); this.login(host, user);
...@@ -162,8 +162,8 @@ export class CleftbarComponent implements OnInit { ...@@ -162,8 +162,8 @@ export class CleftbarComponent implements OnInit {
} }
login(host, user) { login(host, user) {
if (user) {
const id = NavList.List.length - 1; const id = NavList.List.length - 1;
if (user) {
NavList.List[id].nick = host.hostname; NavList.List[id].nick = host.hostname;
NavList.List[id].connected = true; NavList.List[id].connected = true;
NavList.List[id].edit = false; NavList.List[id].edit = false;
......
div, app-element-term, app-element-guacamole { div, app-element-term, app-element-guacamole {
height: 100%; height: 100%;
}
div {
display: none; display: none;
} }
......
<app-controlnav></app-controlnav> <app-controlnav></app-controlnav>
<!--<app-ssh></app-ssh>-->
<!--<app-rdp></app-rdp>-->
<div *ngFor="let m of NavList.List;let i=index" <div *ngFor="let m of NavList.List;let i=index"
[ngClass]="{'active':i==NavList.Active}" [ngClass]="{'active':i==NavList.Active}"
> >
<app-element-term [host]="m.host" <app-element-term [host]="m.host"
[userid]="m.user.id" [userid]="m.user.id"
[index]="i" [index]="i"
[ngClass]="{'active':i==NavList.Active}"
*ngIf="m.type=='ssh'"> *ngIf="m.type=='ssh'">
</app-element-term> </app-element-term>
<app-element-guacamole [host]="m.host" <app-element-guacamole [host]="m.host"
[userid]="m.user.id" [userid]="m.user.id"
[index]="i" [index]="i"
[ngClass]="{'active':i==NavList.Active}"
*ngIf="m.type=='rdp'"> *ngIf="m.type=='rdp'">
</app-element-guacamole> </app-element-guacamole>
......
...@@ -65,7 +65,6 @@ export class ControlComponent implements OnInit { ...@@ -65,7 +65,6 @@ export class ControlComponent implements OnInit {
} }
static TerminalDisconnect(id) { static TerminalDisconnect(id) {
console.log(id);
if (NavList.List[id].connected) { if (NavList.List[id].connected) {
NavList.List[id].connected = false; NavList.List[id].connected = false;
NavList.List[id].Term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n'); NavList.List[id].Term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n');
...@@ -90,4 +89,7 @@ export class ControlComponent implements OnInit { ...@@ -90,4 +89,7 @@ export class ControlComponent implements OnInit {
ngOnInit() { ngOnInit() {
} }
// trackByFn(index: number, item: View) {
// return item.id;
// }
} }
...@@ -42,12 +42,8 @@ export class ControlnavComponent implements OnInit { ...@@ -42,12 +42,8 @@ export class ControlnavComponent implements OnInit {
NavList.List[index].hide = false; NavList.List[index].hide = false;
NavList.Active = index; NavList.Active = index;
if (NavList.List[index].type === 'ssh') { if (NavList.List[index].type === 'ssh') {
jQuery('app-ssh').show();
jQuery('app-rdp').hide();
NavList.List[index].Term.focus(); NavList.List[index].Term.focus();
} else if (NavList.List[index].type === 'rdp') { } else if (NavList.List[index].type === 'rdp') {
jQuery('app-ssh').hide();
jQuery('app-rdp').show();
} }
} }
......
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