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

Add port labels to Subflow nodes

Browse Source
This commit is contained in:
Nick O'Leary 2017-02-08 10:25:58 +00:00
parent 185b16a858
commit 599a6bf050
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editor/js/nodes.js
View File

@ -173,6 +173,8 @@ RED.nodes = (function() {
function addNode(n) { function addNode(n) {
if (n.type.indexOf("subflow") !== 0) { if (n.type.indexOf("subflow") !== 0) {
n["_"] = n._def._; n["_"] = n._def._;
} else {
n["_"] = RED._;
} }
if (n._def.category == "config") { if (n._def.category == "config") {
configNodes[n.id] = n; configNodes[n.id] = n;
@ -329,14 +331,6 @@ RED.nodes = (function() {
}); });
sf.name = subflowName; sf.name = subflowName;
} }
sf._def = {
defaults:{},
icon:"subflow.png",
category: "subflows",
color: "#da9",
inputs: sf.in.length,
outputs: sf.out.length
}
subflows[sf.id] = sf; subflows[sf.id] = sf;
RED.nodes.registerType("subflow:"+sf.id, { RED.nodes.registerType("subflow:"+sf.id, {
defaults:{name:{value:""}}, defaults:{name:{value:""}},
@ -349,12 +343,13 @@ RED.nodes = (function() {
label: function() { return this.name||RED.nodes.subflow(sf.id).name }, label: function() { return this.name||RED.nodes.subflow(sf.id).name },
labelStyle: function() { return this.name?"node_label_italic":""; }, labelStyle: function() { return this.name?"node_label_italic":""; },
paletteLabel: function() { return RED.nodes.subflow(sf.id).name }, paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
set:{ set:{
module: "node-red" module: "node-red"
} }
}); });
sf._def = RED.nodes.getType("subflow:"+sf.id);
} }
function getSubflow(id) { function getSubflow(id) {
return subflows[id]; return subflows[id];
@ -480,7 +475,6 @@ RED.nodes = (function() {
} }
} }
var labelCount;
if (n.inputs > 0 && n.inputLabels && !/^\s*$/.test(n.inputLabels.join(""))) { if (n.inputs > 0 && n.inputLabels && !/^\s*$/.test(n.inputLabels.join(""))) {
node.inputLabels = n.inputLabels.slice(); node.inputLabels = n.inputLabels.slice();
} }
@ -524,6 +518,13 @@ RED.nodes = (function() {
node.out.push(nOut); node.out.push(nOut);
}); });
if (node.in.length > 0 && n.inputLabels && !/^\s*$/.test(n.inputLabels.join(""))) {
node.inputLabels = n.inputLabels.slice();
}
if (node.out.length > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
node.outputLabels = n.outputLabels.slice();
}
return node; return node;
} }

48
editor/js/ui/editor.js
View File

@ -620,6 +620,10 @@ RED.editor = (function() {
var inputCount = node.inputs || node._def.inputs || 0; var inputCount = node.inputs || node._def.inputs || 0;
var outputCount = node.outputs || node._def.outputs || 0; var outputCount = node.outputs || node._def.outputs || 0;
if (node.type === 'subflow') {
inputCount = node.in.length;
outputCount = node.out.length;
}
var inputLabels = node.inputLabels || []; var inputLabels = node.inputLabels || [];
var outputLabels = node.outputLabels || []; var outputLabels = node.outputLabels || [];
@ -1435,6 +1439,21 @@ RED.editor = (function() {
editing_node.info = newDescription; editing_node.info = newDescription;
changed = true; changed = true;
} }
var inputLabels = $("#node-label-form-inputs").children().find("input");
var outputLabels = $("#node-label-form-outputs").children().find("input");
var newValue = inputLabels.map(function() { return $(this).val();}).toArray().slice(0,editing_node.inputs);
if (JSON.stringify(newValue) !== JSON.stringify(editing_node.inputLabels)) {
changes.inputLabels = editing_node.inputLabels;
editing_node.inputLabels = newValue;
changed = true;
}
newValue = outputLabels.map(function() { return $(this).val();}).toArray().slice(0,editing_node.outputs);
if (JSON.stringify(newValue) !== JSON.stringify(editing_node.outputLabels)) {
changes.outputLabels = editing_node.outputLabels;
editing_node.outputLabels = newValue;
changed = true;
}
RED.palette.refresh(); RED.palette.refresh();
@ -1472,7 +1491,10 @@ RED.editor = (function() {
} }
} }
], ],
resize: function() { resize: function(dimensions) {
$(".editor-tray-content").height(dimensions.height - 78);
var form = $(".editor-tray-content form").height(dimensions.height - 78 - 40);
var rows = $("#dialog-form>div:not(.node-text-editor-row)"); var rows = $("#dialog-form>div:not(.node-text-editor-row)");
var editorRow = $("#dialog-form>div.node-text-editor-row"); var editorRow = $("#dialog-form>div.node-text-editor-row");
var height = $("#dialog-form").height(); var height = $("#dialog-form").height();
@ -1484,10 +1506,28 @@ RED.editor = (function() {
subflowEditor.resize(); subflowEditor.resize();
}, },
open: function(tray) { open: function(tray) {
var trayFooter = tray.find(".editor-tray-footer");
var trayBody = tray.find('.editor-tray-body');
trayBody.parent().css('overflow','hidden');
var stack = RED.stack.create({
container: trayBody,
singleExpanded: true
});
var nodeProperties = stack.add({
title: RED._("editor.nodeProperties"),
expanded: true
});
var portLabels = stack.add({
title: RED._("editor.portLabels")
});
if (editing_node) { if (editing_node) {
RED.sidebar.info.refresh(editing_node); RED.sidebar.info.refresh(editing_node);
} }
var dialogForm = buildEditForm(tray.find('.editor-tray-body'),"dialog-form","subflow-template"); var dialogForm = buildEditForm(nodeProperties.content,"dialog-form","subflow-template");
subflowEditor = RED.editor.createEditor({ subflowEditor = RED.editor.createEditor({
id: 'subflow-input-info-editor', id: 'subflow-input-info-editor',
mode: 'ace/mode/markdown', mode: 'ace/mode/markdown',
@ -1506,7 +1546,9 @@ RED.editor = (function() {
} }
}); });
$("#subflow-dialog-user-count").html(RED._("subflow.subflowInstances", {count:userCount})).show(); $("#subflow-dialog-user-count").html(RED._("subflow.subflowInstances", {count:userCount})).show();
dialogForm.i18n();
buildLabelForm(portLabels.content,subflow);
trayBody.i18n();
}, },
close: function() { close: function() {
if (RED.view.state() != RED.state.IMPORT_DRAGGING) { if (RED.view.state() != RED.state.IMPORT_DRAGGING) {