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

Merge pull request #9860 from ArtemDzhereleiko/AD/bug-fix/analog-gauge/major-ticks

Browse Source 
Fixed analog gauge infinite loop for major ticks
This commit is contained in:
Andrew Shvayka 2023-12-18 13:00:04 +02:00 committed by GitHub
commit f799194c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/lib/analogue-gauge.models.ts
View File

@ -130,7 +130,7 @@ export abstract class TbAnalogueGauge<S extends AnalogueGaugeSettings, O extends
const valueDec = getValueDec(this.ctx, settings); const valueDec = getValueDec(this.ctx, settings);
step = parseFloat(parseFloat(step + '').toFixed(valueDec)); step = parseFloat(parseFloat(step + '').toFixed(valueDec)) || 1;
const majorTicks: number[] = []; const majorTicks: number[] = [];
const highlights: Highlight[] = []; const highlights: Highlight[] = [];

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/analogue-gauge-widget-settings.component.ts
View File

@ -114,7 +114,7 @@ export class AnalogueGaugeWidgetSettingsComponent extends WidgetSettingsComponen
maxValue: [settings.maxValue, []], maxValue: [settings.maxValue, []],
majorTicksCount: [settings.majorTicksCount, [Validators.min(0)]], majorTicksCount: [settings.majorTicksCount, [Validators.min(0)]],
colorMajorTicks: [settings.colorMajorTicks, []], colorMajorTicks: [settings.colorMajorTicks, []],
minorTicks: [settings.majorTicksCount, [Validators.min(0)]], minorTicks: [settings.minorTicks, [Validators.min(0)]],
colorMinorTicks: [settings.colorMinorTicks, []], colorMinorTicks: [settings.colorMinorTicks, []],
numbersFont: [settings.numbersFont, []], numbersFont: [settings.numbersFont, []],
numbersColor: [settings.numbersFont.color, []], numbersColor: [settings.numbersFont.color, []],