wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-11 20:27:44 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

wip widget input support

Browse Source
This commit is contained in:
pythongosssss 2023-11-19 20:15:24 +00:00
parent 07adf250cb
commit 95d1387d28
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,8 @@ function buildNodeDef(config, nodeName, defs, source = "workflow") {
const seenInputs = {}; const seenInputs = {};
const seenOutputs = {}; const seenOutputs = {};
const primitiveInputs = {};
let inputCount = 0; let inputCount = 0;
for (let nodeId = 0; nodeId < config.nodes.length; nodeId++) { for (let nodeId = 0; nodeId < config.nodes.length; nodeId++) {
const node = config.nodes[nodeId]; const node = config.nodes[nodeId];
@ -146,6 +148,22 @@ function buildNodeDef(config, nodeName, defs, source = "workflow") {
output_name: [], output_name: [],
output_is_list: [], output_is_list: [],
}; };
} else if (node.type === "PrimitiveNode") {
// Skip as its not linked
if (!linksFrom) continue;
def = {
input: {
required: {
["value"]: [linksFrom["0"][5], {}],
},
},
output: [linksFrom["0"][5]],
output_name: [],
output_is_list: [],
};
primitiveInputs[nodeId] = def.input.required.value;
} else { } else {
// Front end only node // Front end only node
console.warn("Skipping virtual node " + node.type + " when building group node " + nodeName); console.warn("Skipping virtual node " + node.type + " when building group node " + nodeName);
@ -159,7 +177,7 @@ function buildNodeDef(config, nodeName, defs, source = "workflow") {
const inputNames = Object.keys(inputs); const inputNames = Object.keys(inputs);
let linkInputId = 0; let linkInputId = 0;
for (const inputName of inputNames) { for (const inputName of inputNames) {
const widgetType = getWidgetType(inputs[inputName], inputName); let widgetType = getWidgetType(inputs[inputName], inputName);
let prefix = node.title ?? node.type; let prefix = node.title ?? node.type;
let name = `${prefix} ${inputName}`; let name = `${prefix} ${inputName}`;
@ -171,10 +189,27 @@ function buildNodeDef(config, nodeName, defs, source = "workflow") {
} }
if (widgetType) { if (widgetType) {
// Store mapping to get a group widget name from an inner id + name
if (!slots.widgets[nodeId]) slots.widgets[nodeId] = {}; if (!slots.widgets[nodeId]) slots.widgets[nodeId] = {};
slots.widgets[nodeId][inputName] = name; if (node.inputs?.find((inp) => inp.name === inputName)?.widget) {
} else { // Converted widget
widgetType = null;
const primitiveLink = linksTo?.[linkInputId];
const [sourceNodeId] = primitiveLink;
const sourceNode = config.nodes[sourceNodeId];
if (sourceNode.type === "PrimitiveNode") {
const primitiveConfig = primitiveInputs[sourceNodeId];
// TODO: Merge
primitiveConfig[1] = inputs[inputName][1];
slots.widgets[nodeId][inputName] = slots.widgets[sourceNodeId].value;
}
} else {
// Store mapping to get a group widget name from an inner id + name
slots.widgets[nodeId][inputName] = name;
}
}
if (!widgetType) {
if (linksTo?.[linkInputId]) { if (linksTo?.[linkInputId]) {
linkInputId++; linkInputId++;
continue; continue;