UI adjustments if template is built-in

This commit is contained in:
space-nuko
2023-05-25 20:59:25 -05:00
parent 5d45bb96b9
commit 00d7bbf42c
9 changed files with 72 additions and 20 deletions

View File

@@ -307,6 +307,8 @@ export default class ComfyApp {
if (errors && errors.length > 0)
error = "Error(s) loading builtin templates:\n" + errors.join("\n");
console.log(`Loaded {templates.length} builtin templates.`);
return [templates, error]
})
@@ -651,10 +653,12 @@ export default class ComfyApp {
// Queue prompt using ctrl or command + enter
if ((e.ctrlKey || e.metaKey) && (e.key === "Enter" || e.code === "Enter" || e.keyCode === 10)) {
e.preventDefault();
e.stopImmediatePropagation();
this.runDefaultQueueAction();
}
else if ((e.ctrlKey) && (e.key === "s" || e.code === "KeyS")) {
e.preventDefault();
e.stopImmediatePropagation();
this.saveStateToLocalStorage();
}
});

View File

@@ -146,7 +146,8 @@
{
name: "Save",
variant: "primary",
onClick: saveTemplate
onClick: saveTemplate,
hidden: layout.template.isBuiltIn
},
{
name: "Download",
@@ -158,7 +159,7 @@
name: "Delete",
variant: "secondary",
onClick: deleteTemplate,
disabled: layout.template.isBuiltIn
hidden: layout.template.isBuiltIn
},
{
name: "Close",
@@ -250,6 +251,7 @@
}
.template-entry {
min-width: 12rem;
padding: 1.0rem;
display: flex;
flex-direction: column;

View File

@@ -13,7 +13,7 @@
}
function onButtonClicked(modal: ModalData, button: ModalButton, closeDialog: Function) {
if (button.disabled)
if (button.disabled || button.hidden)
return;
if (button.onClick(modal) === false)
@@ -42,9 +42,11 @@
<div slot="buttons" class="buttons" let:closeDialog>
{#if modal != null && modal.buttons?.length > 0}
{#each modal.buttons as button}
<Button variant={button.variant} disabled={button.disabled} on:click={() => onButtonClicked(modal, button, closeDialog)}>
{button.name}
</Button>
{#if !button.hidden}
<Button variant={button.variant} disabled={button.disabled} on:click={() => onButtonClicked(modal, button, closeDialog)}>
{button.name}
</Button>
{/if}
{/each}
{/if}
{#if modal.showCloseButton}

View File

@@ -27,6 +27,10 @@
let showAllJSON: number = 0;
let createdAt = "";
let isEditable = true;
$: isEditable = editable && templateAndSvg && !templateAndSvg.isBuiltIn;
$: {
rawTemplate = { ...templateAndSvg };
rawTemplate.svg = undefined;
@@ -100,9 +104,9 @@
<Block>
<BlockTitle>Metadata</BlockTitle>
<div>
<Textbox label="Name" disabled={!editable} bind:value={$state.name} lines={1} max_lines={1} />
<Textbox label="Author" disabled={!editable} bind:value={$state.author} lines={1} max_lines={1} />
<Textbox label="Description" disabled={!editable} bind:value={$state.description} lines={5} max_lines={5} />
<Textbox label="Name" disabled={!isEditable} bind:value={$state.name} lines={1} max_lines={1} />
<Textbox label="Author" disabled={!isEditable} bind:value={$state.author} lines={1} max_lines={1} />
<Textbox label="Description" disabled={!isEditable} bind:value={$state.description} lines={5} max_lines={5} />
<Row>
<Textbox label="Created At" disabled={true} bind:value={createdAt} lines={1} max_lines={1} />
<Textbox label="Size" disabled={true} value="{(templateAndSvg.svg.length/1024).toFixed(2)} KB" lines={1} max_lines={1} />