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

Add support for entityLabel in HTML value card, replace entityLabel on entityName, if label doesn't exist (#2239)

Browse Source
This commit is contained in:
Chantsova Ekaterina 2019-12-09 12:52:06 +02:00 committed by Igor Kulikov
parent 424c137d3a
commit f4656f3ea0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/data/json/system/widget_bundles/cards.json
View File

File diff suppressed because one or more lines are too long

2
ui/src/app/common/utils.service.js
View File

@ -522,7 +522,7 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
} else if (variableName === 'deviceName') { } else if (variableName === 'deviceName') {
label = label.split(variable).join(datasource.entityName); label = label.split(variable).join(datasource.entityName);
} else if (variableName === 'entityLabel') { } else if (variableName === 'entityLabel') {
label = label.split(variable).join(datasource.entityLabel); label = label.split(variable).join(datasource.entityLabel || datasource.entityName);
} else if (variableName === 'aliasName') { } else if (variableName === 'aliasName') {
label = label.split(variable).join(datasource.aliasName); label = label.split(variable).join(datasource.aliasName);
} else if (variableName === 'entityDescription') { } else if (variableName === 'entityDescription') {