frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update XML node to support Property In/Out

Browse Source
This commit is contained in:
Steve-Mcl 2024-04-12 11:01:47 +01:00
parent 219b232cad
commit b67c9e1bdb
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/node_modules/@node-red/nodes/core/parsers/70-XML.html vendored
View File

@ -1,12 +1,16 @@
<script type="text/html" data-template-name="xml"> <script type="text/html" data-template-name="xml">
<div class="form-row"> <div class="form-row">
<label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label> <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
</div>
<div class="form-row">
<label for="node-input-property"><i class="fa fa-sign-in"></i> <span data-i18n="common.label.propertyIn"></span></label>
<input type="text" id="node-input-property" style="width:70%;"/> <input type="text" id="node-input-property" style="width:70%;"/>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label> <label for="node-input-propertyOut"><i class="fa fa-sign-out"></i> <span data-i18n="common.label.propertyOut"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name"> <input type="text" id="node-input-propertyOut" style="width:70%;"/>
</div> </div>
<hr align="middle"/> <hr align="middle"/>
<div class="form-row"> <div class="form-row">
@ -27,7 +31,11 @@
defaults: { defaults: {
name: {value:""}, name: {value:""},
property: {value:"payload",required:true, property: {value:"payload",required:true,
label:RED._("node-red:common.label.property"), label:RED._("node-red:common.label.propertyIn"),
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
attr: {value:""},
propertyOut: {value:"payload",required:true,
label:RED._("node-red:common.label.propertyOut"),
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })}, validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
attr: {value:""}, attr: {value:""},
chr: {value:""} chr: {value:""}
@ -45,7 +53,11 @@
if (this.property === undefined) { if (this.property === undefined) {
$("#node-input-property").val("payload"); $("#node-input-property").val("payload");
} }
if (this.propertyOut === undefined) {
$("#node-input-propertyOut").val("payload");
}
$("#node-input-property").typedInput({default:'msg',types:['msg']}); $("#node-input-property").typedInput({default:'msg',types:['msg']});
$("#node-input-propertyOut").typedInput({default:'msg',types:['msg']});
} }
}); });
</script> </script>

5
packages/node_modules/@node-red/nodes/core/parsers/70-XML.js vendored
View File

@ -9,6 +9,7 @@ module.exports = function(RED) {
this.attrkey = n.attr; this.attrkey = n.attr;
this.charkey = n.chr; this.charkey = n.chr;
this.property = n.property||"payload"; this.property = n.property||"payload";
this.propertyOut = n.propertyOut||this.property;
var node = this; var node = this;
this.on("input", function(msg,send,done) { this.on("input", function(msg,send,done) {
var value = RED.util.getMessageProperty(msg,node.property); var value = RED.util.getMessageProperty(msg,node.property);
@ -20,7 +21,7 @@ module.exports = function(RED) {
options.async = false; options.async = false;
var builder = new xml2js.Builder(options); var builder = new xml2js.Builder(options);
value = builder.buildObject(value, options); value = builder.buildObject(value, options);
RED.util.setMessageProperty(msg,node.property,value); RED.util.setMessageProperty(msg,node.propertyOut,value);
send(msg); send(msg);
done(); done();
} }
@ -33,7 +34,7 @@ module.exports = function(RED) {
parseString(value, options, function (err, result) { parseString(value, options, function (err, result) {
if (err) { done(err); } if (err) { done(err); }
else { else {
RED.util.setMessageProperty(msg,node.property,result); RED.util.setMessageProperty(msg,node.propertyOut,result);
send(msg); send(msg);
done(); done();
} }