fix: update

parent 32277220
import {Component, Input, OnInit, AfterViewInit, Inject} from '@angular/core'; import {Component, Input, OnInit, Inject, SimpleChanges, OnChanges} from '@angular/core';
import {NavList, View} from '../../pages/control/control/control.component'; import {NavList, View} from '../../pages/control/control/control.component';
import {AppService, LogService} from '../../app.service'; import {AppService, LogService} from '../../app.service';
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material'; import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
...@@ -14,7 +14,7 @@ declare var $: any; ...@@ -14,7 +14,7 @@ declare var $: any;
templateUrl: './asset-tree.component.html', templateUrl: './asset-tree.component.html',
styleUrls: ['./asset-tree.component.scss'] styleUrls: ['./asset-tree.component.scss']
}) })
export class ElementAssetTreeComponent implements OnInit { export class ElementAssetTreeComponent implements OnInit, OnChanges {
@Input() Data: any; @Input() Data: any;
nodes = []; nodes = [];
setting = { setting = {
...@@ -31,36 +31,42 @@ export class ElementAssetTreeComponent implements OnInit { ...@@ -31,36 +31,42 @@ export class ElementAssetTreeComponent implements OnInit {
onClick: this.onCzTreeOnClick.bind(this) onClick: this.onCzTreeOnClick.bind(this)
}, },
}; };
timer: any; zTreeObj: any;
// hiddenNodes: [];
onCzTreeOnClick(event, treeId, treeNode, clickFlag) { onCzTreeOnClick(event, treeId, treeNode, clickFlag) {
this.Connect(treeNode); this.Connect(treeNode);
// this.Connect(treeNode);
} }
constructor(private _appService: AppService, constructor(private _appService: AppService,
private _menu: ElementServerMenuComponent,
public _dialog: MatDialog, public _dialog: MatDialog,
private _layer: DialogService) { public _logger: LogService) {
} }
ngOnInit() { ngOnInit() {
if (this.Data) { if (this.Data) {
this.draw(); this.draw();
} }
clearInterval(this.timer); // clearInterval(this.timer);
//
// this.timer = setInterval(() => {
// if (this.Data) {
// this.draw();
// clearInterval(this.timer);
// }
// }, 100);
}
this.timer = setInterval(() => { ngOnChanges(changes: SimpleChanges) {
if (this.Data) { if (this.Data) {
this.draw(); this.draw();
clearInterval(this.timer); }
}
}, 100);
} }
draw() { draw() {
let nodes = {}; const nodes = {};
let assets = {}; const assets = {};
this.Data.forEach((v, i) => { this.Data.forEach((v, i) => {
if (!nodes[v['id']]) { if (!nodes[v['id']]) {
nodes[v['id']] = true; nodes[v['id']] = true;
...@@ -109,8 +115,7 @@ export class ElementAssetTreeComponent implements OnInit { ...@@ -109,8 +115,7 @@ export class ElementAssetTreeComponent implements OnInit {
}); });
}); });
}); });
$.fn.zTree.init($('#ztree'), this.setting, this.nodes); this.zTreeObj = $.fn.zTree.init($('#ztree'), this.setting, this.nodes);
} }
Connect(host) { Connect(host) {
...@@ -129,7 +134,7 @@ export class ElementAssetTreeComponent implements OnInit { ...@@ -129,7 +134,7 @@ export class ElementAssetTreeComponent implements OnInit {
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
if (result) { if (result) {
for (let i of host.system_users_granted) { for (const i of host.system_users_granted) {
if (i.id.toString() === result.toString()) { if (i.id.toString() === result.toString()) {
user = i; user = i;
break; break;
...@@ -180,8 +185,8 @@ export class ElementAssetTreeComponent implements OnInit { ...@@ -180,8 +185,8 @@ export class ElementAssetTreeComponent implements OnInit {
login(host, user) { login(host, user) {
const id = NavList.List.length - 1; const id = NavList.List.length - 1;
console.log(NavList); this._logger.debug(NavList);
console.log(host); this._logger.debug(host);
if (user) { if (user) {
NavList.List[id].nick = host.name; NavList.List[id].nick = host.name;
NavList.List[id].connected = true; NavList.List[id].connected = true;
...@@ -197,7 +202,7 @@ export class ElementAssetTreeComponent implements OnInit { ...@@ -197,7 +202,7 @@ export class ElementAssetTreeComponent implements OnInit {
NavList.List.push(new View()); NavList.List.push(new View());
NavList.Active = id; NavList.Active = id;
} }
console.log(NavList); this._logger.debug(NavList);
} }
checkPriority(sysUsers) { checkPriority(sysUsers) {
...@@ -213,11 +218,24 @@ export class ElementAssetTreeComponent implements OnInit { ...@@ -213,11 +218,24 @@ export class ElementAssetTreeComponent implements OnInit {
} }
return user; return user;
} }
// filter() {
// this.zTreeObj.showNodes(this.hiddenNodes);
//
// function filterFunc(node) {
// const _keywords = $('#keyword').val();
// return !(node.isParent || node.name.indexOf(_keywords) !== -1);
// }
//
// this.hiddenNodes = this.zTreeObj.getNodesByFilter(filterFunc);
//
// this.zTreeObj.hideNodes(this.hiddenNodes);
// }
} }
@Component({ @Component({
selector: 'asset-tree-dialog', selector: 'elements-asset-tree-dialog',
templateUrl: 'dialog.html', templateUrl: 'dialog.html',
}) })
export class AssetTreeDialogComponent implements OnInit { export class AssetTreeDialogComponent implements OnInit {
......
<div class="sidebar" fxLayout="column" ngxSplit="column"> <div class="sidebar" fxLayout="column" ngxSplit="column">
<div fxflex="0 0 50px" class="search"> <div fxflex="0 0 50px" class="search">
<input class="left-search" placeholder=" {{'Search'| trans }} ..." maxlength="2048" name="q" autocomplete="off" <input id="keyword" class="left-search" placeholder=" {{'Search'| trans }} ..." maxlength="2048" name="q" autocomplete="off"
title="Search" title="Search"
type="text" tabindex="1" spellcheck="false" autofocus [(ngModel)]="q" (keyup.enter)="Search(q)"> type="text" tabindex="1" spellcheck="false" autofocus [(ngModel)]="q" (keyup.enter)="Search(q)">
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment