wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-10 13:32:36 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into fix/secure-combo

Browse Source
This commit is contained in:
Dr.Lt.Data 2023-08-03 16:25:15 +09:00 committed by GitHub
commit 61e1f01cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/scripts/app.js
View File

@ -1352,35 +1352,39 @@ export class ComfyApp {
let parent = node.getInputNode(i); let parent = node.getInputNode(i);
if (parent) { if (parent) {
let link = node.getInputLink(i); let link = node.getInputLink(i);
while (parent.mode === 4) { while (parent.mode === 4 || parent.isVirtualNode) {
let found = false; let found = false;
if (link) { if (parent.isVirtualNode) {
let all_inputs = [link.origin_slot].concat(parent.inputs) link = parent.getInputLink(link.origin_slot);
for (let parent_input in all_inputs) { if (link) {
if (parent.inputs[parent_input].type === node.inputs[i].type) { parent = parent.getInputNode(link.origin_slot);
link = parent.getInputLink(parent_input); if (parent) {
if (link) {
parent = parent.getInputNode(parent_input);
}
found = true; found = true;
break; }
}
} else if (link && parent.mode === 4) {
let all_inputs = [link.origin_slot];
if (parent.inputs) {
all_inputs = all_inputs.concat(Object.keys(parent.inputs))
for (let parent_input in all_inputs) {
parent_input = all_inputs[parent_input];
if (parent.inputs[parent_input].type === node.inputs[i].type) {
link = parent.getInputLink(parent_input);
if (link) {
parent = parent.getInputNode(parent_input);
}
found = true;
break;
}
} }
} }
} }
if (!found) { if (!found) {
break; break;
} }
} }
while (parent && parent.isVirtualNode) {
link = parent.getInputLink(link.origin_slot);
if (link) {
parent = parent.getInputNode(link.origin_slot);
} else {
parent = null;
}
}
if (link) { if (link) {
inputs[node.inputs[i].name] = [String(link.origin_id), parseInt(link.origin_slot)]; inputs[node.inputs[i].name] = [String(link.origin_id), parseInt(link.origin_slot)];
} }