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

make using msg.parts optional in join node

Browse Source
This commit is contained in:
Dave Conway-Jones 2024-06-24 21:05:00 +01:00
parent 3230654ecd
commit 1a8b37b4e3
No known key found for this signature in database
GPG Key ID: 1DDB0E91A28C2643
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/node_modules/@node-red/nodes/core/sequence/17-split.html vendored
View File

@ -16,6 +16,10 @@
<script type="text/html" data-template-name="split"> <script type="text/html" data-template-name="split">
<!-- <div class="form-row"><span data-i18n="[html]split.intro"></span></div> --> <!-- <div class="form-row"><span data-i18n="[html]split.intro"></span></div> -->
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
</div>
<div class="form-row"> <div class="form-row">
<label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.split"></span></label> <label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.split"></span></label>
<input type="text" id="node-input-property" style="width:70%;"/> <input type="text" id="node-input-property" style="width:70%;"/>
@ -43,10 +47,6 @@
<label for="node-input-addname-cb" style="width:auto;" data-i18n="split.addname"></label> <label for="node-input-addname-cb" style="width:auto;" data-i18n="split.addname"></label>
<input type="text" id="node-input-addname" style="width:70%"> <input type="text" id="node-input-addname" style="width:70%">
</div> </div>
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
</div>
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
@ -122,6 +122,10 @@
<script type="text/html" data-template-name="join"> <script type="text/html" data-template-name="join">
<div class="form-row">
<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"> <div class="form-row">
<label data-i18n="join.mode.mode"></label> <label data-i18n="join.mode.mode"></label>
<select id="node-input-mode" style="width:200px;"> <select id="node-input-mode" style="width:200px;">
@ -157,6 +161,12 @@
<input type="text" id="node-input-joiner" style="width:70%"> <input type="text" id="node-input-joiner" style="width:70%">
<input type="hidden" id="node-input-joinerType"> <input type="hidden" id="node-input-joinerType">
</div> </div>
<div class="form-row">
<input type="checkbox" id="node-input-useparts" style="margin-left:8px; margin-right:8px; vertical-align:baseline; width:auto;">
<label for="node-input-useparts" style="width:auto;" data-i18n="join.useparts"></label>
</div>
<div class="form-row node-row-trigger" id="trigger-row"> <div class="form-row node-row-trigger" id="trigger-row">
<label style="width:auto;" data-i18n="join.send"></label> <label style="width:auto;" data-i18n="join.send"></label>
<ul> <ul>
@ -195,10 +205,6 @@
<label for="node-input-reduceRight" style="width:70%;" data-i18n="join.reduce.right" style="margin-left:10px;"/> <label for="node-input-reduceRight" style="width:70%;" data-i18n="join.reduce.right" style="margin-left:10px;"/>
</div> </div>
</div> </div>
<div class="form-row">
<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-tips form-tips-auto hide" data-i18n="[html]join.tip"></div> <div class="form-tips form-tips-auto hide" data-i18n="[html]join.tip"></div>
</script> </script>
@ -234,6 +240,7 @@
}, },
joiner: { value:"\\n"}, joiner: { value:"\\n"},
joinerType: { value:"str"}, joinerType: { value:"str"},
useparts: { value:false },
accumulate: { value:"false" }, accumulate: { value:"false" },
timeout: {value:""}, timeout: {value:""},
count: {value:""}, count: {value:""},

3
packages/node_modules/@node-red/nodes/core/sequence/17-split.js vendored
View File

@ -444,6 +444,7 @@ module.exports = function(RED) {
this.count = Number(n.count || 0); this.count = Number(n.count || 0);
this.joiner = n.joiner||""; this.joiner = n.joiner||"";
this.joinerType = n.joinerType||"str"; this.joinerType = n.joinerType||"str";
this.useparts = n.useparts || false;
this.reduce = (this.mode === "reduce"); this.reduce = (this.mode === "reduce");
if (this.reduce) { if (this.reduce) {
@ -611,7 +612,7 @@ module.exports = function(RED) {
return; return;
} }
if (node.mode === 'custom' && msg.hasOwnProperty('parts')) { if (node.mode === 'custom' && msg.hasOwnProperty('parts') && node.useparts === false ) {
if (msg.parts.hasOwnProperty('parts')) { if (msg.parts.hasOwnProperty('parts')) {
msg.parts = { parts: msg.parts.parts }; msg.parts = { parts: msg.parts.parts };
} }

1
packages/node_modules/@node-red/nodes/locales/en-US/messages.json vendored
View File

@ -1046,6 +1046,7 @@
"joinedUsing": "joined using", "joinedUsing": "joined using",
"send": "Send the message:", "send": "Send the message:",
"afterCount": "After a number of message parts", "afterCount": "After a number of message parts",
"useparts": "Use existing msg.parts property",
"count": "count", "count": "count",
"subsequent": "and every subsequent message.", "subsequent": "and every subsequent message.",
"afterTimeout": "After a timeout following the first message", "afterTimeout": "After a timeout following the first message",