1
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-08-03 23:49:57 +08:00

Masked editor changes.

Add a way to upload to subfolders.

Clean up code.

Fix some issues.
This commit is contained in:
comfyanonymous
2023-05-08 14:13:06 -04:00
parent ae08fdb999
commit 850daf0416
6 changed files with 93 additions and 125 deletions

View File

@@ -256,20 +256,6 @@ export const ComfyWidgets = {
}
return { widget: node.addWidget("combo", inputName, defaultValue, () => {}, { values: type }) };
},
FILE_COMBO(node, inputName, inputData) {
const base_dir = inputData[1].base_dir;
let defaultValue = inputData[1].files[0];
const files = []
for(let i in inputData[1].files) {
files[i] = inputData[1].files[i];
const postfix = ' [clipspace]';
if(base_dir == 'input' && files[i].endsWith(postfix))
files[i] = "clipspace/" + files[i].slice(0, files[i].indexOf(postfix));
}
return { widget: node.addWidget("combo", inputName, defaultValue, () => {}, { base_dir:base_dir, values: files }) };
},
IMAGEUPLOAD(node, inputName, inputData, app) {
const imageWidget = node.widgets.find((w) => w.name === "image");
let uploadWidget;
@@ -280,10 +266,46 @@ export const ComfyWidgets = {
node.imgs = [img];
app.graph.setDirtyCanvas(true);
};
img.src = `/view?filename=${name}&type=input`;
let folder_separator = name.lastIndexOf("/");
let subfolder = "";
if (folder_separator > -1) {
subfolder = name.substring(0, folder_separator);
name = name.substring(folder_separator + 1);
}
img.src = `/view?filename=${name}&type=input&subfolder=${subfolder}`;
node.setSizeForImage?.();
}
var default_value = imageWidget.value;
Object.defineProperty(imageWidget, "value", {
set : function(value) {
this._real_value = value;
},
get : function() {
let value = "";
if (this._real_value) {
value = this._real_value;
} else {
return default_value;
}
if (value.filename) {
let real_value = value;
value = "";
if (real_value.subfolder) {
value = real_value.subfolder + "/";
}
value += real_value.filename;
if(real_value.type && real_value.type !== "input")
value += ` [${real_value.type}]`;
}
return value;
}
});
// Add our own callback to the combo widget to render an image when it changes
const cb = node.callback;
imageWidget.callback = function () {