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

Fix css. Add docUrl to rule node definition.

Browse Source
This commit is contained in:
Igor Kulikov 2018-05-25 16:00:10 +03:00
parent 7c1017236f
commit e556b48372
5 changed files with 13 additions and 10 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.setConfigDirective(nodeAnnotation.configDirective());
nodeDefinition.setIcon(nodeAnnotation.icon()); nodeDefinition.setIcon(nodeAnnotation.icon());
nodeDefinition.setIconUrl(nodeAnnotation.iconUrl()); nodeDefinition.setIconUrl(nodeAnnotation.iconUrl());
nodeDefinition.setDocUrl(nodeAnnotation.docUrl());
return nodeDefinition; 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 configDirective;
String icon; String icon;
String iconUrl; 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 iconUrl() default "";
String docUrl() default "";
boolean customRelations() default false; boolean customRelations() default false;
} }

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

@ -100,11 +100,17 @@ export default angular.module('thingsboard.help', [])
}, },
getRuleNodeLink: function(ruleNode) { getRuleNodeLink: function(ruleNode) {
var link = 'ruleEngine'; 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) {
link = ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;
} else if (ruleNode && ruleNode.component && ruleNode.component.clazz) {
if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) { if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) {
link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]; link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
} }
} }
}
return link; return link;
} }
} }

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

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