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

UI: widget export title refactoring

Browse Source
This commit is contained in:
rusikv 2024-05-17 13:43:55 +03:00
parent 8dc9b47bb9
commit 0434a0b167
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View File

@ -1343,9 +1343,9 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
}); });
} }
exportWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget) { exportWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget, widgetExportTitle) {
$event.stopPropagation(); $event.stopPropagation();
this.importExport.exportWidget(this.dashboard, this.dashboardCtx.state, layoutCtx.id, widget); this.importExport.exportWidget(this.dashboard, this.dashboardCtx.state, layoutCtx.id, widget, widgetExportTitle);
} }
widgetClicked($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget) { widgetClicked($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget) {

2
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.models.ts
View File

@ -49,7 +49,7 @@ export interface IDashboardController {
openDashboardState(stateId: string, openRightLayout: boolean); openDashboardState(stateId: string, openRightLayout: boolean);
addWidget($event: Event, layoutCtx: DashboardPageLayoutContext); addWidget($event: Event, layoutCtx: DashboardPageLayoutContext);
editWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget); editWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget);
exportWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget); exportWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget, widgetExportTitle: string);
removeWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget); removeWidget($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget);
widgetMouseDown($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget); widgetMouseDown($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget);
widgetClicked($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget); widgetClicked($event: Event, layoutCtx: DashboardPageLayoutContext, widget: Widget);

4
ui-ngx/src/app/modules/home/components/dashboard-page/layout/dashboard-layout.component.ts
View File

@ -226,8 +226,8 @@ export class DashboardLayoutComponent extends PageComponent implements ILayoutCo
this.layoutCtx.dashboardCtrl.editWidget($event, this.layoutCtx, widget); this.layoutCtx.dashboardCtrl.editWidget($event, this.layoutCtx, widget);
} }
onExportWidget($event: Event, widget: Widget): void { onExportWidget($event: Event, widget: Widget, widgetExportTitle: string): void {
this.layoutCtx.dashboardCtrl.exportWidget($event, this.layoutCtx, widget); this.layoutCtx.dashboardCtrl.exportWidget($event, this.layoutCtx, widget, widgetExportTitle);
} }
onRemoveWidget($event: Event, widget: Widget): void { onRemoveWidget($event: Event, widget: Widget): void {

5
ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.ts
View File

@ -438,9 +438,8 @@ export class DashboardComponent extends PageComponent implements IDashboardCompo
if (this.isExportActionEnabled && this.callbacks && this.callbacks.onExportWidget) { if (this.isExportActionEnabled && this.callbacks && this.callbacks.onExportWidget) {
widget.title$.pipe( widget.title$.pipe(
take(1) take(1)
).subscribe((title) => { ).subscribe((widgetExportTitle) => {
widget.widget.config.exportTitle = title; this.callbacks.onExportWidget($event, widget.widget, widgetExportTitle);
this.callbacks.onExportWidget($event, widget.widget);
}); });
} }
} }

2
ui-ngx/src/app/modules/home/models/dashboard-component.models.ts
View File

@ -65,7 +65,7 @@ export interface WidgetContextMenuItem extends ContextMenuItem {
export interface DashboardCallbacks { export interface DashboardCallbacks {
onEditWidget?: ($event: Event, widget: Widget) => void; onEditWidget?: ($event: Event, widget: Widget) => void;
onExportWidget?: ($event: Event, widget: Widget) => void; onExportWidget?: ($event: Event, widget: Widget, widgetExportTitle: string) => void;
onRemoveWidget?: ($event: Event, widget: Widget) => void; onRemoveWidget?: ($event: Event, widget: Widget) => void;
onWidgetMouseDown?: ($event: Event, widget: Widget) => void; onWidgetMouseDown?: ($event: Event, widget: Widget) => void;
onWidgetClicked?: ($event: Event, widget: Widget) => void; onWidgetClicked?: ($event: Event, widget: Widget) => void;

7
ui-ngx/src/app/shared/import-export/import-export.service.ts
View File

@ -198,11 +198,10 @@ export class ImportExportService {
); );
} }
public exportWidget(dashboard: Dashboard, sourceState: string, sourceLayout: DashboardLayoutId, widget: Widget) { public exportWidget(dashboard: Dashboard, sourceState: string, sourceLayout: DashboardLayoutId, widget: Widget, widgetExportTitle: string) {
const widgetItem = this.itembuffer.prepareWidgetItem(dashboard, sourceState, sourceLayout, widget); const widgetItem = this.itembuffer.prepareWidgetItem(dashboard, sourceState, sourceLayout, widget);
const widgetDefaultName = this.widgetService.getWidgetInfoFromCache(widget.typeFullFqn)?.widgetName || const widgetDefaultName = this.widgetService.getWidgetInfoFromCache(widget.typeFullFqn).widgetName;
widget.typeFullFqn.split('.').pop(); let fileName = widgetDefaultName + (isNotEmptyStr(widgetExportTitle) ? '_' + widgetExportTitle : '');
let fileName = widgetDefaultName + (isNotEmptyStr(widget.config.exportTitle) ? '_' + widget.config.exportTitle : '');
fileName = fileName.toLowerCase().replace(/\W/g, '_'); fileName = fileName.toLowerCase().replace(/\W/g, '_');
this.exportToPc(this.prepareExport(widgetItem), fileName); this.exportToPc(this.prepareExport(widgetItem), fileName);
} }