[Update] merge

package.json

@@ -48,7 +48,6 @@
     "metismenu": "^2.5.0",
     "mstsc.js": "^0.2.4",
     "ng2-charts": "^1.5.0",
-    "ng2-file-tree": "^0.4.3",
     "ngx-bootstrap": "^1.6.6",
     "ngx-cookie-service": "^1.0.10",
     "ngx-layer": "0.0.4",

src/app/app.module.ts

@@ -8,21 +8,18 @@
 import {BrowserModule} from '@angular/platform-browser';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms'; // <-- NgModel lives here
-import {LoggerModule, NGXLogger, NgxLoggerLevel} from 'ngx-logger';
+import {NGXLogger} from 'ngx-logger';
 import {HttpClientModule} from '@angular/common/http';
 
 import {AppRouterModule} from './router/router.module';
 
 import {AppComponent} from './pages/app.component';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 
 // service
 import {AppService, HttpService, LocalStorageService, LogService, UUIDService} from './app.service';
 
 
-import {NgProgressModule} from 'ngx-progressbar';
 import {CookieService} from 'ngx-cookie-service';
-import {NgxDatatableModule} from '@swimlane/ngx-datatable';
 import {MAT_LABEL_GLOBAL_OPTIONS} from '@angular/material';
 
 
@@ -33,23 +30,17 @@ import {ChangLanWarningDialogComponent} from './elements/nav/nav.component';
 import {DialogService, ElementDialogAlertComponent} from './elements/dialog/dialog.service';
 import {PluginModules} from './plugins/plugins';
 import {TestPageComponent} from './test-page/test-page.component';
-import {Ng2FileTreeModule} from 'ng2-file-tree/ng2-file-tree';
 import {AssetTreeDialogComponent} from './elements/asset-tree/asset-tree.component';
 
 
 @NgModule({
   imports: [
     BrowserModule,
-    BrowserAnimationsModule,
     FormsModule,
-    NgProgressModule,
     HttpClientModule,
     ReactiveFormsModule,
-    LoggerModule.forRoot({serverLoggingUrl: '/api/logs', level: NgxLoggerLevel.DEBUG, serverLogLevel: NgxLoggerLevel.ERROR}),
-    NgxDatatableModule,
     AppRouterModule,
-    ...PluginModules,
-    Ng2FileTreeModule
+    ...PluginModules
   ],
   declarations: [
     AppComponent,

src/app/app.service.ts

@@ -253,6 +253,8 @@ export class AppService implements OnInit {
       this._http.get('/luna/i18n/' + this.lang + '.json').subscribe(
         data => {
           this._localStorage.set('lang', JSON.stringify(data));
+        },
+        err => {
         }
       );
     }

src/app/elements/guacamole/guacamole.component.ts

@@ -76,7 +76,6 @@ export class ElementGuacamoleComponent implements OnInit {
   }
 
   active() {
-    this._logger.debug('focus');
     this.el.nativeElement.focus();
   }
 

src/app/elements/term/term.component.html

-<div #term></div>
+<div #term (mouseenter)="active()"></div>

src/app/elements/term/term.component.ts

@@ -113,4 +113,8 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
     // this.term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n');
     TermWS.emit('logout', NavList.List[this.index].room);
   }
+
+  active() {
+    this.term.focus();
+  }
 }

src/app/pages/control/control/controlnav/nav.component.css

 .tabs {
   height: 30px;
   overflow-y: hidden;
-  overflow-x: auto;
+  overflow-x: hidden;
   position: relative;
 }
 

src/app/pages/control/control/controlnav/nav.component.ts

@@ -44,7 +44,7 @@ export class PagesControlNavComponent implements OnInit {
       if (NavList.List[index].type === 'ssh') {
         NavList.List[index].Term.focus();
       } else if (NavList.List[index].type === 'rdp') {
-        NavList.List[index].Rdp.focus();
+        // NavList.List[index].Rdp.focus();
       }
     } else {
 

src/app/plugins/plugins.ts

 import {MaterialModule} from './MaterialModule.component';
 import {NgxUIModule, SplitModule} from '@swimlane/ngx-ui';
+import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
+import {NgxDatatableModule} from '@swimlane/ngx-datatable';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {NgProgressModule} from 'ngx-progressbar';
 
 export const PluginModules = [
+  BrowserAnimationsModule,
+  NgProgressModule,
   MaterialModule,
+  LoggerModule.forRoot({serverLoggingUrl: '/api/logs', level: NgxLoggerLevel.DEBUG, serverLogLevel: NgxLoggerLevel.ERROR}),
+  NgxDatatableModule,
   NgxUIModule,
   SplitModule
 ];

src/sass/style.scss

@@ -91,3 +91,9 @@ $material-design-icons-font-path: '~/material-design-icons/iconfont/';
 .ztree li span.button::before {
   color: #ffffff !important;
 }
+
+button.icon-split-handle.ngx-split-button {
+  height: 100%;
+  border: 1px solid #3a3333;
+  opacity: 0.5;
+}