mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2025-12-17 10:22:59 +08:00
Fix bug: show all the outputs from the same node while sharing
This commit is contained in:
johnqiao
parent
e53c707d99
commit
ae95b8970b
@ -52,7 +52,7 @@ export function getPotentialOutputsAndOutputNodes(nodes) {
|
||||
// iterate over the images array and add each image to the potential_outputs array
|
||||
for (let j = 0; j < node.images.length; j++) {
|
||||
potential_output_nodes.push(node);
|
||||
potential_outputs.push({ "type": "image", "image": node.images[j], "title": node.title });
|
||||
potential_outputs.push({ "type": "image", "image": node.images[j], "title": node.title, "node_id": node.id });
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -62,7 +62,7 @@ export function getPotentialOutputsAndOutputNodes(nodes) {
|
||||
// iterate over the images array and add each image to the potential_outputs array
|
||||
for (let j = 0; j < node.images.length; j++) {
|
||||
potential_output_nodes.push(node);
|
||||
potential_outputs.push({ "type": "image", "image": node.images[j], "title": node.title });
|
||||
potential_outputs.push({ "type": "image", "image": node.images[j], "title": node.title, "node_id": node.id });
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -81,7 +81,7 @@ export function getPotentialOutputsAndOutputNodes(nodes) {
|
||||
// TODO
|
||||
}
|
||||
potential_output_nodes.push(node);
|
||||
potential_outputs.push({ "type": "output", 'title': node.title, "output": { "filename": parsedURLVals.filename, "subfolder": parsedURLVals.subfolder, "value": widgetValue, "format": parsedURLVals.format } });
|
||||
potential_outputs.push({ "type": "output", 'title': node.title, "node_id": node.id , "output": { "filename": parsedURLVals.filename, "subfolder": parsedURLVals.subfolder, "value": widgetValue, "format": parsedURLVals.format } });
|
||||
}
|
||||
} else if (node.widgets[j].type === "preview") {
|
||||
const widgetValue = node.widgets[j].value;
|
||||
@ -98,7 +98,7 @@ export function getPotentialOutputsAndOutputNodes(nodes) {
|
||||
// TODO
|
||||
}
|
||||
potential_output_nodes.push(node);
|
||||
potential_outputs.push({ "type": "output", 'title': node.title, "output": { "filename": parsedURLVals.filename, "subfolder": parsedURLVals.subfolder, "value": `/view?filename=${parsedURLVals.filename}&subfolder=${parsedURLVals.subfolder}&type=${parsedURLVals.type}&format=${parsedURLVals.format}`, "format": parsedURLVals.format } });
|
||||
potential_outputs.push({ "type": "output", 'title': node.title, "node_id": node.id , "output": { "filename": parsedURLVals.filename, "subfolder": parsedURLVals.subfolder, "value": `/view?filename=${parsedURLVals.filename}&subfolder=${parsedURLVals.subfolder}&type=${parsedURLVals.type}&format=${parsedURLVals.format}`, "format": parsedURLVals.format } });
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -850,13 +850,17 @@ export class ShareDialog extends ComfyDialog {
|
||||
return res;
|
||||
}
|
||||
|
||||
show({ potential_outputs, potential_output_nodes, share_option }) {
|
||||
show({potential_outputs, potential_output_nodes, share_option}) {
|
||||
// Sort `potential_output_nodes` by node ID to make the order always
|
||||
// consistent, but we should also keep `potential_outputs` in the same
|
||||
// order as `potential_output_nodes`.
|
||||
const potential_output_to_order = {};
|
||||
potential_output_nodes.forEach((node, index) => {
|
||||
potential_output_to_order[node.id] = [node, potential_outputs[index]];
|
||||
if (node.id in potential_output_to_order) {
|
||||
potential_output_to_order[node.id][1].push(potential_outputs[index]);
|
||||
} else {
|
||||
potential_output_to_order[node.id] = [node, [potential_outputs[index]]];
|
||||
}
|
||||
})
|
||||
// Sort the object `potential_output_to_order` by key (node ID)
|
||||
const sorted_potential_output_to_order = Object.fromEntries(
|
||||
@ -866,13 +870,14 @@ export class ShareDialog extends ComfyDialog {
|
||||
const sorted_potential_output_nodes = []
|
||||
for (const [key, value] of Object.entries(sorted_potential_output_to_order)) {
|
||||
sorted_potential_output_nodes.push(value[0]);
|
||||
sorted_potential_outputs.push(value[1]);
|
||||
sorted_potential_outputs.push(...value[1]);
|
||||
}
|
||||
potential_output_nodes = sorted_potential_output_nodes;
|
||||
potential_outputs = sorted_potential_outputs;
|
||||
|
||||
// console.log({ potential_outputs, potential_output_nodes })
|
||||
this.radio_buttons.innerHTML = ""; // clear the radio buttons
|
||||
let is_radio_button_checked = false; // only check the first radio button if multiple images from the same node
|
||||
const new_radio_buttons = $el("div", {
|
||||
id: "selectOutput-Options",
|
||||
style: {
|
||||
@ -880,7 +885,7 @@ export class ShareDialog extends ComfyDialog {
|
||||
'max-height': '400px',
|
||||
}
|
||||
}, potential_outputs.map((output, index) => {
|
||||
const potential_output_node = potential_output_nodes[index];
|
||||
const {node_id} = output;
|
||||
const radio_button = $el("input", { type: 'radio', name: "selectOutputImages", value: index, required: index === 0 }, [])
|
||||
let radio_button_img;
|
||||
if (output.type === "image" || output.type === "temp") {
|
||||
@ -903,8 +908,9 @@ export class ShareDialog extends ComfyDialog {
|
||||
// Make the radio button checked if it's the selected node,
|
||||
// otherwise make the first radio button checked.
|
||||
if (this.selectedNodeId) {
|
||||
if (this.selectedNodeId === potential_output_node.id) {
|
||||
if (this.selectedNodeId === node_id && !is_radio_button_checked) {
|
||||
radio_button.checked = true;
|
||||
is_radio_button_checked = true;
|
||||
}
|
||||
} else {
|
||||
radio_button.checked = index === 0;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
import { ComfyDialog, $el } from "../../scripts/ui.js";
|
||||
import {app} from "../../scripts/app.js";
|
||||
import {api} from "../../scripts/api.js";
|
||||
import {ComfyDialog, $el} from "../../scripts/ui.js";
|
||||
|
||||
const LOCAL_STORAGE_KEY = "openart_comfy_workflow_key";
|
||||
const DEFAULT_HOMEPAGE_URL = "https://openart.ai/workflows/dev?developer=true";
|
||||
@ -83,7 +83,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
async saveKey(value) {
|
||||
await api.fetchApi(`/manager/set_openart_auth`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({
|
||||
openart_key: value
|
||||
})
|
||||
@ -234,14 +234,19 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
);
|
||||
|
||||
// Account Section
|
||||
const accountSection = $el("div", { style: sectionStyle }, [
|
||||
$el("label", { style: labelStyle }, ["1️⃣ OpenArt API Key"]),
|
||||
const accountSection = $el("div", {style: sectionStyle}, [
|
||||
$el("label", {style: labelStyle}, ["1️⃣ OpenArt API Key"]),
|
||||
this.keyInput,
|
||||
]);
|
||||
|
||||
// Output Upload Section
|
||||
const outputUploadSection = $el("div", { style: sectionStyle }, [
|
||||
$el("label", { style: {...labelStyle, margin: "10px 0 0 0"} }, ["2️⃣ Image/Thumbnail (Required)"]),
|
||||
const outputUploadSection = $el("div", {style: sectionStyle}, [
|
||||
$el("label", {
|
||||
style: {
|
||||
...labelStyle,
|
||||
margin: "10px 0 0 0"
|
||||
}
|
||||
}, ["2️⃣ Image/Thumbnail (Required)"]),
|
||||
this.previewImage,
|
||||
this.uploadImagesInput,
|
||||
]);
|
||||
@ -252,14 +257,17 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
}, []);
|
||||
|
||||
// Additional Inputs Section
|
||||
const additionalInputsSection = $el("div", { style: sectionStyle }, [
|
||||
$el("label", { style: labelStyle }, ["3️⃣ Workflow Information"]),
|
||||
const additionalInputsSection = $el("div", {style: sectionStyle}, [
|
||||
$el("label", {style: labelStyle}, ["3️⃣ Workflow Information"]),
|
||||
this.NameInput,
|
||||
this.descriptionInput,
|
||||
]);
|
||||
|
||||
// OpenArt Contest Section
|
||||
this.joinContestCheckbox = $el("input",{type:'checkbox', id:"join_contest"},[])
|
||||
this.joinContestCheckbox = $el("input", {
|
||||
type: 'checkbox',
|
||||
id: "join_contest"
|
||||
}, [])
|
||||
this.joinContestDescription = $el("a", {
|
||||
style: {
|
||||
...hyperLinkStyle,
|
||||
@ -278,8 +286,8 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
alignItems: 'center',
|
||||
cursor: 'pointer',
|
||||
}
|
||||
},[this.joinContestCheckbox, this.joinContestDescription])
|
||||
const contestSection = $el("div", { style: sectionStyle }, [
|
||||
}, [this.joinContestCheckbox, this.joinContestDescription])
|
||||
const contestSection = $el("div", {style: sectionStyle}, [
|
||||
this.joinContestLabel,
|
||||
]);
|
||||
|
||||
@ -397,7 +405,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
);
|
||||
|
||||
if (res.ok && res.data) {
|
||||
const { image_url, width, height } = res.data;
|
||||
const {image_url, width, height} = res.data;
|
||||
this.uploadedImages.push({
|
||||
url: image_url,
|
||||
width,
|
||||
@ -485,7 +493,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
"/workflows/publish",
|
||||
{
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
headers: {"Content-Type": "application/json"},
|
||||
body: JSON.stringify({
|
||||
workflow_json: workflowJSON,
|
||||
upload_images: this.uploadedImages,
|
||||
@ -501,7 +509,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
);
|
||||
|
||||
if (response.ok) {
|
||||
const { workflow_id } = response.data;
|
||||
const {workflow_id} = response.data;
|
||||
if (workflow_id) {
|
||||
const url = `https://openart.ai/workflows/-/-/${workflow_id}`;
|
||||
this.message.innerHTML = `Workflow has been shared successfully. <a href="${url}" target="_blank">Click here to view it.</a>`;
|
||||
@ -530,13 +538,17 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
return blob;
|
||||
}
|
||||
|
||||
async show({ potential_outputs, potential_output_nodes } = {}) {
|
||||
async show({potential_outputs, potential_output_nodes} = {}) {
|
||||
// Sort `potential_output_nodes` by node ID to make the order always
|
||||
// consistent, but we should also keep `potential_outputs` in the same
|
||||
// order as `potential_output_nodes`.
|
||||
const potential_output_to_order = {};
|
||||
potential_output_nodes.forEach((node, index) => {
|
||||
potential_output_to_order[node.id] = [node, potential_outputs[index]];
|
||||
if (node.id in potential_output_to_order) {
|
||||
potential_output_to_order[node.id][1].push(potential_outputs[index]);
|
||||
} else {
|
||||
potential_output_to_order[node.id] = [node, [potential_outputs[index]]];
|
||||
}
|
||||
})
|
||||
// Sort the object `potential_output_to_order` by key (node ID)
|
||||
const sorted_potential_output_to_order = Object.fromEntries(
|
||||
@ -546,7 +558,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
const sorted_potential_output_nodes = []
|
||||
for (const [key, value] of Object.entries(sorted_potential_output_to_order)) {
|
||||
sorted_potential_output_nodes.push(value[0]);
|
||||
sorted_potential_outputs.push(value[1]);
|
||||
sorted_potential_outputs.push(...value[1]);
|
||||
}
|
||||
potential_output_nodes = sorted_potential_output_nodes;
|
||||
potential_outputs = sorted_potential_outputs;
|
||||
@ -591,20 +603,45 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
}
|
||||
},
|
||||
potential_outputs.map((output, index) => {
|
||||
const radio_button = $el("input", { type: 'radio', name: "selectOutputImages", value: index, required: index === 0 }, [])
|
||||
const {node_id} = output;
|
||||
const radio_button = $el("input", {
|
||||
type: 'radio',
|
||||
name: "selectOutputImages",
|
||||
value: index,
|
||||
required: index === 0
|
||||
}, [])
|
||||
let radio_button_img;
|
||||
let filename;
|
||||
if (output.type === "image" || output.type === "temp") {
|
||||
radio_button_img = $el("img", { src: `/view?filename=${output.image.filename}&subfolder=${output.image.subfolder}&type=${output.image.type}`, style: { width: "100px", height: "100px", objectFit: "cover", borderRadius: "5px" } }, []);
|
||||
radio_button_img = $el("img", {
|
||||
src: `/view?filename=${output.image.filename}&subfolder=${output.image.subfolder}&type=${output.image.type}`,
|
||||
style: {
|
||||
width: "100px",
|
||||
height: "100px",
|
||||
objectFit: "cover",
|
||||
borderRadius: "5px"
|
||||
}
|
||||
}, []);
|
||||
filename = output.image.filename
|
||||
} else if (output.type === "output") {
|
||||
radio_button_img = $el("img", { src: output.output.value, style: { width: "auto", height: "100px", objectFit: "cover", borderRadius: "5px" } }, []);
|
||||
radio_button_img = $el("img", {
|
||||
src: output.output.value,
|
||||
style: {
|
||||
width: "auto",
|
||||
height: "100px",
|
||||
objectFit: "cover",
|
||||
borderRadius: "5px"
|
||||
}
|
||||
}, []);
|
||||
filename = output.filename
|
||||
} else {
|
||||
// unsupported output type
|
||||
// this should never happen
|
||||
// TODO
|
||||
radio_button_img = $el("img", { src: "", style: { width: "auto", height: "100px" } }, []);
|
||||
radio_button_img = $el("img", {
|
||||
src: "",
|
||||
style: {width: "auto", height: "100px"}
|
||||
}, []);
|
||||
}
|
||||
const radio_button_text = $el("span", {
|
||||
style: {
|
||||
@ -633,7 +670,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
||||
left: '3px',
|
||||
borderRadius: '3px',
|
||||
}
|
||||
}, [`Node: ${potential_output_nodes[index].id}`])
|
||||
}, [`Node: ${node_id}`])
|
||||
radio_button.style.color = "var(--fg-color)";
|
||||
radio_button.checked = this.selectedOutputIndex === index;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user