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

Update rule node config UI

Browse Source
This commit is contained in:
Igor Kulikov 2022-10-19 20:03:24 +03:00
parent e21e37469b
commit 4ea96fa289
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

File diff suppressed because one or more lines are too long

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

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