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

Added API to close dashboard opened as dialog.

Browse Source
This commit is contained in:
devaskim 2022-10-17 19:10:13 +05:00
parent d7aa2e5660
commit a0b6845bb7
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/widget.component.ts
View File

@ -1436,7 +1436,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
title = insertVariable(title, prop + ':entityLabel', params[prop].entityLabel); title = insertVariable(title, prop + ':entityLabel', params[prop].entityLabel);
} }
} }
this.dialog.open(this.embedDashboardDialogComponent, { dashboard.dialogRef = this.dialog.open(this.embedDashboardDialogComponent, {
disableClose: true, disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
viewContainerRef: this.widgetContentContainer, viewContainerRef: this.widgetContentContainer,

7
ui-ngx/src/app/modules/home/models/widget-component.models.ts
View File

@ -394,6 +394,13 @@ export class WidgetContext {
this.widgetActions = undefined; this.widgetActions = undefined;
} }
closeDialog(resultData: any = null) {
const dialogRef = this.$scope.dialogRef || this.stateController.dashboardCtrl.dashboardCtx.getDashboard().dialogRef;
if (dialogRef) {
dialogRef.close(resultData);
}
}
pageLink(pageSize: number, page: number = 0, textSearch: string = null, sortOrder: SortOrder = null): PageLink { pageLink(pageSize: number, page: number = 0, textSearch: string = null, sortOrder: SortOrder = null): PageLink {
return new PageLink(pageSize, page, textSearch, sortOrder); return new PageLink(pageSize, page, textSearch, sortOrder);
} }

2
ui-ngx/src/app/shared/models/dashboard.models.ts
View File

@ -22,6 +22,7 @@ import { Widget } from './widget.models';
import { Timewindow } from '@shared/models/time/time.models'; import { Timewindow } from '@shared/models/time/time.models';
import { EntityAliases } from './alias.models'; import { EntityAliases } from './alias.models';
import { Filters } from '@shared/models/query/query.models'; import { Filters } from '@shared/models/query/query.models';
import { MatDialogRef } from '@angular/material/dialog';
export interface DashboardInfo extends BaseData<DashboardId>, ExportableEntity<DashboardId> { export interface DashboardInfo extends BaseData<DashboardId>, ExportableEntity<DashboardId> {
tenantId?: TenantId; tenantId?: TenantId;
@ -112,6 +113,7 @@ export interface DashboardConfiguration {
export interface Dashboard extends DashboardInfo { export interface Dashboard extends DashboardInfo {
configuration?: DashboardConfiguration; configuration?: DashboardConfiguration;
dialogRef?: MatDialogRef<any>;
} }
export interface HomeDashboard extends Dashboard { export interface HomeDashboard extends Dashboard {