feat: update

parent c7d1ed11
...@@ -18,17 +18,21 @@ import {HttpModule} from '@angular/http'; ...@@ -18,17 +18,21 @@ import {HttpModule} from '@angular/http';
import {AppRoutingModule} from './app-routing.module'; import {AppRoutingModule} from './app-routing.module';
import {AppComponent} from './app.component'; import {AppComponent} from './app.component';
// service
import {AppService, HttpService} from './app.service';
import {LayerService} from './elements/layer/layer.service';
// Elements // Elements
import {ElementFooterComponent} from './elements/footer/footer.component'; import {ElementFooterComponent} from './elements/footer/footer.component';
import {ElementTermComponent} from './elements/term/term.component'; import {ElementTermComponent} from './elements/term/term.component';
import {ElementInteractiveComponent} from './elements/interactive/interactive.component'; import {ElementInteractiveComponent} from './elements/interactive/interactive.component';
import {ElementNavComponent} from './elements/nav/nav.component'; import {ElementNavComponent} from './elements/nav/nav.component';
import {LoginComponent} from './BasicPage/login/login.component';
import {ElementPopupComponent} from './elements/popup/popup.component'; import {ElementPopupComponent} from './elements/popup/popup.component';
import {ElementRdpComponent} from './elements/rdp/rdp.component'; import {ElementRdpComponent} from './elements/rdp/rdp.component';
import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component'; import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component';
import {ElementIframeComponent} from './elements/iframe/iframe.component'; import {ElementIframeComponent} from './elements/iframe/iframe.component';
// pages // pages
import {LoginComponent} from './BasicPage/login/login.component';
import {IleftbarComponent} from './IndexPage/ileftbar/ileftbar.component'; import {IleftbarComponent} from './IndexPage/ileftbar/ileftbar.component';
import {SearchComponent, SearchFilter} from './ControlPage/search/search.component'; import {SearchComponent, SearchFilter} from './ControlPage/search/search.component';
import {CleftbarComponent} from './ControlPage/cleftbar/cleftbar.component'; import {CleftbarComponent} from './ControlPage/cleftbar/cleftbar.component';
...@@ -48,8 +52,6 @@ import {LinuxComponent} from './monitor-page/linux/linux.component'; ...@@ -48,8 +52,6 @@ import {LinuxComponent} from './monitor-page/linux/linux.component';
import {WindowsComponent} from './monitor-page/windows/windows.component'; import {WindowsComponent} from './monitor-page/windows/windows.component';
import {BrowserXhr} from '@angular/http'; import {BrowserXhr} from '@angular/http';
import {NgProgressModule, NgProgressBrowserXhr} from 'ngx-progressbar'; import {NgProgressModule, NgProgressBrowserXhr} from 'ngx-progressbar';
import {AppService, HttpService} from './app.service';
import {LayerService} from './elements/layer/layer.service';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -95,7 +97,8 @@ import {LayerService} from './elements/layer/layer.service'; ...@@ -95,7 +97,8 @@ import {LayerService} from './elements/layer/layer.service';
{provide: BrowserXhr, useClass: NgProgressBrowserXhr}, {provide: BrowserXhr, useClass: NgProgressBrowserXhr},
AppService, AppService,
HttpService, HttpService,
Logger LayerService,
Logger,
] ]
}) })
export class AppModule { export class AppModule {
......
...@@ -13,6 +13,7 @@ import {Logger} from 'angular2-logger/core'; ...@@ -13,6 +13,7 @@ import {Logger} from 'angular2-logger/core';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/catch';
import {DataStore, User, Browser} from './globals'; import {DataStore, User, Browser} from './globals';
import {NgLayer} from 'angular2-layer';
declare function unescape(s: string): string; declare function unescape(s: string): string;
@Injectable() @Injectable()
......
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {LayerService} from '../layer/layer.service'; import {LayerService} from '../layer/layer.service';
export class Menu { export class Menu {
name: string; name: string;
type: string; type: string;
...@@ -17,7 +18,7 @@ export class ElementServerMenuComponent implements OnInit { ...@@ -17,7 +18,7 @@ export class ElementServerMenuComponent implements OnInit {
top: number; top: number;
left: number; left: number;
constructor() { constructor(private ly: LayerService) {
} }
ngOnInit() { ngOnInit() {
...@@ -28,6 +29,7 @@ export class ElementServerMenuComponent implements OnInit { ...@@ -28,6 +29,7 @@ export class ElementServerMenuComponent implements OnInit {
m.type = 'lll'; m.type = 'lll';
line.type = 'line'; line.type = 'line';
this.MenuList = [m, m, line, m, m]; this.MenuList = [m, m, line, m, m];
this.ly.alert();
} }
public contextmenu(top: number, left: number) { public contextmenu(top: number, left: number) {
......
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