Update pkg version

.angular-cli.json

@@ -32,8 +32,6 @@
         "../node_modules/metismenu/dist/metisMenu.js",
         "../node_modules/jquery-sparkline/jquery.sparkline.js",
         "../node_modules/tether/dist/js/tether.min.js",
-        "../node_modules/bootstrap/dist/js/bootstrap.min.js",
-        "assets/inspinia/inspinia.js",
         "assets/slimscroll/jquery.slimscroll.min.js",
         "../node_modules/xterm/dist/xterm.js",
         "assets/ztree/jquery.ztree.all.min.js",

package.json

@@ -12,17 +12,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.2.10",
-    "@angular/cdk": "^5.2.5",
-    "@angular/common": "5.2.0",
-    "@angular/compiler": "5.2.0",
-    "@angular/core": "5.2.0",
-    "@angular/forms": "5.2.0",
-    "@angular/http": "5.2.0",
-    "@angular/material": "^5.2.5",
-    "@angular/platform-browser": "5.2.0",
-    "@angular/platform-browser-dynamic": "5.2.0",
-    "@angular/router": "5.2.0",
+    "@angular/animations": "^5.2.11",
+    "@angular/cdk": "^5.2.4",
+    "@angular/common": "^5.2.11",
+    "@angular/compiler": "^5.2.11",
+    "@angular/core": "^5.2.11",
+    "@angular/flex-layout": "^5.0.0-beta.15",
+    "@angular/forms": "^5.2.11",
+    "@angular/material": "^5.2.0",
+    "@angular/platform-browser": "^5.2.11",
+    "@angular/platform-browser-dynamic": "^5.2.11",
+    "@angular/router": "^5.2.11",
     "@swimlane/ngx-datatable": "^11.3.2",
     "@swimlane/ngx-ui": "^20.2.1",
     "@types/jquery": "^3.3.6",
@@ -31,22 +31,19 @@
     "ajv": "^6.5.0",
     "animate.css": "^3.6.1",
     "body-parser": "^1.18.2",
-    "bootstrap": "^4.1.1",
     "clipboard": "^1.7.1",
     "compass-mixins": "^0.12.10",
     "core-js": "2.5.3",
     "directory-encoder": "^0.9.2",
-    "elfinder": "git+https://github.com/Studio-42/elFinder.git#2.1.33",
-    "filetree-css": "^1.0.0",
     "font-awesome": "4.7.0",
     "guacamole-common-js": "0.9.14-b",
-    "handlebars": "^4.0.11",
+    "handlebars": "^4.1.2",
     "intl": "1.2.5",
-    "jquery": "3.2.1",
+    "jquery": "^3.4.1",
     "jquery-slimscroll": "^1.3.8",
     "jquery-sparkline": "^2.4.0",
     "jvectormap": "1.2.2",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.15",
     "material-design-icons": "^3.0.1",
     "materialize-css": "^0.100.2",
     "metismenu": "^2.7.9",
@@ -78,8 +75,8 @@
   "devDependencies": {
     "@angular-devkit/core": "^0.4.9",
     "@angular-devkit/schematics": "^0.4.9",
-    "@angular/cli": "^1.7.4",
-    "@angular/compiler-cli": "5.2.0",
+    "@angular/cli": "^7.2.1",
+    "@angular/compiler-cli": "^5.2.11",
     "@angular/language-service": "5.2.0",
     "@types/jasmine": "2.8.4",
     "@types/jasminewd2": "~2.0.2",

src/app/app.service.ts

-/**
- * 后台控制
- *
- *
- * @date     2017-11-07
- * @author   liuzheng <liuzheng712@gmail.com>
- */
 import {EventEmitter, Injectable, OnInit} from '@angular/core';
 import {Router} from '@angular/router';
 import {CookieService} from 'ngx-cookie-service';

src/app/elements/content-tab/content-tab.component.css

@@ -19,7 +19,8 @@ li {
   box-sizing: content-box;
   float: left;;
   background-color: #463a3a66;
-  border-right: 1px solid #3a3333c2;
+  border-right: 1px solid #6b6565c2;
+  border-radius: 2px;
 }
 
 li.active {

src/app/elements/content/content.component.html

-<div id="content" fxLayout="column" ngxSplit="column" style="width: 100%;height: 100%;">
+<div id="content" fxLayout="column" ngxSplit="column">
   <div fxFlex="0 0 30px">
     <div class="scroll-button" style="padding: 0 5px">
       <a class="left" (click)="scrollLeft()"><i class="fa fa-caret-left"></i></a>
@@ -13,9 +13,9 @@
       </ul>
     </div>
   </div>
-  <div fxFlex="0 0 calc(100%-35px)" id="winContainer">
+  <div fxFlex="1 1 calc(100%-30px)" id="winContainer">
     <elements-content-window *ngFor="let view of viewList" [view]="view" ></elements-content-window>
   </div>
 </div>
 
-<elements-connect (onNewView)="onNewView($event)" ></elements-connect>
+<elements-connect [ngStyle]="{'display': none}" (onNewView)="onNewView($event)" ></elements-connect>

src/app/pages/main/main.component.css

@@ -7,11 +7,16 @@ div {
   position: initial;
 }
 
+elements-nav {
+  height: 30px;
+}
 
 #container {
   padding-top: 0;
+  height: calc(100% - 30px);
 }
 
-.container-fluid {
-  padding-top: 30px;
-}
+
+/*.container-fluid {*/
+  /*padding-top: 30px;*/
+/*}*/