From f1f95df754c889f2149355dbefa453a4da4bc4f4 Mon Sep 17 00:00:00 2001 From: insanity Date: Fri, 13 Apr 2018 16:27:47 +0900 Subject: [PATCH] test --- .../noauth/component/list/list.component.ts | 2 +- .../sensor/component/list/list.component.html | 2 +- .../crawler-auth/crawler-auth.component.ts | 16 +++++++++++++++- .../component/setting/setting.component.html | 2 +- .../component/setting/setting.component.ts | 4 +++- .../target-selector/target-selector.component.ts | 15 ++++++++------- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/packages/noauth/component/list/list.component.ts b/src/packages/noauth/component/list/list.component.ts index db4d4a1..025cdd9 100644 --- a/src/packages/noauth/component/list/list.component.ts +++ b/src/packages/noauth/component/list/list.component.ts @@ -33,7 +33,7 @@ export class ListComponent implements OnInit, AfterContentInit { ngAfterContentInit() { this.store.select(AuthSelector.select('domain')).subscribe( (domain: Domain) => { - // this.store.dispatch(new ListStore.ReadAllByDomain(domain)); + this.store.dispatch(new ListStore.ReadAllByDomain(domain)); } ); diff --git a/src/packages/sensor/component/list/list.component.html b/src/packages/sensor/component/list/list.component.html index 5354e9f..7bc6f26 100644 --- a/src/packages/sensor/component/list/list.component.html +++ b/src/packages/sensor/component/list/list.component.html @@ -1,6 +1,6 @@
- + diff --git a/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.ts b/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.ts index 9268cf9..193258f 100644 --- a/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.ts +++ b/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.ts @@ -55,7 +55,21 @@ export class CrawlerAuthComponent implements OnInit, OnChanges { this.title += ' for ' + this.crawler.name; for (let i = 0; i < 10; i++) { const item: MetaCrawlerInputItem = { - + id: i, + // inputType: { + // id: i, + // name: '', + // description: '', + // }, + crawler: null, + description: '', + name: '', + createDate: new Date(), + required: true, + defaultValue: '', + pattern: '', + keyName: '', + keyValue: '', }; this.inputItems.push(item); } diff --git a/src/packages/sensor/component/setting/setting.component.html b/src/packages/sensor/component/setting/setting.component.html index 0f7202f..17e8fe5 100644 --- a/src/packages/sensor/component/setting/setting.component.html +++ b/src/packages/sensor/component/setting/setting.component.html @@ -1,7 +1,7 @@
- +
diff --git a/src/packages/sensor/component/setting/setting.component.ts b/src/packages/sensor/component/setting/setting.component.ts index 64af94b..cd9960c 100644 --- a/src/packages/sensor/component/setting/setting.component.ts +++ b/src/packages/sensor/component/setting/setting.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, Inject, DoCheck, ViewEncapsulation, Output, EventEmitter, OnDestroy, OnChanges } from '@angular/core'; +import { Component, OnInit, Input, Inject, DoCheck, ViewEncapsulation, Output, EventEmitter, OnChanges } from '@angular/core'; import { Target } from 'packages/target/model'; import { Infra } from 'packages/infra/model'; import { MetaCrawler } from 'packages/meta/crawler/model/MetaCrawler'; @@ -18,6 +18,8 @@ import { TreeNode } from 'primeng/primeng'; }) export class SettingComponent implements OnInit, DoCheck, OnChanges { + @Input() visible: boolean; + @Input() isAllTarget: boolean; @Input() selectedTarget: Target; @Output() close = new EventEmitter(); diff --git a/src/packages/sensor/component/setting/target-selector/target-selector.component.ts b/src/packages/sensor/component/setting/target-selector/target-selector.component.ts index 4cd55de..cbc34a8 100644 --- a/src/packages/sensor/component/setting/target-selector/target-selector.component.ts +++ b/src/packages/sensor/component/setting/target-selector/target-selector.component.ts @@ -18,6 +18,7 @@ export class TargetSelectorComponent implements OnInit, OnChanges { targets$ = this.store.pipe(select(ListSelector.select('page'))); + @Input() visible: boolean; @Input() target: Target = null; @Input() isAllTarget: boolean; @Output() targetSelected = new EventEmitter(); @@ -48,13 +49,13 @@ export class TargetSelectorComponent implements OnInit, OnChanges { // ); } - ngOnChanges() { - this.targets = new Array(); - if (this.isAllTarget) { - this.getTargetList(); - } else { - this.targets.push(this.target); - } + ngOnChanges(changes) { + // this.targets = new Array(); + // if (this.isAllTarget) { + // this.getTargetList(); + // } else { + // this.targets.push(this.target); + // } } convertInfraToTarget(page: Page) {