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

UI: Fixed incorrect show widgets in layout

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-09-18 12:54:47 +03:00
parent 1f518cddbe
commit c217769e96
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.html
View File

@ -66,7 +66,7 @@
</mat-menu> </mat-menu>
<div [class]="dashboardClass" id="gridster-background"> <div [class]="dashboardClass" id="gridster-background">
<gridster #gridster id="gridster-child" [options]="gridsterOpts"> <gridster #gridster id="gridster-child" [options]="gridsterOpts">
<gridster-item #gridsterItem [item]="widget" [class]="{'tb-noselect': isEdit}" *ngFor="let widget of dashboardWidgets"> <gridster-item #gridsterItem [item]="widget" [class]="{'tb-noselect': isEdit}" *ngFor="let widget of dashboardWidgets; trackBy: trackByWidgetId">
<tb-widget-container <tb-widget-container
[gridsterItem]="gridsterItem" [gridsterItem]="gridsterItem"
[widget]="widget" [widget]="widget"

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

@ -558,6 +558,10 @@ export class DashboardComponent extends PageComponent implements IDashboardCompo
} }
} }
public trackByWidgetId(_index: number, widget: DashboardWidget) {
return widget.widgetId;
}
private scrollToWidget(widget: DashboardWidget, delay?: number) { private scrollToWidget(widget: DashboardWidget, delay?: number) {
const parentElement = this.gridster.el as HTMLElement; const parentElement = this.gridster.el as HTMLElement;
widget.gridsterItemComponent$().subscribe((gridsterItem) => { widget.gridsterItemComponent$().subscribe((gridsterItem) => {

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

@ -707,7 +707,7 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
} }
set x(x: number) { set x(x: number) {
if (!this.dashboard.isMobileSize) { if (!this.dashboard.isMobileSize && this.dashboard.isEdit) {
if (this.widgetLayout) { if (this.widgetLayout) {
this.widgetLayout.col = x; this.widgetLayout.col = x;
} else { } else {
@ -728,7 +728,7 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
} }
set y(y: number) { set y(y: number) {
if (!this.dashboard.isMobileSize) { if (!this.dashboard.isMobileSize && this.dashboard.isEdit) {
if (this.widgetLayout) { if (this.widgetLayout) {
this.widgetLayout.row = y; this.widgetLayout.row = y;
} else { } else {