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

Merge remote-tracking branch 'origin/develop/2.0' into develop/2.0

Browse Source
This commit is contained in:
vparomskiy 2018-05-25 20:36:29 +03:00
commit b6b585b43e
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
View File

@ -176,6 +176,7 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe
nodeDefinition.setConfigDirective(nodeAnnotation.configDirective());
nodeDefinition.setIcon(nodeAnnotation.icon());
nodeDefinition.setIconUrl(nodeAnnotation.iconUrl());
nodeDefinition.setDocUrl(nodeAnnotation.docUrl());
return nodeDefinition;
}

1
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java
View File

@ -33,5 +33,6 @@ public class NodeDefinition {
String configDirective;
String icon;
String iconUrl;
String docUrl;
}

2
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java
View File

@ -53,6 +53,8 @@ public @interface RuleNode {
String iconUrl() default "";
String docUrl() default "";
boolean customRelations() default false;
}

13
ui/src/app/help/help-links.constant.js
View File

@ -99,13 +99,18 @@ export default angular.module('thingsboard.help', [])
widgetsConfigStatic: helpBaseUrl + "/docs/user-guide/ui/dashboards#static",
},
getRuleNodeLink: function(ruleNode) {
var link = 'ruleEngine';
if (ruleNode && ruleNode.component && ruleNode.component.clazz) {
if (ruleNode && ruleNode.component) {
if (ruleNode.component.configurationDescriptor &&
ruleNode.component.configurationDescriptor.nodeDefinition &&
ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) {
return ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;
} else if (ruleNode.component.clazz) {
if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) {
link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
return ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
}
}
return link;
}
return 'ruleEngine';
}
}
).name;

4
ui/src/app/help/help.directive.js
View File

@ -35,6 +35,10 @@ function Help($compile, $window, helpLinks) {
$event.stopPropagation();
}
var helpUrl = helpLinks.linksMap[scope.helpLinkId];
if (!helpUrl && scope.helpLinkId &&
(scope.helpLinkId.startsWith('http://') || scope.helpLinkId.startsWith('https://'))) {
helpUrl = scope.helpLinkId;
}
if (helpUrl) {
$window.open(helpUrl, '_blank');
}

7
ui/src/scss/main.scss
View File

@ -283,13 +283,6 @@ div {
}
}
md-input-container {
.tk-hint {
padding-top: 40px;
}
}
.md-caption {
&.tb-required:after {
content: ' *';