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

UI: Fix open dashboard widget action.

Browse Source
This commit is contained in:
Igor Kulikov 2022-01-26 15:08:00 +02:00
parent 512a3dc6ed
commit d256349c73
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,7 +1068,6 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
switch (type) { switch (type) {
case WidgetActionType.openDashboardState: case WidgetActionType.openDashboardState:
case WidgetActionType.updateDashboardState: case WidgetActionType.updateDashboardState:
let targetDashboardStateId = descriptor.targetDashboardStateId;
const params = deepClone(this.widgetContext.stateController.getStateParams()); const params = deepClone(this.widgetContext.stateController.getStateParams());
updateEntityParams(params, targetEntityParamName, targetEntityId, entityName, entityLabel); updateEntityParams(params, targetEntityParamName, targetEntityId, entityName, entityLabel);
if (type === WidgetActionType.openDashboardState) { if (type === WidgetActionType.openDashboardState) {
@ -1080,20 +1079,19 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
this.openDashboardStateInSeparateDialog(descriptor.targetDashboardStateId, params, descriptor.dialogTitle, this.openDashboardStateInSeparateDialog(descriptor.targetDashboardStateId, params, descriptor.dialogTitle,
descriptor.dialogHideDashboardToolbar, descriptor.dialogWidth, descriptor.dialogHeight); descriptor.dialogHideDashboardToolbar, descriptor.dialogWidth, descriptor.dialogHeight);
} else { } else {
this.widgetContext.stateController.openState(targetDashboardStateId, params, descriptor.openRightLayout); this.widgetContext.stateController.openState(descriptor.targetDashboardStateId, params, descriptor.openRightLayout);
} }
} else { } else {
this.widgetContext.stateController.updateState(targetDashboardStateId, params, descriptor.openRightLayout); this.widgetContext.stateController.updateState(descriptor.targetDashboardStateId, params, descriptor.openRightLayout);
} }
break; break;
case WidgetActionType.openDashboard: case WidgetActionType.openDashboard:
const targetDashboardId = descriptor.targetDashboardId; const targetDashboardId = descriptor.targetDashboardId;
targetDashboardStateId = descriptor.targetDashboardStateId;
const stateObject: StateObject = {}; const stateObject: StateObject = {};
stateObject.params = {}; stateObject.params = {};
updateEntityParams(stateObject.params, targetEntityParamName, targetEntityId, entityName, entityLabel); updateEntityParams(stateObject.params, targetEntityParamName, targetEntityId, entityName, entityLabel);
if (targetDashboardStateId) { if (descriptor.targetDashboardStateId) {
stateObject.id = targetDashboardStateId; stateObject.id = descriptor.targetDashboardStateId;
} }
const state = objToBase64URI([ stateObject ]); const state = objToBase64URI([ stateObject ]);
const isSinglePage = this.route.snapshot.data.singlePageMode; const isSinglePage = this.route.snapshot.data.singlePageMode;