From b69539d368340fa5935aa532a723b36eaf9340dd Mon Sep 17 00:00:00 2001 From: geek Date: Thu, 24 May 2018 12:16:10 +0900 Subject: [PATCH] ing --- .../discovery/discovery.component.html | 2 +- .../search-config.component.html | 77 +++++++++++++------ .../search-config/search-config.component.ts | 15 +++- .../search-filter.component.html | 20 ++++- .../service-selector.component.html | 16 +++- .../discovery-container.component.html | 1 + .../discovery-container.component.ts | 35 +++++++++ src/packages/discovery/container/index.ts | 5 ++ src/packages/discovery/discovery.module.ts | 9 ++- 9 files changed, 148 insertions(+), 32 deletions(-) create mode 100644 src/packages/discovery/container/discovery/discovery-container.component.html create mode 100644 src/packages/discovery/container/discovery/discovery-container.component.ts create mode 100644 src/packages/discovery/container/index.ts diff --git a/src/packages/discovery/component/discovery/discovery.component.html b/src/packages/discovery/component/discovery/discovery.component.html index 19fd2f0..9545643 100644 --- a/src/packages/discovery/component/discovery/discovery.component.html +++ b/src/packages/discovery/component/discovery/discovery.component.html @@ -6,7 +6,7 @@
- + diff --git a/src/packages/discovery/component/discovery/search-config/search-config.component.html b/src/packages/discovery/component/discovery/search-config/search-config.component.html index 4ef7368..d34b4cb 100644 --- a/src/packages/discovery/component/discovery/search-config/search-config.component.html +++ b/src/packages/discovery/component/discovery/search-config/search-config.component.html @@ -1,29 +1,60 @@
- -
-
-
-
+ -
- Start IP Address : - - - End IP Address : - - Exclude IP Address : - -
+ +
+
+
+
-
- Start Port : - - - End Port : - - Exclude Port : - -
- +
+ Start IP Adress + +
+ + . + + . + + . + +
+
+
+ End IP Adress +
+ + . + + . + + . + +
+
+
+ Exclud IP Adress +
+ + . + + . + + . + +
+
+
+ Start Port : + - + End Port : + + Exclude Port : + +
+ - + +
diff --git a/src/packages/discovery/component/discovery/search-config/search-config.component.ts b/src/packages/discovery/component/discovery/search-config/search-config.component.ts index 6f6e011..cc34ea6 100644 --- a/src/packages/discovery/component/discovery/search-config/search-config.component.ts +++ b/src/packages/discovery/component/discovery/search-config/search-config.component.ts @@ -2,6 +2,10 @@ import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { + FormBuilder, + FormGroup +} from '@angular/forms'; @Component({ selector: 'of-discovery-search-config', @@ -10,7 +14,8 @@ import { export class SearchConfigComponent implements OnInit, AfterContentInit { @Output() discoverySearchStartClick = new EventEmitter(); - @Input() isiii; + + discoveryFormGroup: FormGroup; private ipVesion: string; private startIP: string; @@ -21,16 +26,24 @@ export class SearchConfigComponent implements OnInit, AfterContentInit { private excludePort: string; constructor( + private formBuilder: FormBuilder, ) { } ngOnInit() { this.ipVesion = '0'; + this.initForm(); } ngAfterContentInit() { } + initForm() { + // this.discoveryFormGroup = this.formBuilder.group({ + // + // }); + } + discoveryStartClick() { this.discoverySearchStartClick.emit(); } diff --git a/src/packages/discovery/component/discovery/search-filter/search-filter.component.html b/src/packages/discovery/component/discovery/search-filter/search-filter.component.html index ced558b..34de10b 100644 --- a/src/packages/discovery/component/discovery/search-filter/search-filter.component.html +++ b/src/packages/discovery/component/discovery/search-filter/search-filter.component.html @@ -1,3 +1,21 @@
- Filter +
+ Start IP Address : + - + End IP Address : + +
+
+ Start Port : + - + End Port : + +
+ +
+ + + + +
diff --git a/src/packages/discovery/component/setting/filter/service-selector/service-selector.component.html b/src/packages/discovery/component/setting/filter/service-selector/service-selector.component.html index 8a0623a..99b49ef 100644 --- a/src/packages/discovery/component/setting/filter/service-selector/service-selector.component.html +++ b/src/packages/discovery/component/setting/filter/service-selector/service-selector.component.html @@ -1,6 +1,18 @@
- +
{{crawler.description}}
diff --git a/src/packages/discovery/container/discovery/discovery-container.component.html b/src/packages/discovery/container/discovery/discovery-container.component.html new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/packages/discovery/container/discovery/discovery-container.component.html @@ -0,0 +1 @@ + diff --git a/src/packages/discovery/container/discovery/discovery-container.component.ts b/src/packages/discovery/container/discovery/discovery-container.component.ts new file mode 100644 index 0000000..257669e --- /dev/null +++ b/src/packages/discovery/container/discovery/discovery-container.component.ts @@ -0,0 +1,35 @@ +import { + AfterContentInit, Component, + OnInit +} from '@angular/core'; +import { select, StateObservable } from '@ngrx/store'; +import { ListSelector } from '../../../probe/store'; +import { ActivatedRoute } from '@angular/router'; + +@Component({ + selector: 'of-discovery-container', + templateUrl: './discovery-container.component.html', +}) +export class DiscoveryContainerComponent implements OnInit, AfterContentInit { + + // probe select ? + // get probe list for server + // discovery start + // discovery stop + // get service list + probes$: StateObservable; + + constructor( + private activatedRoute: ActivatedRoute, + ) { + // this.returnURL = this.activatedRoute.snapshot.queryParams['probe'] || null; + // this.probes$ = listStore.pipe(select(ListSelector.select('probes'))); + } + + ngOnInit() { + } + + ngAfterContentInit() { + } + +} diff --git a/src/packages/discovery/container/index.ts b/src/packages/discovery/container/index.ts new file mode 100644 index 0000000..75facd2 --- /dev/null +++ b/src/packages/discovery/container/index.ts @@ -0,0 +1,5 @@ +import {DiscoveryContainerComponent} from './discovery/discovery-container.component'; + +export const CONTAINER_COMPONENTS = [ + DiscoveryContainerComponent, +]; diff --git a/src/packages/discovery/discovery.module.ts b/src/packages/discovery/discovery.module.ts index d7faa20..0b8d813 100644 --- a/src/packages/discovery/discovery.module.ts +++ b/src/packages/discovery/discovery.module.ts @@ -1,6 +1,6 @@ -import { NgModule, Inject } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { DiscoveryStoreModule } from './discovery-store.module'; import { DiscoveryRPCModule } from './discovery-rpc.module'; @@ -10,11 +10,13 @@ import { COMPONENTS } from './component'; import { SERVICES } from './service'; import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module'; import { KeyValueModule } from 'app/commons/component/key-value/key-value.module'; +import { BrowserModule } from '@angular/platform-browser'; @NgModule({ imports: [ CommonModule, FormsModule, + ReactiveFormsModule, PrimeNGModules, DiscoveryStoreModule, DiscoveryRPCModule, @@ -31,5 +33,4 @@ import { KeyValueModule } from 'app/commons/component/key-value/key-value.module SERVICES, ], }) -export class DiscoveryModule { -} +export class DiscoveryModule { }