Browse Source

Merge pull request #12971 from ArtemDzhereleiko/AD/bug-fix/analog-gauge-digits-label-major-ticks

Fixed label for digits and add default value for major ticks for analog gauge settings
pull/13002/head
Igor Kulikov 2 years ago
committed by GitHub
parent
commit
e5464c2dff
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/analog-gauge-basic-config.component.html
  2. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/analogue-gauge-widget-settings.component.ts
  3. 1
      ui-ngx/src/assets/locale/locale.constant-en_US.json

2
ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/analog-gauge-basic-config.component.html

@ -73,7 +73,7 @@
<div class="flex flex-row items-center justify-start gap-2"> <div class="flex flex-row items-center justify-start gap-2">
<mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic"> <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
<input matInput formControlName="valueInt" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}"> <input matInput formControlName="valueInt" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
<div matSuffix class="lt-md:!hidden" translate>widget-config.decimals-suffix</div> <div matSuffix class="lt-md:!hidden" translate>widget-config.digits-suffix</div>
</mat-form-field> </mat-form-field>
<tb-font-settings formControlName="valueFont" <tb-font-settings formControlName="valueFont"
disabledLineHeight disabledLineHeight

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

@ -45,7 +45,7 @@ export class AnalogueGaugeWidgetSettingsComponent extends WidgetSettingsComponen
maxValue: 100, maxValue: 100,
showUnitTitle: true, showUnitTitle: true,
unitTitle: null, unitTitle: null,
majorTicksCount: null, majorTicksCount: 10,
minorTicks: 2, minorTicks: 2,
valueBox: true, valueBox: true,
valueInt: 3, valueInt: 3,

1
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -6668,6 +6668,7 @@
"units-short": "Units", "units-short": "Units",
"decimals-short": "Decimals", "decimals-short": "Decimals",
"decimals-suffix": "decimals", "decimals-suffix": "decimals",
"digits-suffix": "digits",
"timewindow": "Time window", "timewindow": "Time window",
"use-dashboard-timewindow": "Use dashboard time window", "use-dashboard-timewindow": "Use dashboard time window",
"use-widget-timewindow": "Use widget time window", "use-widget-timewindow": "Use widget time window",

Loading…
Cancel
Save