fixed discovery

This commit is contained in:
snoop 2018-04-26 21:33:32 +09:00
parent e357030fe8
commit 3c41c2686b

View File

@ -1,4 +1,4 @@
import { Component, OnInit, AfterContentInit, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, AfterContentInit, Output, EventEmitter, Input } from '@angular/core';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol'; import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { import {
@ -36,6 +36,7 @@ import { TreeNode } from 'primeng/primeng';
}) })
export class SettingComponent implements OnInit, AfterContentInit { export class SettingComponent implements OnInit, AfterContentInit {
@Input() cidr: string;
@Output() close = new EventEmitter(); @Output() close = new EventEmitter();
probe$ = this.probeDetailStore.pipe(select(ProbeDetailSelector.select('probe'))); probe$ = this.probeDetailStore.pipe(select(ProbeDetailSelector.select('probe')));
@ -50,7 +51,7 @@ export class SettingComponent implements OnInit, AfterContentInit {
probe: Probe = null; probe: Probe = null;
started = false; started = false;
cidr; // cidr;
startIP; startIP;
endIP; endIP;
startPort; startPort;
@ -202,7 +203,10 @@ export class SettingComponent implements OnInit, AfterContentInit {
} }
ngAfterContentInit() { ngAfterContentInit() {
this.cidr = '192.168.1.0/24'; if (this.cidr === undefined || this.cidr === null) {
this.cidr = '192.168.10.0/24';
}
this.hostRange(); this.hostRange();
this.portRange(); this.portRange();
} }
@ -336,6 +340,7 @@ export class SettingComponent implements OnInit, AfterContentInit {
// console.log(this.zones); // console.log(this.zones);
// isTarget Check // isTarget Check
for ( const sn of this.selectedNodes) { for ( const sn of this.selectedNodes) {
if (sn.obj !== undefined && sn.obj !== null) { if (sn.obj !== undefined && sn.obj !== null) {
if (sn.obj.target !== undefined && sn.obj.target !== null) { if (sn.obj.target !== undefined && sn.obj.target !== null) {