wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-10 11:47:34 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

allow outputs to be used internally and externally

Browse Source
This commit is contained in:
pythongosssss 2023-11-13 20:40:08 +00:00
parent e530740841
commit 71d7e63c79
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/extensions/core/groupNode.js
View File

@ -39,6 +39,18 @@ export async function registerGroupNodes(groupNodes, source, prefix, missingNode
} }
} }
function getOutputs(config) {
const map = {};
for (const ext of config.external) {
if (!map[ext[0]]) {
map[ext[0]] = { [ext[1]]: true };
} else {
map[ext[0]][ext[1]] = true;
}
}
return map;
}
function getLinks(config) { function getLinks(config) {
const linksFrom = {}; const linksFrom = {};
const linksTo = {}; const linksTo = {};
@ -84,6 +96,7 @@ function buildNodeDef(config, nodeName, defs, source = "workflow") {
[GROUP_SLOTS]: slots, [GROUP_SLOTS]: slots,
}; };
const links = getLinks(config); const links = getLinks(config);
const externalOutputs = getOutputs(config);
const seenInputs = {}; const seenInputs = {};
const seenOutputs = {}; const seenOutputs = {};
@ -180,7 +193,7 @@ function buildNodeDef(config, nodeName, defs, source = "workflow") {
// Add outputs // Add outputs
for (let outputId = 0; outputId < def.output.length; outputId++) { for (let outputId = 0; outputId < def.output.length; outputId++) {
if (linksFrom?.[outputId]) { if (linksFrom?.[outputId] && !externalOutputs[nodeId]?.[outputId]) {
continue; continue;
} }
@ -247,6 +260,33 @@ class ConvertToGroupAction {
link.push(type); link.push(type);
} }
// Check for external links to add extra outputs
const selectedIds = Object.keys(app.canvas.selected_nodes);
for (let i = 0; i < selectedIds.length; i++) {
const id = selectedIds[i];
const node = app.graph.getNodeById(id);
if (!node.outputs?.length) continue;
for (let slot = 0; slot < node.outputs.length; slot++) {
let hasExternal = false;
const output = node.outputs[slot];
if (!output.links?.length) continue;
for (const l of output.links) {
const link = app.graph.links[l];
if (!link) continue;
if (!app.canvas.selected_nodes[link.target_id]) {
hasExternal = true;
break;
}
}
if (hasExternal) {
if (!config.external) config.external = [];
config.external.push([i, slot]);
break;
}
}
}
const def = buildNodeDef(config, name, globalDefs); const def = buildNodeDef(config, name, globalDefs);
await app.registerNodeDef("workflow/" + name, def); await app.registerNodeDef("workflow/" + name, def);
return { config, def }; return { config, def };