zone/setting

This commit is contained in:
insanity 2018-09-12 15:44:45 +09:00
parent 1e20eea2d2
commit 8aab7099f9
3 changed files with 6 additions and 3 deletions

View File

@ -5,10 +5,11 @@
<path _ngcontent-c1="" d="M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path> <path _ngcontent-c1="" d="M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path>
</svg> --> </svg> -->
<div _ngcontent-c1="" class="text"> <div _ngcontent-c1="" class="text">
<div _ngcontent-c1="" class="description" *ngIf="selected">{{selected.address || ''}}</div> <div _ngcontent-c1="" class="description" *ngIf="selected">{{selected.network || ''}}</div>
<div _ngcontent-c1="" class="title" *ngIf="selected">{{selected.name || ''}}</div> <div _ngcontent-c1="" class="title" *ngIf="selected">{{selected.name || ''}}</div>
</div> </div>
<svg _ngcontent-c1="" aria-hidden="true" class="octicon dropdownArrow" version="1.1" viewBox="0 0 12 16" width="16px" height="16px"> <svg _ngcontent-c1="" aria-hidden="true" class="octicon dropdownArrow" version="1.1" viewBox="0 0 12 16" width="16px"
height="16px">
<path _ngcontent-c1="" d="M0 5l6 6 6-6z"> <path _ngcontent-c1="" d="M0 5l6 6 6-6z">
</path> </path>
</svg> </svg>

View File

@ -41,12 +41,13 @@ export class NicDropdownComponent implements OnInit {
return; return;
} }
this.nics.push({ this.nics.push({
label: iface.iface + ' (' + address.address + ')', label: iface.iface + ' (' + address.network + ')',
value: { value: {
name: iface.iface, name: iface.iface,
metaIPType: address.metaIPType, metaIPType: address.metaIPType,
mac: iface.mac, mac: iface.mac,
address: address.address, address: address.address,
network: address.network,
}, },
disabled: address.metaIPType.key !== toMetaIPType(MetaIPTypeEnum.V4).key ? true : false, disabled: address.metaIPType.key !== toMetaIPType(MetaIPTypeEnum.V4).key ? true : false,
}); });

View File

@ -50,6 +50,7 @@ export class ScannerSettingDropdownComponent implements OnInit {
if (this.zone === null) { if (this.zone === null) {
return; return;
} }
console.log(this.zone);
const cidr = new IPCIDR(this.zone.network); const cidr = new IPCIDR(this.zone.network);
this.ipType = MetaIPTypeEnum.V4; this.ipType = MetaIPTypeEnum.V4;