Browse Source

Fix css. Add docUrl to rule node definition.

pull/794/head
Igor Kulikov 8 years ago
parent
commit
e556b48372
  1. 1
      application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
  2. 1
      rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java
  3. 2
      rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java
  4. 12
      ui/src/app/help/help-links.constant.js
  5. 7
      ui/src/scss/main.scss

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

@ -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

@ -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

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

12
ui/src/app/help/help-links.constant.js

@ -100,9 +100,15 @@ 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 (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) { if (ruleNode.component.configurationDescriptor &&
link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]; 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]) {
link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
}
} }
} }
return link; return link;

7
ui/src/scss/main.scss

@ -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: ' *';

Loading…
Cancel
Save