From 7d70d612059382bceaa5d61fe60870c3f2dfdbc9 Mon Sep 17 00:00:00 2001 From: insanity Date: Fri, 1 Jun 2018 12:22:42 +0900 Subject: [PATCH] ing --- .../discovery/component/discovery.component.ts | 1 + @overflow/discovery/component/index.ts | 2 +- .../component/request-summary.component.html | 14 +++++++------- .../component/request-summary.component.ts | 4 ++++ .../service-selector.component.html | 4 ++++ .../service-selector.component.ts | 0 6 files changed, 17 insertions(+), 8 deletions(-) rename @overflow/discovery/component/{discovery/service-selector => }/service-selector.component.html (82%) rename @overflow/discovery/component/{discovery/service-selector => }/service-selector.component.ts (100%) diff --git a/@overflow/discovery/component/discovery.component.ts b/@overflow/discovery/component/discovery.component.ts index db30700..a0ecf22 100644 --- a/@overflow/discovery/component/discovery.component.ts +++ b/@overflow/discovery/component/discovery.component.ts @@ -45,6 +45,7 @@ export class DiscoveryComponent { switch (discoveryNotify.method) { case 'DiscoveryService.discoveryStart': { const startDate = discoveryNotify.params as Date; + break; } case 'DiscoveryService.discoveryStop': { diff --git a/@overflow/discovery/component/index.ts b/@overflow/discovery/component/index.ts index f283699..5a4df3a 100644 --- a/@overflow/discovery/component/index.ts +++ b/@overflow/discovery/component/index.ts @@ -1,4 +1,4 @@ -import { ServiceSelectorComponent } from './discovery/service-selector/service-selector.component'; +import { ServiceSelectorComponent } from './service-selector.component'; import { DiscoveryComponent } from './discovery.component'; import { SearchConfigComponent } from './search-config.component'; import { SearchFilterComponent } from './search-filter.component'; diff --git a/@overflow/discovery/component/request-summary.component.html b/@overflow/discovery/component/request-summary.component.html index 6ece8a4..7468f48 100644 --- a/@overflow/discovery/component/request-summary.component.html +++ b/@overflow/discovery/component/request-summary.component.html @@ -5,12 +5,12 @@ UDP
- -
- {{service}} -
-
+ +
+ {{service}} +
+
- -
+ {{services.length}} services has selected. + \ No newline at end of file diff --git a/@overflow/discovery/component/request-summary.component.ts b/@overflow/discovery/component/request-summary.component.ts index 65ba759..fd1c707 100644 --- a/@overflow/discovery/component/request-summary.component.ts +++ b/@overflow/discovery/component/request-summary.component.ts @@ -29,4 +29,8 @@ export class RequestSummaryComponent implements OnChanges { + this.discoverZone.discoverHost.discoverPort.lastScanRange; this.services = this.discoverZone.discoverHost.discoverPort.discoverService.includeServices; } + + showServices() { + return '1/n2/n3/n4'; + } } diff --git a/@overflow/discovery/component/discovery/service-selector/service-selector.component.html b/@overflow/discovery/component/service-selector.component.html similarity index 82% rename from @overflow/discovery/component/discovery/service-selector/service-selector.component.html rename to @overflow/discovery/component/service-selector.component.html index b0e210d..391d15c 100644 --- a/@overflow/discovery/component/discovery/service-selector/service-selector.component.html +++ b/@overflow/discovery/component/service-selector.component.html @@ -11,7 +11,11 @@ dataKey="id" (onRowSelect)="onSelect($event.data)" (onRowUnselect)="onUnselect($event.data)"> + + {{rowData.description}} diff --git a/@overflow/discovery/component/discovery/service-selector/service-selector.component.ts b/@overflow/discovery/component/service-selector.component.ts similarity index 100% rename from @overflow/discovery/component/discovery/service-selector/service-selector.component.ts rename to @overflow/discovery/component/service-selector.component.ts