mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2025-08-03 23:49:57 +08:00
Fix name counter preventing more than 3 of the same node
Fix linked widget offset when populating values
This commit is contained in:
@@ -331,16 +331,17 @@ export class GroupNodeConfig {
|
||||
|
||||
getInputConfig(node, inputName, seenInputs, config, extra) {
|
||||
let name = node.inputs?.find((inp) => inp.name === inputName)?.label ?? inputName;
|
||||
let key = name;
|
||||
let prefix = "";
|
||||
// Special handling for primitive to include the title if it is set rather than just "value"
|
||||
if ((node.type === "PrimitiveNode" && node.title) || name in seenInputs) {
|
||||
prefix = `${node.title ?? node.type} `;
|
||||
name = `${prefix}${inputName}`;
|
||||
key = name = `${prefix}${inputName}`;
|
||||
if (name in seenInputs) {
|
||||
name = `${prefix}${seenInputs[name]} ${inputName}`;
|
||||
}
|
||||
}
|
||||
seenInputs[name] = (seenInputs[name] ?? 1) + 1;
|
||||
seenInputs[key] = (seenInputs[key] ?? 1) + 1;
|
||||
|
||||
if (inputName === "seed" || inputName === "noise_seed") {
|
||||
if (!extra) extra = {};
|
||||
@@ -1010,10 +1011,10 @@ export class GroupNodeHandler {
|
||||
const newName = map[oldName];
|
||||
const widgetIndex = this.node.widgets.findIndex((w) => w.name === newName);
|
||||
const mainWidget = this.node.widgets[widgetIndex];
|
||||
if (this.populatePrimitive(node, nodeId, oldName, i, linkedShift)) {
|
||||
if (this.populatePrimitive(node, nodeId, oldName, i, linkedShift) || widgetIndex === -1) {
|
||||
// Find the inner widget and shift by the number of linked widgets as they will have been removed too
|
||||
const innerWidget = this.innerNodes[nodeId].widgets?.find((w) => w.name === oldName);
|
||||
linkedShift += innerWidget.linkedWidgets?.length ?? 0;
|
||||
linkedShift += innerWidget?.linkedWidgets?.length ?? 0;
|
||||
}
|
||||
if (widgetIndex === -1) {
|
||||
continue;
|
||||
|
Reference in New Issue
Block a user