Browse Source
Merge pull request #11202 from rusikv/bug/chart-fill-tooltip
Fixed invalid tooltip in chart fill settings
pull/11269/head
Igor Kulikov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
5 additions and
5 deletions
-
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts
|
|
|
@ -160,7 +160,7 @@ |
|
|
|
</div> |
|
|
|
<tb-chart-fill-settings |
|
|
|
formControlName="barBackgroundSettings" |
|
|
|
title="widgets.chart.background" |
|
|
|
titleText="widgets.chart.background" |
|
|
|
fillNoneTitle="widgets.chart.fill-type-solid"> |
|
|
|
</tb-chart-fill-settings> |
|
|
|
<tb-time-series-no-aggregation-bar-width-settings |
|
|
|
|
|
|
|
@ -79,7 +79,7 @@ |
|
|
|
</div> |
|
|
|
<tb-chart-fill-settings |
|
|
|
formControlName="barBackgroundSettings" |
|
|
|
title="widgets.chart.background" |
|
|
|
titleText="widgets.chart.background" |
|
|
|
fillNoneTitle="widgets.chart.fill-type-solid"> |
|
|
|
</tb-chart-fill-settings> |
|
|
|
<tb-time-series-no-aggregation-bar-width-settings |
|
|
|
|
|
|
|
@ -77,7 +77,7 @@ |
|
|
|
</div> |
|
|
|
<tb-chart-fill-settings |
|
|
|
formControlName="backgroundSettings" |
|
|
|
title="widgets.chart.background" |
|
|
|
titleText="widgets.chart.background" |
|
|
|
fillNoneTitle="widgets.chart.fill-type-solid"> |
|
|
|
</tb-chart-fill-settings> |
|
|
|
</ng-container> |
|
|
|
|
|
|
|
@ -18,7 +18,7 @@ |
|
|
|
<ng-container [formGroup]="fillSettingsFormGroup"> |
|
|
|
<div class="tb-form-row column"> |
|
|
|
<div class="tb-form-row no-border no-padding space-between"> |
|
|
|
<div>{{ title | translate }}</div> |
|
|
|
<div>{{ titleText | translate }}</div> |
|
|
|
<tb-toggle-select formControlName="type"> |
|
|
|
<tb-toggle-option *ngFor="let type of chartFillTypes" [value]="type">{{ chartFillTypeTranslationMap.get(type) | translate }}</tb-toggle-option> |
|
|
|
</tb-toggle-select> |
|
|
|
|
|
|
|
@ -55,7 +55,7 @@ export class ChartFillSettingsComponent implements OnInit, ControlValueAccessor |
|
|
|
disabled: boolean; |
|
|
|
|
|
|
|
@Input() |
|
|
|
title = 'widgets.chart.fill'; |
|
|
|
titleText = 'widgets.chart.fill'; |
|
|
|
|
|
|
|
@Input() |
|
|
|
fillNoneTitle = 'widgets.chart.fill-type-none'; |
|
|
|
|