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

Merge branch 'navigate_prev_state_with_update' of github.com:engix-ltd/thingsboard into engix-ltd-navigate_prev_state_with_update

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-03-29 17:55:50 +03:00
commit 092fadde05
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts
View File

@ -168,10 +168,15 @@ export class DefaultStateControllerComponent extends StateControllerComponent im
}
}
public navigatePrevState(index: number): void {
if (index < this.stateObject.length - 1) {
this.stateObject.splice(index + 1, this.stateObject.length - index - 1);
this.gotoState(this.stateObject[this.stateObject.length - 1].id, true);
public navigatePrevState(index: number, params?: StateParams): void {
let lastIndex: number = this.stateObject.length - 1;
if (index < lastIndex) {
this.stateObject.splice(index + 1, lastIndex - 1);
lastIndex = this.stateObject.length - 1;
if (params) {
this.stateObject[lastIndex].params = params;
}
this.gotoState(this.stateObject[lastIndex].id, true);
}
}

7
ui-ngx/src/app/modules/home/components/dashboard-page/states/entity-state-controller.component.ts
View File

@ -195,11 +195,14 @@ export class EntityStateControllerComponent extends StateControllerComponent imp
}
}
public navigatePrevState(index: number): void {
public navigatePrevState(index: number, params?: StateParams): void {
if (index < this.stateObject.length - 1) {
this.stateObject.splice(index + 1, this.stateObject.length - index - 1);
this.selectedStateIndex = this.stateObject.length - 1;
this.gotoState(this.stateObject[this.stateObject.length - 1].id, true);
if (params) {
this.stateObject[this.selectedStateIndex].params = params;
}
this.gotoState(this.stateObject[this.selectedStateIndex].id, true);
}
}

2
ui-ngx/src/app/modules/home/components/dashboard-page/states/state-controller.component.ts
View File

@ -199,7 +199,7 @@ export abstract class StateControllerComponent implements IStateControllerCompon
public abstract getStateParamsByStateId(stateId: string): StateParams;
public abstract navigatePrevState(index: number): void;
public abstract navigatePrevState(index: number, params?: StateParams): void;
public abstract openState(id: string, params?: StateParams, openRightLayout?: boolean): void;