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

Merge pull request #533 from jktu2870/issue_488

Browse Source 
Fix for issue 488
This commit is contained in:
Igor Kulikov 2018-01-16 15:02:41 +02:00 committed by GitHub
commit 9634ecfcb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,9 +405,13 @@ export default class TbFlot {
} }
} }
series.lines = { series.lines = {
fill: keySettings.fillLines === true, fill: keySettings.fillLines === true
show: this.chartType === 'line' ? keySettings.showLines !== false : keySettings.showLines === true
}; };
if (this.chartType === 'line' || this.chartType === 'state') {
series.lines.show = keySettings.showLines !== false
} else {
series.lines.show = keySettings.showLines === true;
}
if (angular.isDefined(keySettings.lineWidth)) { if (angular.isDefined(keySettings.lineWidth)) {
series.lines.lineWidth = keySettings.lineWidth; series.lines.lineWidth = keySettings.lineWidth;
@ -1016,18 +1020,18 @@ export default class TbFlot {
"properties": { "properties": {
"showLines": { "showLines": {
"title": "Show lines", "title": "Show lines",
"type": "boolean", "type": "boolean",
"default": defaultShowLines "default": defaultShowLines
}, },
"fillLines": { "fillLines": {
"title": "Fill lines", "title": "Fill lines",
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"showPoints": { "showPoints": {
"title": "Show points", "title": "Show points",
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"tooltipValueFormatter": { "tooltipValueFormatter": {
"title": "Tooltip value format function, f(value)", "title": "Tooltip value format function, f(value)",