Browse Source
Merge pull request #10279 from ChantsovaEkaterina/bug/flot-chart-yaxis-min-max-values
Fixed applying min/max y-axis parameters in flot chart
pull/10316/head
Igor Kulikov
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
4 additions and
4 deletions
-
ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
|
|
|
@ -206,8 +206,8 @@ export class TbFlot { |
|
|
|
|
|
|
|
if (this.settings.yaxis) { |
|
|
|
this.yaxis.font.color = this.settings.yaxis.color || this.yaxis.font.color; |
|
|
|
this.yaxis.min = isDefined(this.settings.yaxis.min) ? this.settings.yaxis.min : null; |
|
|
|
this.yaxis.max = isDefined(this.settings.yaxis.max) ? this.settings.yaxis.max : null; |
|
|
|
this.yaxis.min = isNumber(this.settings.yaxis.min) ? this.settings.yaxis.min : null; |
|
|
|
this.yaxis.max = isNumber(this.settings.yaxis.max) ? this.settings.yaxis.max : null; |
|
|
|
this.yaxis.label = this.utils.customTranslation(this.settings.yaxis.title, this.settings.yaxis.title) || null; |
|
|
|
this.yaxis.labelFont.color = this.yaxis.font.color; |
|
|
|
this.yaxis.labelFont.size = this.yaxis.font.size + 2; |
|
|
|
@ -895,8 +895,8 @@ export class TbFlot { |
|
|
|
tickSize = yaxis.tickSize; |
|
|
|
} |
|
|
|
const position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : 'left'; |
|
|
|
const min = isDefined(keySettings.axisMin) ? keySettings.axisMin : yaxis.min; |
|
|
|
const max = isDefined(keySettings.axisMax) ? keySettings.axisMax : yaxis.max; |
|
|
|
const min = isNumber(keySettings.axisMin) ? keySettings.axisMin : yaxis.min; |
|
|
|
const max = isNumber(keySettings.axisMax) ? keySettings.axisMax : yaxis.max; |
|
|
|
yaxis.label = label; |
|
|
|
yaxis.min = min; |
|
|
|
yaxis.max = max; |
|
|
|
|
