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

Merge pull request #10279 from ChantsovaEkaterina/bug/flot-chart-yaxis-min-max-values

Browse Source 
Fixed applying min/max y-axis parameters in flot chart
This commit is contained in:
Igor Kulikov 2024-03-06 16:33:36 +02:00 committed by GitHub
commit 14cc56939c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
View File

@ -206,8 +206,8 @@ export class TbFlot {
if (this.settings.yaxis) { if (this.settings.yaxis) {
this.yaxis.font.color = this.settings.yaxis.color || this.yaxis.font.color; 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.min = isNumber(this.settings.yaxis.min) ? this.settings.yaxis.min : null;
this.yaxis.max = isDefined(this.settings.yaxis.max) ? this.settings.yaxis.max : 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.label = this.utils.customTranslation(this.settings.yaxis.title, this.settings.yaxis.title) || null;
this.yaxis.labelFont.color = this.yaxis.font.color; this.yaxis.labelFont.color = this.yaxis.font.color;
this.yaxis.labelFont.size = this.yaxis.font.size + 2; this.yaxis.labelFont.size = this.yaxis.font.size + 2;
@ -895,8 +895,8 @@ export class TbFlot {
tickSize = yaxis.tickSize; tickSize = yaxis.tickSize;
} }
const position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : 'left'; const position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : 'left';
const min = isDefined(keySettings.axisMin) ? keySettings.axisMin : yaxis.min; const min = isNumber(keySettings.axisMin) ? keySettings.axisMin : yaxis.min;
const max = isDefined(keySettings.axisMax) ? keySettings.axisMax : yaxis.max; const max = isNumber(keySettings.axisMax) ? keySettings.axisMax : yaxis.max;
yaxis.label = label; yaxis.label = label;
yaxis.min = min; yaxis.min = min;
yaxis.max = max; yaxis.max = max;