dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Breadcrumb component improvements

Browse Source
This commit is contained in:
Igor Kulikov 2020-04-13 13:07:45 +03:00
parent a43d3f2fd2
commit 81aa229ba7
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-ngx/src/app/shared/components/breadcrumb.component.ts
View File

@ -61,8 +61,19 @@ export class BreadcrumbComponent implements OnInit, OnDestroy {
} }
} }
private lastChild(route: ActivatedRouteSnapshot) {
let child = route;
while (child.firstChild !== null) {
child = child.firstChild;
}
return child;
}
buildBreadCrumbs(route: ActivatedRouteSnapshot, breadcrumbs: Array<BreadCrumb> = []): Array<BreadCrumb> { buildBreadCrumbs(route: ActivatedRouteSnapshot, breadcrumbs: Array<BreadCrumb> = [],
lastChild?: ActivatedRouteSnapshot): Array<BreadCrumb> {
if (!lastChild) {
lastChild = this.lastChild(route);
}
let newBreadcrumbs = breadcrumbs; let newBreadcrumbs = breadcrumbs;
if (route.routeConfig && route.routeConfig.data) { if (route.routeConfig && route.routeConfig.data) {
const breadcrumbConfig = route.routeConfig.data.breadcrumb as BreadCrumbConfig<any>; const breadcrumbConfig = route.routeConfig.data.breadcrumb as BreadCrumbConfig<any>;
@ -72,7 +83,7 @@ export class BreadcrumbComponent implements OnInit, OnDestroy {
let ignoreTranslate; let ignoreTranslate;
if (breadcrumbConfig.labelFunction) { if (breadcrumbConfig.labelFunction) {
labelFunction = () => { labelFunction = () => {
return breadcrumbConfig.labelFunction(route, this.translate, this.activeComponentValue); return breadcrumbConfig.labelFunction(route, this.translate, this.activeComponentValue, lastChild.data);
}; };
ignoreTranslate = true; ignoreTranslate = true;
} else { } else {
@ -96,7 +107,7 @@ export class BreadcrumbComponent implements OnInit, OnDestroy {
} }
} }
if (route.firstChild) { if (route.firstChild) {
return this.buildBreadCrumbs(route.firstChild, newBreadcrumbs); return this.buildBreadCrumbs(route.firstChild, newBreadcrumbs, lastChild);
} }
return newBreadcrumbs; return newBreadcrumbs;
} }

2
ui-ngx/src/app/shared/components/breadcrumb.ts
View File

@ -27,7 +27,7 @@ export interface BreadCrumb {
queryParams: Params; queryParams: Params;
} }
export type BreadCrumbLabelFunction<C> = (route: ActivatedRouteSnapshot, translate: TranslateService, component: C) => string; export type BreadCrumbLabelFunction<C> = (route: ActivatedRouteSnapshot, translate: TranslateService, component: C, data?: any) => string;
export interface BreadCrumbConfig<C> { export interface BreadCrumbConfig<C> {
labelFunction: BreadCrumbLabelFunction<C>; labelFunction: BreadCrumbLabelFunction<C>;