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

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Igor Kulikov 2024-09-19 19:47:36 +03:00
commit 20635e85cd
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,8 +248,15 @@ export class DashboardComponent extends PageComponent implements IDashboardCompo
defaultItemCols: 8,
defaultItemRows: 6,
displayGrid: this.displayGrid,
resizable: {enabled: this.isEdit && !this.isEditingWidget, delayStart: 50},
draggable: {enabled: this.isEdit && !this.isEditingWidget},
resizable: {
enabled: this.isEdit && !this.isEditingWidget,
delayStart: 50,
stop: (_, itemComponent) => {(itemComponent.item as DashboardWidget).updatePosition(itemComponent.$item.x, itemComponent.$item.y);}
},
draggable: {
enabled: this.isEdit && !this.isEditingWidget,
stop: (_, itemComponent) => {(itemComponent.item as DashboardWidget).updatePosition(itemComponent.$item.x, itemComponent.$item.y);}
},
itemChangeCallback: () => this.dashboardWidgets.sortWidgets(),
itemInitCallback: (_, itemComponent) => {
(itemComponent.item as DashboardWidget).gridsterItemComponent = itemComponent;

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

@ -706,15 +706,7 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
return Math.floor(res);
}
set x(x: number) {
if (!this.dashboard.isMobileSize && this.dashboard.isEdit) {
if (this.widgetLayout) {
this.widgetLayout.col = x;
} else {
this.widget.col = x;
}
}
}
set x(_: number) {}
@enumerable(true)
get y(): number {
@ -727,15 +719,7 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
return Math.floor(res);
}
set y(y: number) {
if (!this.dashboard.isMobileSize && this.dashboard.isEdit) {
if (this.widgetLayout) {
this.widgetLayout.row = y;
} else {
this.widget.row = y;
}
}
}
set y(_: number) {}
get preserveAspectRatio(): boolean {
if (!this.dashboard.isMobileSize && this.widgetLayout) {
@ -833,4 +817,14 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
}
return order;
}
updatePosition(x: number, y: number) {
if (this.widgetLayout) {
this.widgetLayout.col = x;
this.widgetLayout.row = y;
} else {
this.widget.col = x;
this.widget.row = y;
}
}
}