Commit 9634ecfcb589a33bbd6f9bffcf8dca7c2584fe4c
Committed by
GitHub
GitHub
Merge pull request #533 from jktu2870/issue_488
Fix for issue 488
Showing
1 changed file
with
12 additions
and
8 deletions
| @@ -405,9 +405,13 @@ export default class TbFlot { | @@ -405,9 +405,13 @@ export default class TbFlot { | ||
| 405 | } | 405 | } |
| 406 | } | 406 | } |
| 407 | series.lines = { | 407 | series.lines = { |
| 408 | - fill: keySettings.fillLines === true, | ||
| 409 | - show: this.chartType === 'line' ? keySettings.showLines !== false : keySettings.showLines === true | 408 | + fill: keySettings.fillLines === true |
| 410 | }; | 409 | }; |
| 410 | + if (this.chartType === 'line' || this.chartType === 'state') { | ||
| 411 | + series.lines.show = keySettings.showLines !== false | ||
| 412 | + } else { | ||
| 413 | + series.lines.show = keySettings.showLines === true; | ||
| 414 | + } | ||
| 411 | 415 | ||
| 412 | if (angular.isDefined(keySettings.lineWidth)) { | 416 | if (angular.isDefined(keySettings.lineWidth)) { |
| 413 | series.lines.lineWidth = keySettings.lineWidth; | 417 | series.lines.lineWidth = keySettings.lineWidth; |
| @@ -1016,18 +1020,18 @@ export default class TbFlot { | @@ -1016,18 +1020,18 @@ export default class TbFlot { | ||
| 1016 | "properties": { | 1020 | "properties": { |
| 1017 | "showLines": { | 1021 | "showLines": { |
| 1018 | "title": "Show lines", | 1022 | "title": "Show lines", |
| 1019 | - "type": "boolean", | ||
| 1020 | - "default": defaultShowLines | 1023 | + "type": "boolean", |
| 1024 | + "default": defaultShowLines | ||
| 1021 | }, | 1025 | }, |
| 1022 | "fillLines": { | 1026 | "fillLines": { |
| 1023 | "title": "Fill lines", | 1027 | "title": "Fill lines", |
| 1024 | - "type": "boolean", | ||
| 1025 | - "default": false | 1028 | + "type": "boolean", |
| 1029 | + "default": false | ||
| 1026 | }, | 1030 | }, |
| 1027 | "showPoints": { | 1031 | "showPoints": { |
| 1028 | "title": "Show points", | 1032 | "title": "Show points", |
| 1029 | - "type": "boolean", | ||
| 1030 | - "default": false | 1033 | + "type": "boolean", |
| 1034 | + "default": false | ||
| 1031 | }, | 1035 | }, |
| 1032 | "tooltipValueFormatter": { | 1036 | "tooltipValueFormatter": { |
| 1033 | "title": "Tooltip value format function, f(value)", | 1037 | "title": "Tooltip value format function, f(value)", |