Browse Source

Update rule node config UI

pull/7455/head
Igor Kulikov 4 years ago
parent
commit
4ea96fa289
  1. 14
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java
  2. 2
      rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
  3. 2
      ui-ngx/src/app/core/services/script/node-script-test.service.ts

14
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java

@ -25,7 +25,7 @@ import java.util.Set;
@Data
public class TbJsSwitchNodeConfiguration implements NodeConfiguration<TbJsSwitchNodeConfiguration> {
private static final String DEFAULT_SCRIPT = "function nextRelation(metadata, msg) {\n" +
private static final String DEFAULT_JS_SCRIPT = "function nextRelation(metadata, msg) {\n" +
" return ['one','nine'];\n" +
"}\n" +
"if(msgType === 'POST_TELEMETRY_REQUEST') {\n" +
@ -33,6 +33,14 @@ public class TbJsSwitchNodeConfiguration implements NodeConfiguration<TbJsSwitch
"}\n" +
"return nextRelation(metadata, msg);";
private static final String DEFAULT_MVEL_SCRIPT = "function nextRelation(metadata, msg) {\n" +
" return ['one','nine'];\n" +
"}\n" +
"if(msgType == 'POST_TELEMETRY_REQUEST') {\n" +
" return ['two'];\n" +
"}\n" +
"return nextRelation(metadata, msg);";
private ScriptLanguage scriptLang;
private String jsScript;
private String mvelScript;
@ -41,8 +49,8 @@ public class TbJsSwitchNodeConfiguration implements NodeConfiguration<TbJsSwitch
public TbJsSwitchNodeConfiguration defaultConfiguration() {
TbJsSwitchNodeConfiguration configuration = new TbJsSwitchNodeConfiguration();
configuration.setScriptLang(ScriptLanguage.MVEL);
configuration.setJsScript(DEFAULT_SCRIPT);
configuration.setMvelScript(DEFAULT_SCRIPT);
configuration.setJsScript(DEFAULT_JS_SCRIPT);
configuration.setMvelScript(DEFAULT_MVEL_SCRIPT);
return configuration;
}
}

2
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js

File diff suppressed because one or more lines are too long

2
ui-ngx/src/app/core/services/script/node-script-test.service.ts

@ -54,7 +54,7 @@ export class NodeScriptTestService {
msgType = debugIn.msgType;
}
return this.openTestScriptDialog(script, scriptType, functionTitle,
functionName, argNames, msg, metadata, msgType, helpId);
functionName, argNames, msg, metadata, msgType, helpId, scriptLang);
})
);
} else {

Loading…
Cancel
Save