Browse Source
Merge branch 'rc' into features/add_tooltip_option_to_show_stack_mode_total_value_on_timeseries_chart_widgets
pull/13373/head
Paolo Cristiani
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with
20 additions and
4 deletions
-
ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.ts
|
|
|
@ -340,6 +340,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
|
public onDataUpdated() { |
|
|
|
this.alarmsDatasource.updateAlarms(); |
|
|
|
this.clearCache(); |
|
|
|
this.ctx.detectChanges(); |
|
|
|
} |
|
|
|
|
|
|
|
public onEditModeChanged() { |
|
|
|
|
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
<div class="tb-bar-chart-overlay" [style]="overlayStyle"></div> |
|
|
|
@if (widgetComponent.dashboardWidget.showWidgetTitlePanel) { |
|
|
|
<div class="tb-widget-title-row flex justify-between"> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container> |
|
|
|
</div> |
|
|
|
} @else { |
|
|
|
|
|
|
|
@ -58,6 +58,9 @@ export class BarChartWithLabelsWidgetComponent implements OnInit, OnDestroy, Aft |
|
|
|
@Input() |
|
|
|
ctx: WidgetContext; |
|
|
|
|
|
|
|
@Input() |
|
|
|
widgetTitlePanel: TemplateRef<any>; |
|
|
|
|
|
|
|
showLegend: boolean; |
|
|
|
legendClass: string; |
|
|
|
|
|
|
|
|
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
<div class="tb-range-chart-overlay" [style]="overlayStyle"></div> |
|
|
|
@if (widgetComponent.dashboardWidget.showWidgetTitlePanel) { |
|
|
|
<div class="tb-widget-title-row flex justify-between"> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container> |
|
|
|
</div> |
|
|
|
} @else { |
|
|
|
|
|
|
|
@ -23,6 +23,7 @@ import { |
|
|
|
OnDestroy, |
|
|
|
OnInit, |
|
|
|
Renderer2, |
|
|
|
TemplateRef, |
|
|
|
ViewChild, |
|
|
|
ViewEncapsulation |
|
|
|
} from '@angular/core'; |
|
|
|
@ -68,6 +69,9 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn |
|
|
|
@Input() |
|
|
|
ctx: WidgetContext; |
|
|
|
|
|
|
|
@Input() |
|
|
|
widgetTitlePanel: TemplateRef<any>; |
|
|
|
|
|
|
|
showLegend: boolean; |
|
|
|
legendClass: string; |
|
|
|
|
|
|
|
|
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
<div class="tb-time-series-chart-overlay" [style]="overlayStyle"></div> |
|
|
|
@if (widgetComponent.dashboardWidget.showWidgetTitlePanel) { |
|
|
|
<div class="tb-widget-title-row flex justify-between"> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container> |
|
|
|
</div> |
|
|
|
} @else { |
|
|
|
|
|
|
|
@ -61,6 +61,9 @@ export class TimeSeriesChartWidgetComponent implements OnInit, OnDestroy, AfterV |
|
|
|
@Input() |
|
|
|
ctx: WidgetContext; |
|
|
|
|
|
|
|
@Input() |
|
|
|
widgetTitlePanel: TemplateRef<any>; |
|
|
|
|
|
|
|
horizontalLegendPosition = false; |
|
|
|
|
|
|
|
showLegend: boolean; |
|
|
|
|
|
|
|
@ -275,6 +275,7 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni |
|
|
|
public onDataUpdated() { |
|
|
|
this.entityDatasource.dataUpdated(); |
|
|
|
this.clearCache(); |
|
|
|
this.ctx.detectChanges(); |
|
|
|
} |
|
|
|
|
|
|
|
public onEditModeChanged() { |
|
|
|
|
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
<div class="tb-map-overlay" [style]="overlayStyle"></div> |
|
|
|
@if (widgetComponent.dashboardWidget.showWidgetTitlePanel) { |
|
|
|
<div class="tb-widget-title-row flex justify-between"> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container> |
|
|
|
<ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container> |
|
|
|
</div> |
|
|
|
} @else { |
|
|
|
|
|
|
|
@ -21,6 +21,7 @@ import { |
|
|
|
Input, |
|
|
|
OnDestroy, |
|
|
|
OnInit, |
|
|
|
TemplateRef, |
|
|
|
ViewChild, |
|
|
|
ViewEncapsulation |
|
|
|
} from '@angular/core'; |
|
|
|
@ -54,6 +55,9 @@ export class MapWidgetComponent implements OnInit, OnDestroy { |
|
|
|
@Input() |
|
|
|
ctx: WidgetContext; |
|
|
|
|
|
|
|
@Input() |
|
|
|
widgetTitlePanel: TemplateRef<any>; |
|
|
|
|
|
|
|
backgroundStyle$: Observable<ComponentStyle>; |
|
|
|
overlayStyle: ComponentStyle = {}; |
|
|
|
padding: string; |
|
|
|
|