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

Merge pull request #1670 from vvlladd28/improvement/flot_axis

Browse Source 
Improvement float directory: fix autoScale and delete not support param
This commit is contained in:
Andrew Shvayka 2019-05-16 18:48:13 +03:00 committed by GitHub
commit cc0dde69a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/src/app/widget/lib/flot-widget.js
View File

@ -535,7 +535,11 @@ export default class TbFlot {
yaxis.tickUnits = units; yaxis.tickUnits = units;
yaxis.tickDecimals = tickDecimals; yaxis.tickDecimals = tickDecimals;
yaxis.tickSize = tickSize; 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.position = position;
yaxis.keysInfo = []; yaxis.keysInfo = [];
@ -938,11 +942,6 @@ export default class TbFlot {
"type": "string", "type": "string",
"default": null "default": null
}, },
"titleAngle": {
"title": "Axis title's angle in degrees",
"type": "number",
"default": 0
},
"color": { "color": {
"title": "Ticks color", "title": "Ticks color",
"type": "string", "type": "string",
@ -975,11 +974,6 @@ export default class TbFlot {
"type": "string", "type": "string",
"default": null "default": null
}, },
"titleAngle": {
"title": "Axis title's angle in degrees",
"type": "number",
"default": 0
},
"color": { "color": {
"title": "Ticks color", "title": "Ticks color",
"type": "string", "type": "string",
@ -1048,7 +1042,6 @@ export default class TbFlot {
"items": [ "items": [
"xaxis.showLabels", "xaxis.showLabels",
"xaxis.title", "xaxis.title",
"xaxis.titleAngle",
{ {
"key": "xaxis.color", "key": "xaxis.color",
"type": "color" "type": "color"
@ -1064,7 +1057,6 @@ export default class TbFlot {
"yaxis.tickSize", "yaxis.tickSize",
"yaxis.showLabels", "yaxis.showLabels",
"yaxis.title", "yaxis.title",
"yaxis.titleAngle",
{ {
"key": "yaxis.color", "key": "yaxis.color",
"type": "color" "type": "color"