TBNilles/ComfyUI-Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/cnr

Browse Source 
improved: support new front's prompt, alert api
modified: z-indices
This commit is contained in:
Dr.Lt.Data
2025-01-02 02:58:55 +09:00
parent 890ba0f818 a148bb5aeb
commit 3c11361502
24 changed files with 4893 additions and 3302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/components-manager.js
View File

@@ -1,6 +1,6 @@
import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js"
import { sleep, show_message } from "./common.js";
import { sleep, show_message, customConfirm, customAlert } from "./common.js";
import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
import { ComfyDialog, $el } from "../../scripts/ui.js";
@@ -365,7 +365,7 @@ function checkVersion(name, component) {
return msg;
}
function handle_import_components(components) {
async function handle_import_components(components) {
let msg = 'Components:\n';
let cnt = 0;
for(let name in components) {
@@ -387,8 +387,9 @@ function handle_import_components(components) {
let last_name = null;
msg += '\nWill you load components?\n';
if(confirm(msg)) {
let mode = confirm('\nWill you save components?\n(cancel=load without save)');
const confirmed = await customConfirm(msg);
if(confirmed) {
const mode = await customConfirm('\nWill you save components?\n(cancel=load without save)');
for(let name in components) {
let component = components[name];
@@ -411,7 +412,7 @@ function handle_import_components(components) {
}
}
function handlePaste(e) {
async function handlePaste(e) {
let data = (e.clipboardData || window.clipboardData);
const items = data.items;
for(const item of items) {
@@ -421,7 +422,7 @@ function handlePaste(e) {
let json_data = JSON.parse(data);
if(json_data.kind == 'ComfyUI Components' && last_paste_timestamp != json_data.timestamp) {
last_paste_timestamp = json_data.timestamp;
handle_import_components(json_data.components);
await handle_import_components(json_data.components);
// disable paste node
localStorage.removeItem("litegrapheditor_clipboard", null);
@@ -455,7 +456,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
this.invalidateControl();
this.element.style.display = "block";
this.element.style.zIndex = 10001;
this.element.style.zIndex = 1099;
this.element.style.width = "500px";
this.element.style.height = "480px";
}
@@ -621,7 +622,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
self.version_string.value = self.default_ver;
}
else {
alert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
customAlert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
}
};
@@ -677,7 +678,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
let orig_handleFile = app.handleFile;
function handleFile(file) {
async function handleFile(file) {
if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
const reader = new FileReader();
reader.onload = async () => {
@@ -690,7 +691,7 @@ function handleFile(file) {
}
if(is_component) {
handle_import_components(jsonContent);
await handle_import_components(jsonContent);
}
else {
orig_handleFile.call(app, file);