This commit is contained in:
geek 2018-05-24 18:18:38 +09:00
parent b3ad3ee57d
commit 3b3415c96a
8 changed files with 106 additions and 28 deletions

View File

@ -6,7 +6,7 @@
<div class="ui-g-12 ui-md-3">
<p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)">
<p-accordionTab header="Discovery Search Config Area" [selected]="true">
<of-discovery-search-config (discoverySearchStartClick)="onDiscoveryStart()" ></of-discovery-search-config>
<of-discovery-search-config (discoverySearchStartClick)="onDiscoveryStart()" (selectProbe)="onSelectedProbe($event)"></of-discovery-search-config>
</p-accordionTab>
<p-accordionTab header="Result Filter Area">
<of-discovery-search-filter></of-discovery-search-filter>
@ -16,7 +16,7 @@
<div class="ui-g-12 ui-md-9">
<p-panel>
<of-discovery-search-result></of-discovery-search-result>
<of-discovery-search-result [probe]="selectedProbe"></of-discovery-search-result>
</p-panel>
</div>
</div>

View File

@ -2,6 +2,7 @@ import {
AfterContentInit, Component,
OnInit
} from '@angular/core';
import {Probe} from '@overflow/commons-typescript/model/probe';
@Component({
selector: 'of-discovery',
@ -10,6 +11,7 @@ import {
export class DiscoveryComponent implements OnInit, AfterContentInit {
private tabIdx: number;
selectedProbe: Probe;
constructor(
) {
@ -36,4 +38,9 @@ export class DiscoveryComponent implements OnInit, AfterContentInit {
onDiscoveryStart() {
console.log('dddddddddddddd');
}
onSelectedProbe(probe) {
console.log(probe);
this.selectedProbe = probe;
}
}

View File

@ -4,8 +4,12 @@
<of-probe-selector [hidden]="requestStart" [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
<div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
<div class="ui-g-12"><p-radioButton name="group1" value="0" label="IPv4" [(ngModel)]="ipVesion" inputId="opt1"></p-radioButton></div>
<div class="ui-g-12"><p-radioButton name="group1" value="1" label="IPv6" [(ngModel)]="ipVesion" inputId="opt2"></p-radioButton></div>
<div class="ui-g-12">
<p-radioButton name="group1" value="0" label="IPv4" [(ngModel)]="ipVesion" inputId="opt1"></p-radioButton>
</div>
<div class="ui-g-12">
<p-radioButton name="group1" value="1" label="IPv6" [(ngModel)]="ipVesion" inputId="opt2"></p-radioButton>
</div>
</div>
<div class="ui-g ui-fluid">
@ -45,6 +49,15 @@
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
<div class="ui-g-12">
<p-radioButton name="group2" value="0" label="TCP" [(ngModel)]="portType" inputId="opt3"></p-radioButton>
</div>
<div class="ui-g-12">
<p-radioButton name="group2" value="1" label="UDP" [(ngModel)]="portType" inputId="opt4"></p-radioButton>
</div>
</div>
<div class="ui-g ui-fluid">
<span>Start Port : </span>
<p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="1024" [autoClear]="false"></p-inputMask> -

View File

@ -14,16 +14,19 @@ import {
export class SearchConfigComponent implements OnInit, AfterContentInit {
@Output() discoverySearchStartClick = new EventEmitter();
@Output() selectProbe = new EventEmitter();
discoveryFormGroup: FormGroup;
private ipVesion: string;
private startIP: string;
private endIP: string;
private excludeIP: string;
private startPort: string;
private endPort: string;
private excludePort: string;
ipVesion: number;
portType: number;
startIP: string;
endIP: string;
excludeIP: string;
startPort: string;
endPort: string;
excludePort: string;
constructor(
private formBuilder: FormBuilder,
@ -31,7 +34,8 @@ export class SearchConfigComponent implements OnInit, AfterContentInit {
}
ngOnInit() {
this.ipVesion = '0';
this.ipVesion = 0;
this.portType = 0;
this.initForm();
}
@ -48,7 +52,8 @@ export class SearchConfigComponent implements OnInit, AfterContentInit {
this.discoverySearchStartClick.emit();
}
onProbeSelect(event) {
onProbeSelect(probe) {
console.log(probe);
this.selectProbe.emit(probe);
}
}

View File

@ -1,15 +1,29 @@
<div class="ui-g-nopad">
<div class="ui-g ui-fluid">
<span>Start IP Address : </span>
<p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="startIP" placeholder="254.254.254.254" [autoClear]="false"></p-inputMask> -
<span>End IP Address : </span>
<p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="endIP" placeholder="254.254.254.254" [autoClear]="false"></p-inputMask>
<span>Start IP Adress </span>
<input type="hidden" >
<div class="ui-inputgroup">
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g ui-fluid">
<span>Start Port : </span>
<p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="1024" [autoClear]="false"></p-inputMask> -
<span>End Port : </span>
<p-inputMask mask="9999" [(ngModel)]="endPort" placeholder="1024" [autoClear]="false"></p-inputMask>
<span>End IP Adress </span>
<input type="hidden" >
<div class="ui-inputgroup">
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g ui-fluid">

View File

@ -1,4 +1,36 @@
<div class="ui-g">
discovery Search Filter List Print
<div class="ui-g" *ngIf="probe">
<div class="ui-g form-group">
<div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
<div class="of-key-value-div">
<span>Name</span>
<span class="ng-star-inserted">
{{probe.displayName}}
</span>
</div>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
<of-key-value [key]="'CIDR'" [value]="probe.cidr"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
<div class="of-key-value-div">
<span>Description</span>
<span class="ng-star-inserted">
{{probe.description}}
</span>
</div>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
<span>Key</span>
{{probe.probeKey}}
</div>
<div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
<of-key-value [key]="'Authrozied by'" [value]="probe.authorizeMember.name"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value ui-nopad">
<of-key-value [key]="'IP Range'" [value]="IPRange"></of-key-value>
</div>
</div>
</div>

View File

@ -1,7 +1,8 @@
import {
AfterContentInit, Component,
AfterContentInit, Component, Input,
OnInit
} from '@angular/core';
import { Probe } from '@overflow/commons-typescript/model/probe';
@Component({
selector: 'of-discovery-search-result',
@ -9,6 +10,7 @@ import {
})
export class SearchResultComponent implements OnInit, AfterContentInit {
@Input() probe: Probe;
constructor(
) {

View File

@ -1,4 +1,9 @@
<div *ngIf="!preProbe">
<p-dropdown #dropdown [options]="probes" optionLabel="displayName" placeholder="Select a Probe" [(ngModel)]="selected" (onChange)="onProbeSelect($event)"
[style]="{'width':'300px'}"></p-dropdown>
<p-dropdown #dropdown [options]="probes"
optionLabel="displayName"
placeholder="Select a Probe"
[(ngModel)]="selected"
(onChange)="onProbeSelect($event)"
[style]="{'width':'300px'}">
</p-dropdown>
</div>