models changed

This commit is contained in:
insanity
2018-06-12 14:45:21 +09:00
parent 0f69c63a98
commit d8cb5f4d41
24 changed files with 132 additions and 266 deletions

View File

@@ -1,9 +1,5 @@
import { Component, OnInit, OnChanges, Input, Output, EventEmitter, ViewChild, AfterViewInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Store, select } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc';
import * as ListStore from '@overflow/meta/sensor-display-item/store/list';
import { ReadAllSensorDisplayItemByCrawlerSelector } from '@overflow/meta/sensor-display-item/store';
import { MetaSensorDisplayItem } from '@overflow/commons-typescript/model/meta';
import { MetaCrawler } from '@overflow/commons-typescript/model/meta';
import { MetaSensorItemType } from '@overflow/commons-typescript/model/meta';
@@ -20,14 +16,11 @@ export class SensorItemSelectorComponent implements OnInit, OnChanges {
@Input() crawler: MetaCrawler;
@Output() sensorItemsSelected = new EventEmitter<TreeNode[]>();
items$ = this.listStore.pipe(select(ReadAllSensorDisplayItemByCrawlerSelector.select('list')));
selectedItems: TreeNode[];
itemTreeNode: TreeNode[];
constructor(
private router: Router,
private listStore: Store<ListStore.State>,
) { }
ngOnInit() {
@@ -66,10 +59,9 @@ export class SensorItemSelectorComponent implements OnInit, OnChanges {
const si: MetaSensorDisplayItem = {
id: i,
key: 'SensorDisplayItemKey' + i,
displayName: 'this.is.display.item.name' + i,
description: 'Description' + i,
name: 'this.is.display.item.name' + i,
default: isDefault,
itemType: t
metaSensorItemType: t
};
displayItems.push(si);
}
@@ -109,7 +101,7 @@ export class SensorItemSelectorComponent implements OnInit, OnChanges {
existCategory(item: MetaSensorDisplayItem) {
let categoryNode = null;
for (const node of this.itemTreeNode) {
if (node.label === item.itemType.name) {
if (node.label === item.metaSensorItemType.name) {
categoryNode = node;
}
}