Move Right
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index cb29946d..715fba78 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -102,7 +102,8 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
@ViewChild('editChartNotify', {static: true}) editChartNotify: NotifyFormComponent;
@ViewChild('deleteNotify', {static: true}) deleteNotify: NotifyFormComponent;
/* Transition Groups */
- @ViewChild('transitionGroup') transitionGroup: TransitionGroupComponent;
+ @ViewChild('numbersTransition') numbersTransition: TransitionGroupComponent;
+ @ViewChild('chartsTransition') chartsTransition: TransitionGroupComponent;
public isFullscreen: boolean = false;
@@ -590,7 +591,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
public removeNumberIndicatorPath(index: number) {
this.numberIndicatorPaths.removeAt(index);
this.indicator.indicatorPaths.splice(index, 1);
- this.transitionGroup.init();
+ this.numbersTransition.init();
if (this.indicator.activePath === index) {
this.activeNumberIndicatorPath(Math.max(0, index - 1));
} else if (this.indicator.activePath > index) {
@@ -602,7 +603,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
public removeChartIndicatorPath(index: number) {
this.chartIndicatorPaths.removeAt(index);
this.indicator.indicatorPaths.splice(index, 1);
- this.transitionGroup.init();
+ this.chartsTransition.init();
if (this.indicator.activePath === index) {
this.activeChartIndicatorPath(Math.max(0, index - 1));
} else if (this.indicator.activePath > index) {
@@ -612,9 +613,14 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
}
public moveIndicatorPath(form: FormGroup,
- indicatorPaths: FormArray, index: number,
+ type: 'number' | 'chart', index: number,
newIndex: number = index - 1) {
- this.transitionGroup.init();
+ let indicatorPaths = type == 'number'?this.numberIndicatorPaths:this.chartIndicatorPaths;
+ if(type == 'number') {
+ this.numbersTransition.init();
+ } else {
+ this.chartsTransition.init();
+ }
let a = indicatorPaths.at(index);
let b = indicatorPaths.at(newIndex);
indicatorPaths.setControl(index, b);
@@ -632,7 +638,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
let paths = this.numberIndicatorPaths;
if (index == paths.length) {
this.addNumberIndicatorPath();
- this.transitionGroup.init();
+ this.numbersTransition.init();
}
this.indicator.activePath = index;
}
@@ -641,7 +647,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
let paths = this.chartIndicatorPaths;
if (index == paths.length) {
this.addChartIndicatorPath();
- this.transitionGroup.init();
+ this.chartsTransition.init();
}
this.indicator.activePath = index;
}