frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

fixed to access last variable with same name

Browse Source
This commit is contained in:
Hiroyasu Nishiyama 2019-01-29 21:46:50 +09:00
parent ba3b64a6c6
commit 8f6b24e0aa
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js vendored
View File

@ -200,7 +200,7 @@ class Subflow extends Flow {
*/
getSetting(name) {
function lookup(env, name) {
for(var i = 0; i < env.length; i++) {
for(var i = env.length -1; i >= 0; i--) {
var item = env[i];
if (item.name === name) {
return item;

67
test/nodes/subflow/subflow_spec.js
View File

@ -228,6 +228,73 @@ describe('subflow', function() {
});
});
it('should access last env var with same name', function(done) {
var flow = [
{id:"t0", type:"tab", label:"", disabled:false, info:""},
{id:"n1", x:10, y:10, z:"t0", type:"subflow:s1",
env: [
{name: "K", type: "T", value: "V0",
info: {
name: "K",
label: "",
value: "V1",
type: "T",
target_type: "env var",
"target": "K"
}},
{name: "X", type: "T", value: "V",
info: {
name: "X",
label: "",
value: "V",
type: "T",
target_type: "env var",
"target": "X"
}},
{name: "K", type: "T", value: "V1",
info: {
name: "K",
label: "",
value: "V1",
type: "T",
target_type: "env var",
"target": "K"
}},
],
wires:[["n2"]]},
{id:"n2", x:10, y:10, z:"t0", type:"helper", wires:[]},
// Subflow
{id:"s1", type:"subflow", name:"Subflow", info:"",
in:[{
x:10, y:10,
wires:[ {id:"s1-n1"} ]
}],
out:[{
x:10, y:10,
wires:[ {id:"s1-n1", port:0} ]
}]
},
{id:"s1-n1", x:10, y:10, z:"s1", type:"function",
func:"msg.V = env.get('K'); return msg;",
wires:[]}
];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
try {
msg.should.have.property("V", "V1");
done();
}
catch (e) {
console.log(e);
done(e);
}
});
n1.receive({payload:"foo"});
});
});
it('should overwrite env var of subflow template by env var of subflow instance', function(done) {
var flow = [
{id:"t0", type:"tab", label:"", disabled:false, info:""},