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

UI Timeseries chart widget: backward compatibility.

Browse Source
This commit is contained in:
Igor Kulikov 2017-08-18 11:53:42 +03:00
parent ddcf713f04
commit f5f9adfb52
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/app/common/dashboard-utils.service.js
View File

@ -155,6 +155,10 @@ function DashboardUtils(types, utils, timeService) {
delete datasource.deviceAliasId; delete datasource.deviceAliasId;
} }
}); });
//TODO: Temp workaround
if (widget.isSystemType && widget.bundleAlias == 'charts' && widget.typeAlias == 'timeseries') {
widget.typeAlias = 'basic_timeseries';
}
return widget; return widget;
} }
@ -197,18 +201,22 @@ function DashboardUtils(types, utils, timeService) {
if (!widget.id) { if (!widget.id) {
widget.id = utils.guid(); widget.id = utils.guid();
} }
widgetsMap[widget.id] = validateAndUpdateWidget(widget); widgetsMap[widget.id] = widget;
}); });
dashboard.configuration.widgets = widgetsMap; dashboard.configuration.widgets = widgetsMap;
} }
for (var id in dashboard.configuration.widgets) {
var widget = dashboard.configuration.widgets[id];
dashboard.configuration.widgets[id] = validateAndUpdateWidget(widget);
}
if (angular.isUndefined(dashboard.configuration.states)) { if (angular.isUndefined(dashboard.configuration.states)) {
dashboard.configuration.states = { dashboard.configuration.states = {
'default': createDefaultState(dashboard.title, true) 'default': createDefaultState(dashboard.title, true)
}; };
var mainLayout = dashboard.configuration.states['default'].layouts['main']; var mainLayout = dashboard.configuration.states['default'].layouts['main'];
for (var id in dashboard.configuration.widgets) { for (id in dashboard.configuration.widgets) {
var widget = dashboard.configuration.widgets[id]; widget = dashboard.configuration.widgets[id];
mainLayout.widgets[id] = { mainLayout.widgets[id] = {
sizeX: widget.sizeX, sizeX: widget.sizeX,
sizeY: widget.sizeY, sizeY: widget.sizeY,

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

@ -193,7 +193,7 @@ export default class TbFlot {
} }
ctx.yAxisTickFormatter = function(value/*, axis*/) { ctx.yAxisTickFormatter = function(value/*, axis*/) {
if (settings.yaxis.showLabels === false) { if (settings.yaxis && settings.yaxis.showLabels === false) {
return ''; return '';
} }
var factor = this.tickDecimals ? Math.pow(10, this.tickDecimals) : 1, var factor = this.tickDecimals ? Math.pow(10, this.tickDecimals) : 1,