Skip to content

Commit 09ac4a8

Browse files
committed
fix example dropdown-treeview-select.component
1 parent b722f93 commit 09ac4a8

File tree

2 files changed

+16
-25
lines changed

2 files changed

+16
-25
lines changed

src/app/dropdown-treeview-select/dropdown-treeview-select-i18n.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ export class DropdownTreeviewSelectI18n extends DefaultTreeviewI18n {
66
private internalSelectedItem: TreeviewItem;
77

88
set selectedItem(value: TreeviewItem) {
9-
if (value && value.children === undefined) {
10-
this.internalSelectedItem = value;
11-
}
9+
this.internalSelectedItem = value;
1210
}
1311

1412
get selectedItem(): TreeviewItem {
1513
return this.internalSelectedItem;
1614
}
1715

1816
getText(selection: TreeviewSelection): string {
19-
return this.internalSelectedItem ? this.internalSelectedItem.text : 'All';
17+
return this.internalSelectedItem ? this.internalSelectedItem.text : 'Please select';
2018
}
2119
}

src/app/dropdown-treeview-select/dropdown-treeview-select.component.ts

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, Injectable, Input, Output, EventEmitter, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
1+
import { Component, Input, Output, EventEmitter, ViewChild, OnChanges } from '@angular/core';
22
import { isNil } from 'lodash';
33
import { TreeviewI18n, TreeviewItem, TreeviewConfig, DropdownTreeviewComponent, TreeviewHelper } from 'ngx-treeview';
44
import { DropdownTreeviewSelectI18n } from './dropdown-treeview-select-i18n';
@@ -34,43 +34,36 @@ export class DropdownTreeviewSelectComponent implements OnChanges {
3434
this.dropdownTreeviewSelectI18n = i18n as DropdownTreeviewSelectI18n;
3535
}
3636

37-
ngOnChanges(changes: SimpleChanges): void {
38-
if (isNil(this.value)) {
39-
this.selectAll();
40-
} else {
41-
this.updateSelectedItem();
42-
}
37+
ngOnChanges(): void {
38+
this.updateSelectedItem();
4339
}
4440

4541
select(item: TreeviewItem): void {
46-
if (item.children === undefined) {
42+
if (!item.children) {
4743
this.selectItem(item);
4844
}
4945
}
5046

5147
private updateSelectedItem(): void {
5248
if (!isNil(this.items)) {
5349
const selectedItem = TreeviewHelper.findItemInList(this.items, this.value);
54-
if (selectedItem) {
55-
this.selectItem(selectedItem);
56-
} else {
57-
this.selectAll();
58-
}
50+
this.selectItem(selectedItem);
5951
}
6052
}
6153

6254
private selectItem(item: TreeviewItem): void {
6355
if (this.dropdownTreeviewSelectI18n.selectedItem !== item) {
6456
this.dropdownTreeviewSelectI18n.selectedItem = item;
65-
if (this.value !== item.value) {
66-
this.value = item.value;
67-
this.valueChange.emit(item.value);
57+
if (this.dropdownTreeviewComponent) {
58+
this.dropdownTreeviewComponent.onSelectedChange([item]);
6859
}
69-
}
70-
}
7160

72-
private selectAll(): void {
73-
const allItem = this.dropdownTreeviewComponent.treeviewComponent.allItem;
74-
this.selectItem(allItem);
61+
if (item) {
62+
if (this.value !== item.value) {
63+
this.value = item.value;
64+
this.valueChange.emit(item.value);
65+
}
66+
}
67+
}
7568
}
7669
}

0 commit comments

Comments
 (0)