Browse Source
Merge pull request #1670 from vvlladd28/improvement/flot_axis
Improvement float directory: fix autoScale and delete not support param
pull/1728/head
Andrew Shvayka
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
13 deletions
-
ui/src/app/widget/lib/flot-widget.js
|
|
|
@ -535,7 +535,11 @@ export default class TbFlot { |
|
|
|
yaxis.tickUnits = units; |
|
|
|
yaxis.tickDecimals = tickDecimals; |
|
|
|
yaxis.tickSize = tickSize; |
|
|
|
yaxis.alignTicksWithAxis = position == "right" ? 1 : null; |
|
|
|
if (position === "right" && tickSize === null) { |
|
|
|
yaxis.alignTicksWithAxis = 1; |
|
|
|
} else { |
|
|
|
yaxis.alignTicksWithAxis = null; |
|
|
|
} |
|
|
|
yaxis.position = position; |
|
|
|
|
|
|
|
yaxis.keysInfo = []; |
|
|
|
@ -938,11 +942,6 @@ export default class TbFlot { |
|
|
|
"type": "string", |
|
|
|
"default": null |
|
|
|
}, |
|
|
|
"titleAngle": { |
|
|
|
"title": "Axis title's angle in degrees", |
|
|
|
"type": "number", |
|
|
|
"default": 0 |
|
|
|
}, |
|
|
|
"color": { |
|
|
|
"title": "Ticks color", |
|
|
|
"type": "string", |
|
|
|
@ -975,11 +974,6 @@ export default class TbFlot { |
|
|
|
"type": "string", |
|
|
|
"default": null |
|
|
|
}, |
|
|
|
"titleAngle": { |
|
|
|
"title": "Axis title's angle in degrees", |
|
|
|
"type": "number", |
|
|
|
"default": 0 |
|
|
|
}, |
|
|
|
"color": { |
|
|
|
"title": "Ticks color", |
|
|
|
"type": "string", |
|
|
|
@ -1048,7 +1042,6 @@ export default class TbFlot { |
|
|
|
"items": [ |
|
|
|
"xaxis.showLabels", |
|
|
|
"xaxis.title", |
|
|
|
"xaxis.titleAngle", |
|
|
|
{ |
|
|
|
"key": "xaxis.color", |
|
|
|
"type": "color" |
|
|
|
@ -1064,7 +1057,6 @@ export default class TbFlot { |
|
|
|
"yaxis.tickSize", |
|
|
|
"yaxis.showLabels", |
|
|
|
"yaxis.title", |
|
|
|
"yaxis.titleAngle", |
|
|
|
{ |
|
|
|
"key": "yaxis.color", |
|
|
|
"type": "color" |
|
|
|
|
