Merged in dev (pull request #49)

Dev

Merged in dev (pull request #49)
Dev
12f3e829 · zheng liu · 1e55448a · 2e1bfb6d · 12f3e829 · 12f3e829
Commit 12f3e829 authored Feb 01, 2018 by zheng liu
20 changed files
--- a/mock.py
+++ b/mock.py
@@ -84,6 +84,9 @@ class SSHws(Namespace):
    self.leave_room(room=self.clients[request.sid]["room"])
    join_room(room)
+  def on_token(self, token):
+    print(token)
  def on_disconnect(self):
    print("disconnect")
    for connection in self.clients[request.sid]["chan"]:

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "scripts": {
    "ng": "ng",
    "start": "ng serve --proxy-config proxy.conf.json",
-    "build": "ng build -prod --base-href=/luna/  --deploy '/luna/'",
+    "build": "ng build --environment prod --base-href=/luna/  --deploy '/luna/'",
    "test": "ng test",
    "lint": "ng lint",
    "e2e": "ng e2e"
@@ -19,11 +19,11 @@
    "@angular/core": "5.2.0",
    "@angular/forms": "5.2.0",
    "@angular/http": "5.2.0",
+    "@angular/material": "^5.1.1",
    "@angular/platform-browser": "5.2.0",
    "@angular/platform-browser-dynamic": "5.2.0",
    "@angular/router": "5.2.0",
    "animate.css": "^3.5.2",
-    "base64-js": "^1.2.1",
    "body-parser": "^1.18.2",
    "bootstrap": "^4.0.0-beta.3",
    "clipboard": "^1.7.1",
@@ -62,6 +62,7 @@
    "socket.io-client": "^2.0.4",
    "ssh-keygen": "^0.4.1",
    "tether": "^1.4.0",
+    "tslib": "1.8.1",
    "uuid-js": "^0.7.5",
    "xterm": "^2.9.2",
    "zone.js": "0.8.20"
@@ -87,7 +88,6 @@
    "karma-jasmine-html-reporter": "0.2.2",
    "protractor": "5.2.2",
    "ts-node": "3.3.0",
-    "tslib": "1.8.1",
    "tslint": "5.9.1",
    "typescript": "2.4.2"
  }

--- a/src/app/ControlPage/cleftbar/cleftbar.component.ts
+++ b/src/app/ControlPage/cleftbar/cleftbar.component.ts
@@ -15,7 +15,7 @@ import {version} from '../../../environments/environment';
 import * as jQuery from 'jquery/dist/jquery.min.js';
 import {ElementServerMenuComponent} from '../../elements/server-menu/server-menu.component';
 import {NavList, View} from '../control/control.component';
-import {LayerService} from '../../elements/layer/layer.service';
+import {DialogService} from '../../elements/dialog/dialog.service';
 export interface HostGroup {
@@ -83,7 +83,7 @@ export class CleftbarComponent implements OnInit {
              private _search: SearchComponent,
              private _logger: LogService,
              private _menu: ElementServerMenuComponent,
-              private _layer: LayerService) {
+              private _dialog: DialogService) {
    this._logger.log('nav.ts:NavComponent');
    // this._appService.getnav()
  }
@@ -126,7 +126,7 @@ export class CleftbarComponent implements OnInit {
        for (const u of host.system_users_granted) {
          options += '<option value="' + u.id + '">' + u.username + '</option>';
        }
-        this._layer.open({
+        this._dialog.open({
          title: 'Please Choose a User',
          scrollbar: false,
          moveOut: true,
@@ -142,7 +142,7 @@ export class CleftbarComponent implements OnInit {
              }
            }
            that.login(host, user);
-            that._layer.close(index);
+            that._dialog.close(index);
          },
          btn2: function (index, layero) {
          },

--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -17,6 +17,8 @@ import {MonitorPageComponent} from './monitor-page/monitor-page.component';
 import {RdpPageComponent} from './rdp-page/rdp-page.component';
 import {TermPageComponent} from './term-page/term-page.component';
 import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component';
+import {BlankPageComponent} from './blank-page/blank-page.component';
+import {TestPageComponent} from './test-page/test-page.component';
 const appRoutes: Routes = [
  // {path: 'users/login', component: LoginComponent},
@@ -24,7 +26,8 @@ const appRoutes: Routes = [
  {path: 'term/:token', component: TermPageComponent},
  {path: 'replay/:token', component: ReplayPageComponent},
  {path: 'monitor/:token', component: MonitorPageComponent},
-  {path: 'test', component: TermPageComponent},
+  {path: 'test', component: TestPageComponent},
+  {path: 'undefined', component: BlankPageComponent},
  {path: '', component: ControlPageComponent},
  {path: '**', component: NotFoundComponent}
 ];

--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -10,16 +10,17 @@
 * @author   liuzheng <liuzheng712@gmail.com>
 */
 import {BrowserModule} from '@angular/platform-browser';
-import {ClassProvider, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms'; // <-- NgModel lives here
 import {LoggerModule, NGXLogger, NgxLoggerLevel} from 'ngx-logger';
+import {HttpClientModule} from '@angular/common/http';
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
 // service
 import {AppService, HttpService, LogService, UUIDService} from './app.service';
-import {LayerService} from './elements/layer/layer.service';
+import {DialogService} from './elements/dialog/dialog.service';
 // Elements
 import {ElementFooterComponent} from './elements/footer/footer.component';
@@ -51,7 +52,7 @@ import {LinuxComponent} from './monitor-page/linux/linux.component';
 import {WindowsComponent} from './monitor-page/windows/windows.component';
 import {NgProgressModule} from 'ngx-progressbar';
 import {TestPageComponent} from './test-page/test-page.component';
-import {HttpClientModule} from '@angular/common/http';
+import { BlankPageComponent } from './blank-page/blank-page.component';
 // import {NgxLayerModule} from 'ngx-layer';
@@ -95,6 +96,7 @@ import {HttpClientModule} from '@angular/common/http';
    LinuxComponent,
    WindowsComponent,
    TestPageComponent,
+    BlankPageComponent,
  ],
  bootstrap: [AppComponent],
  providers: [
@@ -104,7 +106,7 @@ import {HttpClientModule} from '@angular/common/http';
    HttpService,
    LogService,
    UUIDService,
-    LayerService,
+    DialogService,
    NGXLogger
  ]
 })

--- a/src/app/app.service.ts
+++ b/src/app/app.service.ts
@@ -12,7 +12,7 @@ import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/catch';
 import {DataStore, User, Browser} from './globals';
 import {environment} from '../environments/environment';
-import {HttpClient, HttpHeaders} from '@angular/common/http';
+import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
 import {NGXLogger} from 'ngx-logger';
 import {HostGroup} from './ControlPage/cleftbar/cleftbar.component';
 import * as UUID from 'uuid-js/lib/uuid.js';
@@ -71,10 +71,12 @@ export class HttpService {
  }
  get_guacamole_token(username: string, assetID: string, systemUserID: string) {
-    return this.http.post('/guacamole/api/tokens', {
+    const body = new HttpParams()
-      username: username, password: 'zheng', asset_id:
+      .set('username', username)
-      assetID, system_user_id: systemUserID
+      .set('password', 'jumpserver')
-    }, {headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')});
+      .set('asset_id', assetID)
+      .set('system_user_id', systemUserID);
+    return this.http.post('/guacamole/api/tokens', body.toString(), {headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')});
  }
  search(q: string) {
@@ -197,7 +199,9 @@ export class AppService implements OnInit {
                User.wechat = data['wechat'];
                User.comment = data['comment'];
                User.date_expired = data['date_expired'];
+                if (data['phone']) {
                  User.phone = data['phone'].toString();
+                }
                User.logined = data['logined'];
                this._logger.debug(User);
              },

--- a/src/app/blank-page/blank-page.component.html
+++ b/src/app/blank-page/blank-page.component.html
--- a/src/app/blank-page/blank-page.component.scss
+++ b/src/app/blank-page/blank-page.component.scss
--- a/src/app/blank-page/blank-page.component.spec.ts
+++ b/src/app/blank-page/blank-page.component.spec.ts
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BlankPageComponent } from './blank-page.component';
+describe('BlankPageComponent', () => {
+  let component: BlankPageComponent;
+  let fixture: ComponentFixture<BlankPageComponent>;
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BlankPageComponent ]
+    })
+    .compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BlankPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/blank-page/blank-page.component.ts
+++ b/src/app/blank-page/blank-page.component.ts
+import {Component, OnInit} from '@angular/core';
+import {DataStore} from '../globals';
+@Component({
+  selector: 'app-blank-page',
+  templateUrl: './blank-page.component.html',
+  styleUrls: ['./blank-page.component.scss']
+})
+export class BlankPageComponent implements OnInit {
+  constructor() {
+    DataStore.NavShow = false;
+  }
+  ngOnInit() {
+  }
+}
--- a/src/app/elements/layer/layer.service.ts
+++ b/src/app/elements/layer/layer.service.ts
@@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
 import * as layer from 'layui-layer/src/layer.js';
 @Injectable()
-export class LayerService {
+export class DialogService {
  constructor() {
  }

--- a/src/app/elements/dialog/layer.js
+++ b/src/app/elements/dialog/layer.js
+/**
+ @Name：layer v3.1.0 Web弹层组件
+ @Author：贤心
+ @Site：http://layer.layui.com
+ @License：MIT
+ */
+;!function(window, undefined){
+"use strict";
+var isLayui = window.layui && layui.define, $, win, ready = {
+  getPath: function(){
+    var js = document.scripts, script = js[js.length - 1], jsPath = script.src;
+    if(script.getAttribute('merge')) return;
+    return jsPath.substring(0, jsPath.lastIndexOf("/") + 1);
+  }(),
+  config: {}, end: {}, minIndex: 0, minLeft: [],
+  btn: ['&#x786E;&#x5B9A;', '&#x53D6;&#x6D88;'],
+  //五种原始层模式
+  type: ['dialog', 'page', 'iframe', 'loading', 'tips'],
+  //获取节点的style属性值
+  getStyle: function(node, name){
+    var style = node.currentStyle ? node.currentStyle : window.getComputedStyle(node, null);
+    return style[style.getPropertyValue ? 'getPropertyValue' : 'getAttribute'](name);
+  },
+  //载入CSS配件
+  link: function(href, fn, cssname){
+    //未设置路径，则不主动加载css
+    if(!layer.path) return;
+    var head = document.getElementsByTagName("head")[0], link = document.createElement('link');
+    if(typeof fn === 'string') cssname = fn;
+    var app = (cssname || href).replace(/\.|\//g, '');
+    var id = 'layuicss-'+ app, timeout = 0;
+    link.rel = 'stylesheet';
+    link.href = layer.path + href;
+    link.id = id;
+    if(!document.getElementById(id)){
+      head.appendChild(link);
+    }
+    if(typeof fn !== 'function') return;
+    //轮询css是否加载完毕
+    (function poll() {
+      if(++timeout > 8 * 1000 / 100){
+        return window.console && console.error('layer.css: Invalid');
+      };
+      parseInt(ready.getStyle(document.getElementById(id), 'width')) === 1989 ? fn() : setTimeout(poll, 100);
+    }());
+  }
+};
+//默认内置方法。
+var layer = {
+  v: '3.1.0',
+  ie: function(){ //ie版本
+    var agent = navigator.userAgent.toLowerCase();
+    return (!!window.ActiveXObject || "ActiveXObject" in window) ? (
+      (agent.match(/msie\s(\d+)/) || [])[1] || '11' //由于ie11并没有msie的标识
+    ) : false;
+  }(),
+  index: (window.layer && window.layer.v) ? 100000 : 0,
+  path: ready.getPath,
+  config: function(options, fn){
+    options = options || {};
+    layer.cache = ready.config = $.extend({}, ready.config, options);
+    layer.path = ready.config.path || layer.path;
+    typeof options.extend === 'string' && (options.extend = [options.extend]);
+    if(ready.config.path) layer.ready();
+    if(!options.extend) return this;
+    isLayui 
+      ? layui.addcss('modules/layer/' + options.extend)
+    : ready.link('theme/' + options.extend);
+    return this;
+  },
+  //主体CSS等待事件
+  ready: function(callback){
+    var cssname = 'layer', ver = ''
+    ,path = (isLayui ? 'modules/layer/' : 'theme/') + 'default/layer.css?v='+ layer.v + ver;
+    isLayui ? layui.addcss(path, callback, cssname) : ready.link(path, callback, cssname);
+    return this;
+  },
+  //各种快捷引用
+  alert: function(content, options, yes){
+    var type = typeof options === 'function';
+    if(type) yes = options;
+    return layer.open($.extend({
+      content: content,
+      yes: yes
+    }, type ? {} : options));
+  }, 
+  confirm: function(content, options, yes, cancel){ 
+    var type = typeof options === 'function';
+    if(type){
+      cancel = yes;
+      yes = options;
+    }
+    return layer.open($.extend({
+      content: content,
+      btn: ready.btn,
+      yes: yes,
+      btn2: cancel
+    }, type ? {} : options));
+  },
+  msg: function(content, options, end){ //最常用提示层
+    var type = typeof options === 'function', rskin = ready.config.skin;
+    var skin = (rskin ? rskin + ' ' + rskin + '-msg' : '')||'layui-layer-msg';
+    var anim = doms.anim.length - 1;
+    if(type) end = options;
+    return layer.open($.extend({
+      content: content,
+      time: 3000,
+      shade: false,
+      skin: skin,
+      title: false,
+      closeBtn: false,
+      btn: false,
+      resize: false,
+      end: end
+    }, (type && !ready.config.skin) ? {
+      skin: skin + ' layui-layer-hui',
+      anim: anim
+    } : function(){
+       options = options || {};
+       if(options.icon === -1 || options.icon === undefined && !ready.config.skin){
+         options.skin = skin + ' ' + (options.skin||'layui-layer-hui');
+       }
+       return options;
+    }()));  
+  },
+  load: function(icon, options){
+    return layer.open($.extend({
+      type: 3,
+      icon: icon || 0,
+      resize: false,
+      shade: 0.01
+    }, options));
+  }, 
+  tips: function(content, follow, options){
+    return layer.open($.extend({
+      type: 4,
+      content: [content, follow],
+      closeBtn: false,
+      time: 3000,
+      shade: false,
+      resize: false,
+      fixed: false,
+      maxWidth: 210
+    }, options));
+  }
+};
+var Class = function(setings){  
+  var that = this;
+  that.index = ++layer.index;
+  that.config = $.extend({}, that.config, ready.config, setings);
+  document.body ? that.creat() : setTimeout(function(){
+    that.creat();
+  }, 30);
+};
+Class.pt = Class.prototype;
+//缓存常用字符
+var doms = ['layui-layer', '.layui-layer-title', '.layui-layer-main', '.layui-layer-dialog', 'layui-layer-iframe', 'layui-layer-content', 'layui-layer-btn', 'layui-layer-close'];
+doms.anim = ['layer-anim-00', 'layer-anim-01', 'layer-anim-02', 'layer-anim-03', 'layer-anim-04', 'layer-anim-05', 'layer-anim-06'];
+//默认配置
+Class.pt.config = {
+  type: 0,
+  shade: 0.3,
+  fixed: true,
+  move: doms[1],
+  title: '&#x4FE1;&#x606F;',
+  offset: 'auto',
+  area: 'auto',
+  closeBtn: 1,
+  time: 0, //0表示不自动关闭
+  zIndex: 19891014, 
+  maxWidth: 360,
+  anim: 0,
+  isOutAnim: true,
+  icon: -1,
+  moveType: 1,
+  resize: true,
+  scrollbar: true, //是否允许浏览器滚动条
+  tips: 2
+};
+//容器
+Class.pt.vessel = function(conType, callback){
+  var that = this, times = that.index, config = that.config;
+  var zIndex = config.zIndex + times, titype = typeof config.title === 'object';
+  var ismax = config.maxmin && (config.type === 1 || config.type === 2);
+  var titleHTML = (config.title ? '<div class="layui-layer-title" style="'+ (titype ? config.title[1] : '') +'">' 
+    + (titype ? config.title[0] : config.title) 
+  + '</div>' : '');
+  config.zIndex = zIndex;
+  callback([
+    //遮罩
+    config.shade ? ('<div class="layui-layer-shade" id="layui-layer-shade'+ times +'" times="'+ times +'" style="'+ ('z-index:'+ (zIndex-1) +'; ') +'"></div>') : '',
+    //主体
+    '<div class="'+ doms[0] + (' layui-layer-'+ready.type[config.type]) + (((config.type == 0 || config.type == 2) && !config.shade) ? ' layui-layer-border' : '') + ' ' + (config.skin||'') +'" id="'+ doms[0] + times +'" type="'+ ready.type[config.type] +'" times="'+ times +'" showtime="'+ config.time +'" conType="'+ (conType ? 'object' : 'string') +'" style="z-index: '+ zIndex +'; width:'+ config.area[0] + ';height:' + config.area[1] + (config.fixed ? '' : ';position:absolute;') +'">'
+      + (conType && config.type != 2 ? '' : titleHTML)
+      + '<div id="'+ (config.id||'') +'" class="layui-layer-content'+ ((config.type == 0 && config.icon !== -1) ? ' layui-layer-padding' :'') + (config.type == 3 ? ' layui-layer-loading'+config.icon : '') +'">'
+        + (config.type == 0 && config.icon !== -1 ? '<i class="layui-layer-ico layui-layer-ico'+ config.icon +'"></i>' : '')
+        + (config.type == 1 && conType ? '' : (config.content||''))
+      + '</div>'
+      + '<span class="layui-layer-setwin">'+ function(){
+        var closebtn = ismax ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
+        config.closeBtn && (closebtn += '<a class="layui-layer-ico '+ doms[7] +' '+ doms[7] + (config.title ? config.closeBtn : (config.type == 4 ? '1' : '2')) +'" href="javascript:;"></a>');
+        return closebtn;
+      }() + '</span>'
+      + (config.btn ? function(){
+        var button = '';
+        typeof config.btn === 'string' && (config.btn = [config.btn]);
+        for(var i = 0, len = config.btn.length; i < len; i++){
+          button += '<a class="'+ doms[6] +''+ i +'">'+ config.btn[i] +'</a>'
+        }
+        return '<div class="'+ doms[6] +' layui-layer-btn-'+ (config.btnAlign||'') +'">'+ button +'</div>'
+      }() : '')
+      + (config.resize ? '<span class="layui-layer-resize"></span>' : '')
+    + '</div>'
+  ], titleHTML, $('<div class="layui-layer-move"></div>'));
+  return that;
+};
+//创建骨架
+Class.pt.creat = function(){
+  var that = this
+  ,config = that.config
+  ,times = that.index, nodeIndex
+  ,content = config.content
+  ,conType = typeof content === 'object'
+  ,body = $('body');
+  if(config.id && $('#'+config.id)[0])  return;
+  if(typeof config.area === 'string'){
+    config.area = config.area === 'auto' ? ['', ''] : [config.area, ''];
+  }
+  //anim兼容旧版shift
+  if(config.shift){
+    config.anim = config.shift;
+  }
+  if(layer.ie == 6){
+    config.fixed = false;
+  }
+  switch(config.type){
+    case 0:
+      config.btn = ('btn' in config) ? config.btn : ready.btn[0];
+      layer.closeAll('dialog');
+    break;
+    case 2:
+      var content = config.content = conType ? config.content : [config.content||'http://layer.layui.com', 'auto'];
+      config.content = '<iframe scrolling="'+ (config.content[1]||'auto') +'" allowtransparency="true" id="'+ doms[4] +''+ times +'" name="'+ doms[4] +''+ times +'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="' + config.content[0] + '"></iframe>';
+    break;
+    case 3:
+      delete config.title;
+      delete config.closeBtn;
+      config.icon === -1 && (config.icon === 0);
+      layer.closeAll('loading');
+    break;
+    case 4:
+      conType || (config.content = [config.content, 'body']);
+      config.follow = config.content[1];
+      config.content = config.content[0] + '<i class="layui-layer-TipsG"></i>';
+      delete config.title;
+      config.tips = typeof config.tips === 'object' ? config.tips : [config.tips, true];
+      config.tipsMore || layer.closeAll('tips');
+    break;
+  }
+  //建立容器
+  that.vessel(conType, function(html, titleHTML, moveElem){
+    body.append(html[0]);
+    conType ? function(){
+      (config.type == 2 || config.type == 4) ? function(){
+        $('body').append(html[1]);
+      }() : function(){
+        if(!content.parents('.'+doms[0])[0]){
+          content.data('display', content.css('display')).show().addClass('layui-layer-wrap').wrap(html[1]);
+          $('#'+ doms[0] + times).find('.'+doms[5]).before(titleHTML);
+        }
+      }();
+    }() : body.append(html[1]);
+    $('.layui-layer-move')[0] || body.append(ready.moveElem = moveElem);
+    that.layero = $('#'+ doms[0] + times);
+    config.scrollbar || doms.html.css('overflow', 'hidden').attr('layer-full', times);
+  }).auto(times);
+  //遮罩
+  $('#layui-layer-shade'+ that.index).css({
+    'background-color': config.shade[1] || '#000'
+    ,'opacity': config.shade[0]||config.shade
+  });
+  config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]);
+  //坐标自适应浏览器窗口尺寸
+  config.type == 4 ? that.tips() : that.offset();
+  if(config.fixed){
+    win.on('resize', function(){
+      that.offset();
+      (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(times);
+      config.type == 4 && that.tips();
+    });
+  }
+  config.time <= 0 || setTimeout(function(){
+    layer.close(that.index)
+  }, config.time);
+  that.move().callback();
+  //为兼容jQuery3.0的css动画影响元素尺寸计算
+  if(doms.anim[config.anim]){
+    var animClass = 'layer-anim '+ doms.anim[config.anim];
+    that.layero.addClass(animClass).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function(){
+      $(this).removeClass(animClass);
+    });
+  };
+  //记录关闭动画
+  if(config.isOutAnim){
+    that.layero.data('isOutAnim', true);
+  }
+};
+//自适应
+Class.pt.auto = function(index){
+  var that = this, config = that.config, layero = $('#'+ doms[0] + index);
+  if(config.area[0] === '' && config.maxWidth > 0){
+    //为了修复IE7下一个让人难以理解的bug
+    if(layer.ie && layer.ie < 8 && config.btn){
+      layero.width(layero.innerWidth());
+    }
+    layero.outerWidth() > config.maxWidth && layero.width(config.maxWidth);
+  }
+  var area = [layero.innerWidth(), layero.innerHeight()]
+  ,titHeight = layero.find(doms[1]).outerHeight() || 0
+  ,btnHeight = layero.find('.'+doms[6]).outerHeight() || 0
+  ,setHeight = function(elem){
+    elem = layero.find(elem);
+    elem.height(area[1] - titHeight - btnHeight - 2*(parseFloat(elem.css('padding-top'))|0));
+  };
+  switch(config.type){
+    case 2: 
+      setHeight('iframe');
+    break;
+    default:
+      if(config.area[1] === ''){
+        if(config.maxHeight > 0 && layero.outerHeight() > config.maxHeight){
+          area[1] = config.maxHeight;
+          setHeight('.'+doms[5]);
+        } else if(config.fixed && area[1] >= win.height()){
+          area[1] = win.height();
+          setHeight('.'+doms[5]);
+        }
+      } else {
+        setHeight('.'+doms[5]);
+      }
+    break;
+  };
+  return that;
+};
+//计算坐标
+Class.pt.offset = function(){
+  var that = this, config = that.config, layero = that.layero;
+  var area = [layero.outerWidth(), layero.outerHeight()];
+  var type = typeof config.offset === 'object';
+  that.offsetTop = (win.height() - area[1])/2;
+  that.offsetLeft = (win.width() - area[0])/2;
+  if(type){
+    that.offsetTop = config.offset[0];
+    that.offsetLeft = config.offset[1]||that.offsetLeft;
+  } else if(config.offset !== 'auto'){
+    if(config.offset === 't'){ //上
+      that.offsetTop = 0;
+    } else if(config.offset === 'r'){ //右
+      that.offsetLeft = win.width() - area[0];
+    } else if(config.offset === 'b'){ //下
+      that.offsetTop = win.height() - area[1];
+    } else if(config.offset === 'l'){ //左
+      that.offsetLeft = 0;
+    } else if(config.offset === 'lt'){ //左上角
+      that.offsetTop = 0;
+      that.offsetLeft = 0;
+    } else if(config.offset === 'lb'){ //左下角
+      that.offsetTop = win.height() - area[1];
+      that.offsetLeft = 0;
+    } else if(config.offset === 'rt'){ //右上角
+      that.offsetTop = 0;
+      that.offsetLeft = win.width() - area[0];
+    } else if(config.offset === 'rb'){ //右下角
+      that.offsetTop = win.height() - area[1];
+      that.offsetLeft = win.width() - area[0];
+    } else {
+      that.offsetTop = config.offset;
+    }
+  }
+  if(!config.fixed){
+    that.offsetTop = /%$/.test(that.offsetTop) ? 
+      win.height()*parseFloat(that.offsetTop)/100
+    : parseFloat(that.offsetTop);
+    that.offsetLeft = /%$/.test(that.offsetLeft) ? 
+      win.width()*parseFloat(that.offsetLeft)/100
+    : parseFloat(that.offsetLeft);
+    that.offsetTop += win.scrollTop();
+    that.offsetLeft += win.scrollLeft();
+  }
+  if(layero.attr('minLeft')){
+    that.offsetTop = win.height() - (layero.find(doms[1]).outerHeight() || 0);
+    that.offsetLeft = layero.css('left');
+  }
+  layero.css({top: that.offsetTop, left: that.offsetLeft});
+};
+//Tips
+Class.pt.tips = function(){
+  var that = this, config = that.config, layero = that.layero;
+  var layArea = [layero.outerWidth(), layero.outerHeight()], follow = $(config.follow);
+  if(!follow[0]) follow = $('body');
+  var goal = {
+    width: follow.outerWidth(),
+    height: follow.outerHeight(),
+    top: follow.offset().top,
+    left: follow.offset().left
+  }, tipsG = layero.find('.layui-layer-TipsG');
+  var guide = config.tips[0];
+  config.tips[1] || tipsG.remove();
+  goal.autoLeft = function(){
+    if(goal.left + layArea[0] - win.width() > 0){
+      goal.tipLeft = goal.left + goal.width - layArea[0];
+      tipsG.css({right: 12, left: 'auto'});
+    } else {
+      goal.tipLeft = goal.left;
+    };
+  };
+  //辨别tips的方位
+  goal.where = [function(){ //上        
+    goal.autoLeft();
+    goal.tipTop = goal.top - layArea[1] - 10;
+    tipsG.removeClass('layui-layer-TipsB').addClass('layui-layer-TipsT').css('border-right-color', config.tips[1]);
+  }, function(){ //右
+    goal.tipLeft = goal.left + goal.width + 10;
+    goal.tipTop = goal.top;
+    tipsG.removeClass('layui-layer-TipsL').addClass('layui-layer-TipsR').css('border-bottom-color', config.tips[1]); 
+  }, function(){ //下
+    goal.autoLeft();
+    goal.tipTop = goal.top + goal.height + 10;
+    tipsG.removeClass('layui-layer-TipsT').addClass('layui-layer-TipsB').css('border-right-color', config.tips[1]);
+  }, function(){ //左
+    goal.tipLeft = goal.left - layArea[0] - 10;
+    goal.tipTop = goal.top;
+    tipsG.removeClass('layui-layer-TipsR').addClass('layui-layer-TipsL').css('border-bottom-color', config.tips[1]);
+  }];
+  goal.where[guide-1]();
+  /* 8*2为小三角形占据的空间 */
+  if(guide === 1){
+    goal.top - (win.scrollTop() + layArea[1] + 8*2) < 0 && goal.where[2]();
+  } else if(guide === 2){
+    win.width() - (goal.left + goal.width + layArea[0] + 8*2) > 0 || goal.where[3]()
+  } else if(guide === 3){
+    (goal.top - win.scrollTop() + goal.height + layArea[1] + 8*2) - win.height() > 0 && goal.where[0]();
+  } else if(guide === 4){
+     layArea[0] + 8*2 - goal.left > 0 && goal.where[1]()
+  }
+  layero.find('.'+doms[5]).css({
+    'background-color': config.tips[1], 
+    'padding-right': (config.closeBtn ? '30px' : '')
+  });
+  layero.css({
+    left: goal.tipLeft - (config.fixed ? win.scrollLeft() : 0), 
+    top: goal.tipTop  - (config.fixed ? win.scrollTop() : 0)
+  });
+}
+//拖拽层
+Class.pt.move = function(){
+  var that = this
+  ,config = that.config
+  ,_DOC = $(document)
+  ,layero = that.layero
+  ,moveElem = layero.find(config.move)
+  ,resizeElem = layero.find('.layui-layer-resize')
+  ,dict = {};
+  if(config.move){
+    moveElem.css('cursor', 'move');
+  }
+  moveElem.on('mousedown', function(e){
+    e.preventDefault();
+    if(config.move){
+      dict.moveStart = true;
+      dict.offset = [
+        e.clientX - parseFloat(layero.css('left'))
+        ,e.clientY - parseFloat(layero.css('top'))
+      ];
+      ready.moveElem.css('cursor', 'move').show();
+    }
+  });
+  resizeElem.on('mousedown', function(e){
+    e.preventDefault();
+    dict.resizeStart = true;
+    dict.offset = [e.clientX, e.clientY];
+    dict.area = [
+      layero.outerWidth()
+      ,layero.outerHeight()
+    ];
+    ready.moveElem.css('cursor', 'se-resize').show();
+  });
+  _DOC.on('mousemove', function(e){
+    //拖拽移动
+    if(dict.moveStart){
+      var X = e.clientX - dict.offset[0]
+      ,Y = e.clientY - dict.offset[1]
+      ,fixed = layero.css('position') === 'fixed';
+      e.preventDefault();
+      dict.stX = fixed ? 0 : win.scrollLeft();
+      dict.stY = fixed ? 0 : win.scrollTop();
+      //控制元素不被拖出窗口外
+      if(!config.moveOut){
+        var setRig = win.width() - layero.outerWidth() + dict.stX
+        ,setBot = win.height() - layero.outerHeight() + dict.stY;  
+        X < dict.stX && (X = dict.stX);
+        X > setRig && (X = setRig); 
+        Y < dict.stY && (Y = dict.stY);
+        Y > setBot && (Y = setBot);
+      }
+      layero.css({
+        left: X
+        ,top: Y
+      });
+    }
+    //Resize
+    if(config.resize && dict.resizeStart){
+      var X = e.clientX - dict.offset[0]
+      ,Y = e.clientY - dict.offset[1];
+      e.preventDefault();
+      layer.style(that.index, {
+        width: dict.area[0] + X
+        ,height: dict.area[1] + Y
+      })
+      dict.isResize = true;
+      config.resizing && config.resizing(layero);
+    }
+  }).on('mouseup', function(e){
+    if(dict.moveStart){
+      delete dict.moveStart;
+      ready.moveElem.hide();
+      config.moveEnd && config.moveEnd(layero);
+    }
+    if(dict.resizeStart){
+      delete dict.resizeStart;
+      ready.moveElem.hide();
+    }
+  });
+  return that;
+};
+Class.pt.callback = function(){
+  var that = this, layero = that.layero, config = that.config;
+  that.openLayer();
+  if(config.success){
+    if(config.type == 2){
+      layero.find('iframe').on('load', function(){
+        config.success(layero, that.index);
+      });
+    } else {
+      config.success(layero, that.index);
+    }
+  }
+  layer.ie == 6 && that.IE6(layero);
+  //按钮
+  layero.find('.'+ doms[6]).children('a').on('click', function(){
+    var index = $(this).index();
+    if(index === 0){
+      if(config.yes){
+        config.yes(that.index, layero)
+      } else if(config['btn1']){
+        config['btn1'](that.index, layero)
+      } else {
+        layer.close(that.index);
+      }
+    } else {
+      var close = config['btn'+(index+1)] && config['btn'+(index+1)](that.index, layero);
+      close === false || layer.close(that.index);
+    }
+  });
+  //取消
+  function cancel(){
+    var close = config.cancel && config.cancel(that.index, layero);
+    close === false || layer.close(that.index);
+  }
+  //右上角关闭回调
+  layero.find('.'+ doms[7]).on('click', cancel);
+  //点遮罩关闭
+  if(config.shadeClose){
+    $('#layui-layer-shade'+ that.index).on('click', function(){
+      layer.close(that.index);
+    });
+  } 
+  //最小化
+  layero.find('.layui-layer-min').on('click', function(){
+    var min = config.min && config.min(layero);
+    min === false || layer.min(that.index, config); 
+  });
+  //全屏/还原
+  layero.find('.layui-layer-max').on('click', function(){
+    if($(this).hasClass('layui-layer-maxmin')){
+      layer.restore(that.index);
+      config.restore && config.restore(layero);
+    } else {
+      layer.full(that.index, config);
+      setTimeout(function(){
+        config.full && config.full(layero);
+      }, 100);
+    }
+  });
+  config.end && (ready.end[that.index] = config.end);
+};
+//for ie6 恢复select
+ready.reselect = function(){
+  $.each($('select'), function(index , value){
+    var sthis = $(this);
+    if(!sthis.parents('.'+doms[0])[0]){
+      (sthis.attr('layer') == 1 && $('.'+doms[0]).length < 1) && sthis.removeAttr('layer').show(); 
+    }
+    sthis = null;
+  });
+}; 
+Class.pt.IE6 = function(layero){
+  //隐藏select
+  $('select').each(function(index , value){
+    var sthis = $(this);
+    if(!sthis.parents('.'+doms[0])[0]){
+      sthis.css('display') === 'none' || sthis.attr({'layer' : '1'}).hide();
+    }
+    sthis = null;
+  });
+};
+//需依赖原型的对外方法
+Class.pt.openLayer = function(){
+  var that = this;
+  //置顶当前窗口
+  layer.zIndex = that.config.zIndex;
+  layer.setTop = function(layero){
+    var setZindex = function(){
+      layer.zIndex++;
+      layero.css('z-index', layer.zIndex + 1);
+    };
+    layer.zIndex = parseInt(layero[0].style.zIndex);
+    layero.on('mousedown', setZindex);
+    return layer.zIndex;
+  };
+};
+ready.record = function(layero){
+  var area = [
+    layero.width(),
+    layero.height(),
+    layero.position().top, 
+    layero.position().left + parseFloat(layero.css('margin-left'))
+  ];
+  layero.find('.layui-layer-max').addClass('layui-layer-maxmin');
+  layero.attr({area: area});
+};
+ready.rescollbar = function(index){
+  if(doms.html.attr('layer-full') == index){
+    if(doms.html[0].style.removeProperty){
+      doms.html[0].style.removeProperty('overflow');
+    } else {
+      doms.html[0].style.removeAttribute('overflow');
+    }
+    doms.html.removeAttr('layer-full');
+  }
+};
+/** 内置成员 */
+window.layer = layer;
+//获取子iframe的DOM
+layer.getChildFrame = function(selector, index){
+  index = index || $('.'+doms[4]).attr('times');
+  return $('#'+ doms[0] + index).find('iframe').contents().find(selector);  
+};
+//得到当前iframe层的索引，子iframe时使用
+layer.getFrameIndex = function(name){
+  return $('#'+ name).parents('.'+doms[4]).attr('times');
+};
+//iframe层自适应宽高
+layer.iframeAuto = function(index){
+  if(!index) return;
+  var heg = layer.getChildFrame('html', index).outerHeight();
+  var layero = $('#'+ doms[0] + index);
+  var titHeight = layero.find(doms[1]).outerHeight() || 0;
+  var btnHeight = layero.find('.'+doms[6]).outerHeight() || 0;
+  layero.css({height: heg + titHeight + btnHeight});
+  layero.find('iframe').css({height: heg});
+};
+//重置iframe url
+layer.iframeSrc = function(index, url){
+  $('#'+ doms[0] + index).find('iframe').attr('src', url);
+};
+//设定层的样式
+layer.style = function(index, options, limit){
+  var layero = $('#'+ doms[0] + index)
+  ,contElem = layero.find('.layui-layer-content')
+  ,type = layero.attr('type')
+  ,titHeight = layero.find(doms[1]).outerHeight() || 0
+  ,btnHeight = layero.find('.'+doms[6]).outerHeight() || 0
+  ,minLeft = layero.attr('minLeft');
+  if(type === ready.type[3] || type === ready.type[4]){
+    return;
+  }
+  if(!limit){
+    if(parseFloat(options.width) <= 260){
+      options.width = 260;
+    };
+    if(parseFloat(options.height) - titHeight - btnHeight <= 64){
+      options.height = 64 + titHeight + btnHeight;
+    };
+  }
+  layero.css(options);
+  btnHeight = layero.find('.'+doms[6]).outerHeight();
+  if(type === ready.type[2]){
+    layero.find('iframe').css({
+      height: parseFloat(options.height) - titHeight - btnHeight
+    });
+  } else {
+    contElem.css({
+      height: parseFloat(options.height) - titHeight - btnHeight
+      - parseFloat(contElem.css('padding-top'))
+      - parseFloat(contElem.css('padding-bottom'))
+    })
+  }
+};
+//最小化
+layer.min = function(index, options){
+  var layero = $('#'+ doms[0] + index)
+  ,titHeight = layero.find(doms[1]).outerHeight() || 0
+  ,left = layero.attr('minLeft') || (181*ready.minIndex)+'px'
+  ,position = layero.css('position');
+  ready.record(layero);
+  if(ready.minLeft[0]){
+    left = ready.minLeft[0];
+    ready.minLeft.shift();
+  }
+  layero.attr('position', position);
+  layer.style(index, {
+    width: 180
+    ,height: titHeight
+    ,left: left
+    ,top: win.height() - titHeight
+    ,position: 'fixed'
+    ,overflow: 'hidden'
+  }, true);
+  layero.find('.layui-layer-min').hide();
+  layero.attr('type') === 'page' && layero.find(doms[4]).hide();
+  ready.rescollbar(index);
+  if(!layero.attr('minLeft')){
+    ready.minIndex++;
+  }
+  layero.attr('minLeft', left);
+};
+//还原
+layer.restore = function(index){
+  var layero = $('#'+ doms[0] + index), area = layero.attr('area').split(',');
+  var type = layero.attr('type');
+  layer.style(index, {
+    width: parseFloat(area[0]), 
+    height: parseFloat(area[1]), 
+    top: parseFloat(area[2]), 
+    left: parseFloat(area[3]),
+    position: layero.attr('position'),
+    overflow: 'visible'
+  }, true);
+  layero.find('.layui-layer-max').removeClass('layui-layer-maxmin');
+  layero.find('.layui-layer-min').show();
+  layero.attr('type') === 'page' && layero.find(doms[4]).show();
+  ready.rescollbar(index);
+};
+//全屏
+layer.full = function(index){
+  var layero = $('#'+ doms[0] + index), timer;
+  ready.record(layero);
+  if(!doms.html.attr('layer-full')){
+    doms.html.css('overflow','hidden').attr('layer-full', index);
+  }
+  clearTimeout(timer);
+  timer = setTimeout(function(){
+    var isfix = layero.css('position') === 'fixed';
+    layer.style(index, {
+      top: isfix ? 0 : win.scrollTop(),
+      left: isfix ? 0 : win.scrollLeft(),
+      width: win.width(),
+      height: win.height()
+    }, true);
+    layero.find('.layui-layer-min').hide();
+  }, 100);
+};
+//改变title
+layer.title = function(name, index){
+  var title = $('#'+ doms[0] + (index||layer.index)).find(doms[1]);
+  title.html(name);
+};
+//关闭layer总方法
+layer.close = function(index){
+  var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
+  if(!layero[0]) return;
+  var WRAP = 'layui-layer-wrap', remove = function(){
+    if(type === ready.type[1] && layero.attr('conType') === 'object'){
+      layero.children(':not(.'+ doms[5] +')').remove();
+      var wrap = layero.find('.'+WRAP);
+      for(var i = 0; i < 2; i++){
+        wrap.unwrap();
+      }
+      wrap.css('display', wrap.data('display')).removeClass(WRAP);
+    } else {
+      //低版本IE 回收 iframe
+      if(type === ready.type[2]){
+        try {
+          var iframe = $('#'+doms[4]+index)[0];
+          iframe.contentWindow.document.write('');
+          iframe.contentWindow.close();
+          layero.find('.'+doms[5])[0].removeChild(iframe);
+        } catch(e){}
+      }
+      layero[0].innerHTML = '';
+      layero.remove();
+    }
+    typeof ready.end[index] === 'function' && ready.end[index]();
+    delete ready.end[index];
+  };
+  if(layero.data('isOutAnim')){
+    layero.addClass('layer-anim '+ closeAnim);
+  }
+  $('#layui-layer-moves, #layui-layer-shade' + index).remove();
+  layer.ie == 6 && ready.reselect();
+  ready.rescollbar(index); 
+  if(layero.attr('minLeft')){
+    ready.minIndex--;
+    ready.minLeft.push(layero.attr('minLeft'));
+  }
+  if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
+    remove()
+  } else {
+    setTimeout(function(){
+      remove();
+    }, 200);
+  }
+};
+//关闭所有层
+layer.closeAll = function(type){
+  $.each($('.'+doms[0]), function(){
+    var othis = $(this);
+    var is = type ? (othis.attr('type') === type) : 1;
+    is && layer.close(othis.attr('times'));
+    is = null;
+  });
+};
+/** 
+  拓展模块，layui开始合并在一起
+ */
+var cache = layer.cache||{}, skin = function(type){
+  return (cache.skin ? (' ' + cache.skin + ' ' + cache.skin + '-'+type) : '');
+}; 
+//仿系统prompt
+layer.prompt = function(options, yes){
+  var style = '';
+  options = options || {};
+  if(typeof options === 'function') yes = options;
+  if(options.area){
+    var area = options.area;
+    style = 'style="width: '+ area[0] +'; height: '+ area[1] + ';"';
+    delete options.area;
+  }
+  var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input"' + style +'>' + (options.value||'') +'</textarea>' : function(){
+    return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input" value="'+ (options.value||'') +'">';
+  }();
+  var success = options.success;
+  delete options.success;
+  return layer.open($.extend({
+    type: 1
+    ,btn: ['&#x786E;&#x5B9A;','&#x53D6;&#x6D88;']
+    ,content: content
+    ,skin: 'layui-layer-prompt' + skin('prompt')
+    ,maxWidth: win.width()
+    ,success: function(layero){
+      prompt = layero.find('.layui-layer-input');
+      prompt.focus();
+      typeof success === 'function' && success(layero);
+    }
+    ,resize: false
+    ,yes: function(index){
+      var value = prompt.val();
+      if(value === ''){
+        prompt.focus();
+      } else if(value.length > (options.maxlength||500)) {
+        layer.tips('&#x6700;&#x591A;&#x8F93;&#x5165;'+ (options.maxlength || 500) +'&#x4E2A;&#x5B57;&#x6570;', prompt, {tips: 1});
+      } else {
+        yes && yes(value, index, prompt);
+      }
+    }
+  }, options));
+};
+//tab层
+layer.tab = function(options){
+  options = options || {};
+  var tab = options.tab || {}
+  ,THIS = 'layui-this'
+  ,success = options.success;
+  delete options.success;
+  return layer.open($.extend({
+    type: 1,
+    skin: 'layui-layer-tab' + skin('tab'),
+    resize: false,
+    title: function(){
+      var len = tab.length, ii = 1, str = '';
+      if(len > 0){
+        str = '<span class="'+ THIS +'">'+ tab[0].title +'</span>';
+        for(; ii < len; ii++){
+          str += '<span>'+ tab[ii].title +'</span>';
+        }
+      }
+      return str;
+    }(),
+    content: '<ul class="layui-layer-tabmain">'+ function(){
+      var len = tab.length, ii = 1, str = '';
+      if(len > 0){
+        str = '<li class="layui-layer-tabli '+ THIS +'">'+ (tab[0].content || 'no content') +'</li>';
+        for(; ii < len; ii++){
+          str += '<li class="layui-layer-tabli">'+ (tab[ii].content || 'no  content') +'</li>';
+        }
+      }
+      return str;
+    }() +'</ul>',
+    success: function(layero){
+      var btn = layero.find('.layui-layer-title').children();
+      var main = layero.find('.layui-layer-tabmain').children();
+      btn.on('mousedown', function(e){
+        e.stopPropagation ? e.stopPropagation() : e.cancelBubble = true;
+        var othis = $(this), index = othis.index();
+        othis.addClass(THIS).siblings().removeClass(THIS);
+        main.eq(index).show().siblings().hide();
+        typeof options.change === 'function' && options.change(index);
+      });
+      typeof success === 'function' && success(layero);
+    }
+  }, options));
+};
+//相册层
+layer.photos = function(options, loop, key){
+  var dict = {};
+  options = options || {};
+  if(!options.photos) return;
+  var type = options.photos.constructor === Object;
+  var photos = type ? options.photos : {}, data = photos.data || [];
+  var start = photos.start || 0;
+  dict.imgIndex = (start|0) + 1;
+  options.img = options.img || 'img';
+  var success = options.success;
+  delete options.success;
+  if(!type){ //页面直接获取
+    var parent = $(options.photos), pushData = function(){
+      data = [];
+      parent.find(options.img).each(function(index){
+        var othis = $(this);
+        othis.attr('layer-index', index);
+        data.push({
+          alt: othis.attr('alt'),
+          pid: othis.attr('layer-pid'),
+          src: othis.attr('layer-src') || othis.attr('src'),
+          thumb: othis.attr('src')
+        });
+      })
+    };
+    pushData();
+    if (data.length === 0) return;
+    loop || parent.on('click', options.img, function(){
+      var othis = $(this), index = othis.attr('layer-index'); 
+      layer.photos($.extend(options, {
+        photos: {
+          start: index,
+          data: data,
+          tab: options.tab
+        },
+        full: options.full
+      }), true);
+      pushData();
+    })
+    //不直接弹出
+    if(!loop) return;
+  } else if (data.length === 0){
+    return layer.msg('&#x6CA1;&#x6709;&#x56FE;&#x7247;');
+  }
+  //上一张
+  dict.imgprev = function(key){
+    dict.imgIndex--;
+    if(dict.imgIndex < 1){
+      dict.imgIndex = data.length;
+    }
+    dict.tabimg(key);
+  };
+  //下一张
+  dict.imgnext = function(key,errorMsg){
+    dict.imgIndex++;
+    if(dict.imgIndex > data.length){
+      dict.imgIndex = 1;
+      if (errorMsg) {return};
+    }
+    dict.tabimg(key)
+  };
+  //方向键
+  dict.keyup = function(event){
+    if(!dict.end){
+      var code = event.keyCode;
+      event.preventDefault();
+      if(code === 37){
+        dict.imgprev(true);
+      } else if(code === 39) {
+        dict.imgnext(true);
+      } else if(code === 27) {
+        layer.close(dict.index);
+      }
+    }
+  }
+  //切换
+  dict.tabimg = function(key){
+    if(data.length <= 1) return;
+    photos.start = dict.imgIndex - 1;
+    layer.close(dict.index);
+    return layer.photos(options, true, key);
+    setTimeout(function(){
+      layer.photos(options, true, key);
+    }, 200);
+  }
+  //一些动作
+  dict.event = function(){
+    dict.bigimg.hover(function(){
+      dict.imgsee.show();
+    }, function(){
+      dict.imgsee.hide();
+    });
+    dict.bigimg.find('.layui-layer-imgprev').on('click', function(event){
+      event.preventDefault();
+      dict.imgprev();
+    });  
+    dict.bigimg.find('.layui-layer-imgnext').on('click', function(event){     
+      event.preventDefault();
+      dict.imgnext();
+    });
+    $(document).on('keyup', dict.keyup);
+  };
+  //图片预加载
+  function loadImage(url, callback, error) {   
+    var img = new Image();
+    img.src = url; 
+    if(img.complete){
+      return callback(img);
+    }
+    img.onload = function(){
+      img.onload = null;
+      callback(img);
+    };
+    img.onerror = function(e){
+      img.onerror = null;
+      error(e);
+    };  
+  };
+  dict.loadi = layer.load(1, {
+    shade: 'shade' in options ? false : 0.9,
+    scrollbar: false
+  });
+  loadImage(data[start].src, function(img){
+    layer.close(dict.loadi);
+    dict.index = layer.open($.extend({
+      type: 1,
+      id: 'layui-layer-photos',
+      area: function(){
+        var imgarea = [img.width, img.height];
+        var winarea = [$(window).width() - 100, $(window).height() - 100];
+        //如果 实际图片的宽或者高比 屏幕大（那么进行缩放）
+        if(!options.full && (imgarea[0]>winarea[0]||imgarea[1]>winarea[1])){
+          var wh = [imgarea[0]/winarea[0],imgarea[1]/winarea[1]];//取宽度缩放比例、高度缩放比例
+          if(wh[0] > wh[1]){//取缩放比例最大的进行缩放
+            imgarea[0] = imgarea[0]/wh[0];
+            imgarea[1] = imgarea[1]/wh[0];
+          } else if(wh[0] < wh[1]){
+            imgarea[0] = imgarea[0]/wh[1];
+            imgarea[1] = imgarea[1]/wh[1];
+          }
+        }
+        return [imgarea[0]+'px', imgarea[1]+'px']; 
+      }(),
+      title: false,
+      shade: 0.9,
+      shadeClose: true,
+      closeBtn: false,
+      move: '.layui-layer-phimg img',
+      moveType: 1,
+      scrollbar: false,
+      moveOut: true,
+      //anim: Math.random()*5|0,
+      isOutAnim: false,
+      skin: 'layui-layer-photos' + skin('photos'),
+      content: '<div class="layui-layer-phimg">'
+        +'<img src="'+ data[start].src +'" alt="'+ (data[start].alt||'') +'" layer-pid="'+ data[start].pid +'">'
+        +'<div class="layui-layer-imgsee">'
+          +(data.length > 1 ? '<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>' : '')
+          +'<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="javascript:;">'+ (data[start].alt||'') +'</a><em>'+ dict.imgIndex +'/'+ data.length +'</em></span></div>'
+        +'</div>'
+      +'</div>',
+      success: function(layero, index){
+        dict.bigimg = layero.find('.layui-layer-phimg');
+        dict.imgsee = layero.find('.layui-layer-imguide,.layui-layer-imgbar');
+        dict.event(layero);
+        options.tab && options.tab(data[start], layero);
+        typeof success === 'function' && success(layero);
+      }, end: function(){
+        dict.end = true;
+        $(document).off('keyup', dict.keyup);
+      }
+    }, options));
+  }, function(){
+    layer.close(dict.loadi);
+    layer.msg('&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;', {
+      time: 30000, 
+      btn: ['&#x4E0B;&#x4E00;&#x5F20;', '&#x4E0D;&#x770B;&#x4E86;'], 
+      yes: function(){
+        data.length > 1 && dict.imgnext(true,true);
+      }
+    });
+  });
+};
+//主入口
+ready.run = function(_$){
+  $ = _$;
+  win = $(window);
+  doms.html = $('html');
+  layer.open = function(deliver){
+    var o = new Class(deliver);
+    return o.index;
+  };
+};
+//加载方式
+window.layui && layui.define ? (
+  layer.ready()
+  ,layui.define('jquery', function(exports){ //layui加载
+    layer.path = layui.cache.dir;
+    ready.run(layui.$);
+    //暴露模块
+    window.layer = layer;
+    exports('layer', layer);
+  })
+) : (
+  (typeof define === 'function' && define.amd) ? define(['jquery'], function(){ //requirejs加载
+    ready.run(window.jQuery);
+    return layer;
+  }) : function(){ //普通script标签加载
+    ready.run(window.jQuery);
+    layer.ready();
+  }()
+);
+}(window);
--- a/src/app/elements/iframe/iframe.component.ts
+++ b/src/app/elements/iframe/iframe.component.ts
 import {Component, Input, OnInit} from '@angular/core';
 import {DomSanitizer} from '@angular/platform-browser';
 import {NavList} from '../../ControlPage/control/control.component';
 import {User} from '../../globals';
 import {HttpService, LogService} from '../../app.service';
-import * as Base64 from 'base64-js/base64js.min';
-import {Headers} from '@angular/http';
 @Component({
  selector: 'app-element-iframe',
@@ -26,11 +25,10 @@ export class ElementIframeComponent implements OnInit {
    // /guacamole/api/tokens will redirect to http://guacamole/api/tokens
    this._http.get_guacamole_token(User.name, this.host.id, this.userid).subscribe(
      data => {
-        const title = this.host.hostname + '[' + this.host.ip + ']';
+        const base = window.btoa(this.host.hostname + '\0' + 'c' + '\0' + 'jumpserver');
-        const base = Base64.encode(title + '\0' + 'c' + '\0' + 'jumpserver');
        // /guacamole/client will redirect to http://guacamole/#/client
        this.target = document.location.origin +
-          '/guacamole/client/' + base + '?token=' + data['authToken'];
+          '/guacamole/#/client/' + base + '?token=' + data['authToken'];
      },
      error2 => {
        this._logger.error(error2);

--- a/src/app/elements/server-menu/server-menu.component.ts
+++ b/src/app/elements/server-menu/server-menu.component.ts
 import {Component, OnInit} from '@angular/core';
-import {LayerService} from '../layer/layer.service';
+import {DialogService} from '../dialog/dialog.service';
 export class Menu {
@@ -18,7 +18,7 @@ export class ElementServerMenuComponent implements OnInit {
  top: number;
  left: number;
-  constructor(private ly: LayerService) {
+  constructor(private _dialog: DialogService) {
  }
  ngOnInit() {
@@ -29,7 +29,7 @@ export class ElementServerMenuComponent implements OnInit {
    m.type = 'lll';
    line.type = 'line';
    this.MenuList = [m, m, line, m, m];
-    this.ly.alert();
+    this._dialog.alert();
  }
  public contextmenu(top: number, left: number) {

--- a/src/app/elements/term/term.component.ts
+++ b/src/app/elements/term/term.component.ts
@@ -15,7 +15,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
  @Input() host: any;
  @Input() userid: any;
  @Input() index: number;
-  // @Input() room: string;
+  @Input() token: string;
  @ViewChild('term') el: ElementRef;
  secret: string;
  term: any;
@@ -35,7 +35,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
  }
  ngAfterViewInit() {
-    if (this.host) {
+    if (this.host || this.token) {
      if (Cookie.get('cols')) {
        term.col = parseInt(Cookie.get('cols'), 10);
      }
@@ -67,13 +67,13 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
    };
    jQuery(window).resize();
-    if (this.host) {
    NavList.List[this.index].Term = this.term;
+    if (this.host) {
-      // this.term.write('\x1b[31mWelcome to Jumpserver!\x1b[m\r\n');
      TermWS.emit('host', {'uuid': this.host.id, 'userid': this.userid, 'secret': this.secret});
+    }
+    if (this.token) {
+      TermWS.emit('token', {'token': this.token, 'secrte': this.secret});
+    }
    this.term.on('data', function (data) {
      TermWS.emit('data', {'data': data, 'room': NavList.List[that.index].room});
    });
@@ -99,7 +99,6 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
      }
    });
  }
-  }
  TerminalDisconnect() {
    NavList.List[this.index].connected = false;

--- a/src/app/term-page/term-page.component.html
+++ b/src/app/term-page/term-page.component.html
-<p>
+<app-element-term
-  term-page works!
+  [token]="token"
-</p>
+[index]="0">
+</app-element-term>
--- a/src/app/term-page/term-page.component.ts
+++ b/src/app/term-page/term-page.component.ts
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
+import {DataStore} from '../globals';
+import {ActivatedRoute, Params} from '@angular/router';
+import * as jQuery from 'jquery/dist/jquery.min.js';
 @Component({
  selector: 'app-term-page',
@@ -6,10 +9,16 @@ import { Component, OnInit } from '@angular/core';
  styleUrls: ['./term-page.component.scss']
 })
 export class TermPageComponent implements OnInit {
+  token: string;
-  constructor() { }
+  constructor(private activatedRoute: ActivatedRoute) {
+    DataStore.NavShow = false;
+  }
  ngOnInit() {
+    this.activatedRoute.params.subscribe((params: Params) => {
+      this.token = params['token'];
+    });
+    jQuery('body').css('background-color', 'black');
  }
 }
--- a/src/app/test-page/test-page.component.ts
+++ b/src/app/test-page/test-page.component.ts
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
+import {DataStore} from '../globals';
+import {DialogService} from '../elements/dialog/dialog.service';
+// import {Mats, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
 @Component({
  selector: 'app-test-page',
@@ -7,9 +11,12 @@ import { Component, OnInit } from '@angular/core';
 })
 export class TestPageComponent implements OnInit {
-  constructor() { }
+  constructor(private _dialog: DialogService) {
+    DataStore.NavShow = false;
+  }
  ngOnInit() {
+    this._dialog.alert();
  }
 }
--- a/src/styles.css
+++ b/src/styles.css
@@ -31,6 +31,7 @@ app-root {
  font-size: 11px !important;
  padding-bottom: 16px !important;
  font-family: 'Monaco', Inconsolata !important;
+  color: white;
 }
 .terminal {