This commit is contained in:
geek 2018-05-23 12:34:16 +09:00
parent b1c4b6eaec
commit e7deae813e
4 changed files with 41 additions and 10 deletions

View File

@ -6,7 +6,7 @@
<div class="ui-g-12 ui-md-3"> <div class="ui-g-12 ui-md-3">
<p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)"> <p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)">
<p-accordionTab header="Discovery Search Config Area" [selected]="true"> <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()" [isiii]="tabIdx"></of-discovery-search-config>
</p-accordionTab> </p-accordionTab>
<p-accordionTab header="Result Filter Area"> <p-accordionTab header="Result Filter Area">
<of-discovery-search-filter></of-discovery-search-filter> <of-discovery-search-filter></of-discovery-search-filter>

View File

@ -9,7 +9,7 @@ import {
}) })
export class DiscoveryComponent implements OnInit, AfterContentInit { export class DiscoveryComponent implements OnInit, AfterContentInit {
private isSelectResult = true; private tabIdx: number;
constructor( constructor(
) { ) {
@ -26,11 +26,7 @@ export class DiscoveryComponent implements OnInit, AfterContentInit {
} }
OnTabOpen(event) { OnTabOpen(event) {
if (event.index === 0) { this.tabIdx = event.index;
this.isSelectResult = true;
} else {
this.isSelectResult = false;
}
} }
onFilterResultOpen() { onFilterResultOpen() {

View File

@ -1,8 +1,29 @@
<div class="ui-g-nopad"> <div class="ui-g-nopad">
<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>
<div class="ui-g ui-fluid"> <div class="ui-g ui-fluid">
<span>Basic</span> <span>Start IP Address : </span>
<p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="val1" placeholder="254.254.254.254"></p-inputMask> <p-inputMask slotChar=" " 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>Exclude IP Address : </span>
<p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="excludeIP" placeholder="254.254.254.254" [autoClear]="false"></p-inputMask>
</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>Exclude Port : </span>
<p-inputMask mask="9999" [(ngModel)]="excludePort" placeholder="1024" [autoClear]="false"></p-inputMask>
</div>
<of-service-selector [disabled]="!serviceChecked" [(includeServices)]="includeServices"></of-service-selector>
<button type="button" label="Discovery Start" pButton class="ui-button-width-fit" (click)="discoveryStartClick($event)"></button> <button type="button" label="Discovery Start" pButton class="ui-button-width-fit" (click)="discoveryStartClick($event)"></button>
</div> </div>

View File

@ -1,5 +1,5 @@
import { import {
AfterContentInit, Component, EventEmitter, AfterContentInit, Component, EventEmitter, Input,
OnInit, Output OnInit, Output
} from '@angular/core'; } from '@angular/core';
@ -10,12 +10,22 @@ import {
export class SearchConfigComponent implements OnInit, AfterContentInit { export class SearchConfigComponent implements OnInit, AfterContentInit {
@Output() discoverySearchStartClick = new EventEmitter(); @Output() discoverySearchStartClick = new EventEmitter();
@Input() isiii;
private ipVesion: string;
private startIP: string;
private endIP: string;
private excludeIP: string;
private startPort: string;
private endPort: string;
private excludePort: string;
constructor( constructor(
) { ) {
} }
ngOnInit() { ngOnInit() {
this.ipVesion = '0';
} }
ngAfterContentInit() { ngAfterContentInit() {
@ -24,4 +34,8 @@ export class SearchConfigComponent implements OnInit, AfterContentInit {
discoveryStartClick() { discoveryStartClick() {
this.discoverySearchStartClick.emit(); this.discoverySearchStartClick.emit();
} }
onProbeSelect(event) {
}
} }