Commit aa13890fbdc9c61acdcb44f1f1cde2f088dc474c
1 parent
12280f81
Improvement float directory: fix autoScale and delete not support param
Showing
1 changed file
with
5 additions
and
13 deletions
| @@ -535,7 +535,11 @@ export default class TbFlot { | @@ -535,7 +535,11 @@ export default class TbFlot { | ||
| 535 | yaxis.tickUnits = units; | 535 | yaxis.tickUnits = units; |
| 536 | yaxis.tickDecimals = tickDecimals; | 536 | yaxis.tickDecimals = tickDecimals; |
| 537 | yaxis.tickSize = tickSize; | 537 | yaxis.tickSize = tickSize; |
| 538 | - yaxis.alignTicksWithAxis = position == "right" ? 1 : null; | 538 | + if (position === "right" && tickSize === null) { |
| 539 | + yaxis.alignTicksWithAxis = 1; | ||
| 540 | + } else { | ||
| 541 | + yaxis.alignTicksWithAxis = null; | ||
| 542 | + } | ||
| 539 | yaxis.position = position; | 543 | yaxis.position = position; |
| 540 | 544 | ||
| 541 | yaxis.keysInfo = []; | 545 | yaxis.keysInfo = []; |
| @@ -938,11 +942,6 @@ export default class TbFlot { | @@ -938,11 +942,6 @@ export default class TbFlot { | ||
| 938 | "type": "string", | 942 | "type": "string", |
| 939 | "default": null | 943 | "default": null |
| 940 | }, | 944 | }, |
| 941 | - "titleAngle": { | ||
| 942 | - "title": "Axis title's angle in degrees", | ||
| 943 | - "type": "number", | ||
| 944 | - "default": 0 | ||
| 945 | - }, | ||
| 946 | "color": { | 945 | "color": { |
| 947 | "title": "Ticks color", | 946 | "title": "Ticks color", |
| 948 | "type": "string", | 947 | "type": "string", |
| @@ -975,11 +974,6 @@ export default class TbFlot { | @@ -975,11 +974,6 @@ export default class TbFlot { | ||
| 975 | "type": "string", | 974 | "type": "string", |
| 976 | "default": null | 975 | "default": null |
| 977 | }, | 976 | }, |
| 978 | - "titleAngle": { | ||
| 979 | - "title": "Axis title's angle in degrees", | ||
| 980 | - "type": "number", | ||
| 981 | - "default": 0 | ||
| 982 | - }, | ||
| 983 | "color": { | 977 | "color": { |
| 984 | "title": "Ticks color", | 978 | "title": "Ticks color", |
| 985 | "type": "string", | 979 | "type": "string", |
| @@ -1048,7 +1042,6 @@ export default class TbFlot { | @@ -1048,7 +1042,6 @@ export default class TbFlot { | ||
| 1048 | "items": [ | 1042 | "items": [ |
| 1049 | "xaxis.showLabels", | 1043 | "xaxis.showLabels", |
| 1050 | "xaxis.title", | 1044 | "xaxis.title", |
| 1051 | - "xaxis.titleAngle", | ||
| 1052 | { | 1045 | { |
| 1053 | "key": "xaxis.color", | 1046 | "key": "xaxis.color", |
| 1054 | "type": "color" | 1047 | "type": "color" |
| @@ -1064,7 +1057,6 @@ export default class TbFlot { | @@ -1064,7 +1057,6 @@ export default class TbFlot { | ||
| 1064 | "yaxis.tickSize", | 1057 | "yaxis.tickSize", |
| 1065 | "yaxis.showLabels", | 1058 | "yaxis.showLabels", |
| 1066 | "yaxis.title", | 1059 | "yaxis.title", |
| 1067 | - "yaxis.titleAngle", | ||
| 1068 | { | 1060 | { |
| 1069 | "key": "yaxis.color", | 1061 | "key": "yaxis.color", |
| 1070 | "type": "color" | 1062 | "type": "color" |