Merge pull request #9860 from ArtemDzhereleiko/AD/bug-fix/analog-gaug…

…e/major-ticks Fixed analog gauge infinite loop for major ticks
thingsboard · Dec 18, 2023 · f799194 · f799194
2 parents 1419782 + 657649f
commit f799194
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-gauge.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-gauge.models.ts
@@ -130,7 +130,7 @@ export abstract class TbAnalogueGauge<S extends AnalogueGaugeSettings, O extends
 
     const valueDec = getValueDec(this.ctx, settings);
 
-    step = parseFloat(parseFloat(step + '').toFixed(valueDec));
+    step = parseFloat(parseFloat(step + '').toFixed(valueDec)) || 1;
 
     const majorTicks: number[] = [];
     const highlights: Highlight[] = [];

diff --git a/...les/home/components/widget/lib/settings/gauge/analogue-gauge-widget-settings.component.ts b/...les/home/components/widget/lib/settings/gauge/analogue-gauge-widget-settings.component.ts
@@ -114,7 +114,7 @@ export class AnalogueGaugeWidgetSettingsComponent extends WidgetSettingsComponen
       maxValue: [settings.maxValue, []],
       majorTicksCount: [settings.majorTicksCount, [Validators.min(0)]],
       colorMajorTicks: [settings.colorMajorTicks, []],
-      minorTicks: [settings.majorTicksCount, [Validators.min(0)]],
+      minorTicks: [settings.minorTicks, [Validators.min(0)]],
       colorMinorTicks: [settings.colorMinorTicks, []],
       numbersFont: [settings.numbersFont, []],
       numbersColor: [settings.numbersFont.color, []],