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

Fix join node to ignore parts in manual mode

Browse Source 
to fix #1957
This commit is contained in:
Dave Conway-Jones 2023-11-01 13:59:09 +00:00
parent 08c6ea94cb
commit 10ce681d46
No known key found for this signature in database
GPG Key ID: 1DDB0E91A28C2643
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,7 +298,6 @@ module.exports = function(RED) {
return exp return exp
} }
function reduceMessageGroup(node,msgInfos,exp,fixup,count,accumulator,done) { function reduceMessageGroup(node,msgInfos,exp,fixup,count,accumulator,done) {
var msgInfo = msgInfos.shift(); var msgInfo = msgInfos.shift();
exp.assign("I", msgInfo.msg.parts.index); exp.assign("I", msgInfo.msg.parts.index);
@ -330,6 +329,7 @@ module.exports = function(RED) {
} }
}); });
} }
function reduceAndSendGroup(node, group, done) { function reduceAndSendGroup(node, group, done) {
var is_right = node.reduce_right; var is_right = node.reduce_right;
var flag = is_right ? -1 : 1; var flag = is_right ? -1 : 1;
@ -589,7 +589,7 @@ module.exports = function(RED) {
} }
if (node.mode === 'auto' && (!msg.hasOwnProperty("parts")||!msg.parts.hasOwnProperty("id"))) { if (node.mode === 'auto' && (!msg.hasOwnProperty("parts")||!msg.parts.hasOwnProperty("id"))) {
// if a blank reset messag erest it all. // if a blank reset message reset it all.
if (msg.hasOwnProperty("reset")) { if (msg.hasOwnProperty("reset")) {
if (inflight && inflight.hasOwnProperty("partId") && inflight[partId].timeout) { if (inflight && inflight.hasOwnProperty("partId") && inflight[partId].timeout) {
clearTimeout(inflight[partId].timeout); clearTimeout(inflight[partId].timeout);
@ -603,6 +603,15 @@ module.exports = function(RED) {
return; return;
} }
if (node.mode === 'custom' && msg.hasOwnProperty('parts')) {
if (msg.parts.hasOwnProperty('parts')) {
msg.parts = { parts: msg.parts.parts };
}
else {
delete msg.parts;
}
}
var payloadType; var payloadType;
var propertyKey; var propertyKey;
var targetCount; var targetCount;