neuro_llc/ComfyBox
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix properties

Browse Source
This commit is contained in:
space-nuko
2023-05-06 11:24:19 -05:00
parent ef4723b572
commit 27a6f9e2ab
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/components/ComfyComboProperty.svelte
View File

@@ -5,6 +5,7 @@
export let value: string = ""; export let value: string = "";
export let values: string[] = [""]; export let values: string[] = [""];
export let name: string = ""; export let name: string = "";
export let disabled: boolean = false;
let value_: string = "" let value_: string = ""
$: value; $: value;
@@ -27,7 +28,7 @@
<label class="select-wrapper"> <label class="select-wrapper">
<BlockTitle>{name}</BlockTitle> <BlockTitle>{name}</BlockTitle>
<div class="select"> <div class="select">
<select on:blur bind:value> <select on:blur bind:value {disabled}>
{#each values as value} {#each values as value}
<option {value}> <option {value}>
{value} {value}
@@ -53,4 +54,8 @@
.select-title { .select-title {
padding: 0.2rem; padding: 0.2rem;
} }
input:disabled {
cursor: not-allowed;
}
</style> </style>

6
src/lib/components/ComfyNumberProperty.svelte
View File

@@ -5,6 +5,7 @@
export let value: number = 0; export let value: number = 0;
export let step: number = 1; export let step: number = 1;
export let name: string = ""; export let name: string = "";
export let disabled: boolean = false;
let value_: number = 0; let value_: number = 0;
$: value; $: value;
@@ -26,7 +27,7 @@
<label class="number-wrapper"> <label class="number-wrapper">
<BlockTitle>{name}</BlockTitle> <BlockTitle>{name}</BlockTitle>
<div class="number"> <div class="number">
<input type="number" bind:value {step}> <input type="number" bind:value {step} {disabled}>
</div> </div>
</label> </label>
@@ -42,4 +43,7 @@
} }
} }
} }
input[disabled] {
cursor: not-allowed;
}
</style> </style>

16
src/lib/components/ComfyProperties.svelte
View File

@@ -158,6 +158,7 @@
value={target.attrs[spec.name] || spec.defaultValue} value={target.attrs[spec.name] || spec.defaultValue}
on:change={(e) => updateAttribute(spec, target, e.detail)} on:change={(e) => updateAttribute(spec, target, e.detail)}
on:input={(e) => updateAttribute(spec, target, e.detail)} on:input={(e) => updateAttribute(spec, target, e.detail)}
disabled={!$uiState.uiUnlocked || !spec.editable}
label={spec.name} label={spec.name}
max_lines={1} max_lines={1}
/> />
@@ -165,6 +166,7 @@
<Checkbox <Checkbox
value={target.attrs[spec.name] || spec.defaultValue} value={target.attrs[spec.name] || spec.defaultValue}
on:change={(e) => updateAttribute(spec, target, e.detail)} on:change={(e) => updateAttribute(spec, target, e.detail)}
disabled={!$uiState.uiUnlocked || !spec.editable}
label={spec.name} label={spec.name}
/> />
{:else if spec.type === "number"} {:else if spec.type === "number"}
@@ -172,6 +174,7 @@
name={spec.name} name={spec.name}
value={target.attrs[spec.name] || spec.defaultValue} value={target.attrs[spec.name] || spec.defaultValue}
step={1} step={1}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateAttribute(spec, target, e.detail)} on:change={(e) => updateAttribute(spec, target, e.detail)}
/> />
{:else if spec.type === "enum"} {:else if spec.type === "enum"}
@@ -179,6 +182,7 @@
name={spec.name} name={spec.name}
value={target.attrs[spec.name] || spec.defaultValue} value={target.attrs[spec.name] || spec.defaultValue}
values={spec.values} values={spec.values}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateAttribute(spec, target, e.detail)} on:change={(e) => updateAttribute(spec, target, e.detail)}
/> />
{/if} {/if}
@@ -192,12 +196,14 @@
on:change={(e) => updateProperty(spec, e.detail)} on:change={(e) => updateProperty(spec, e.detail)}
on:input={(e) => updateProperty(spec, e.detail)} on:input={(e) => updateProperty(spec, e.detail)}
label={spec.name} label={spec.name}
disabled={!$uiState.uiUnlocked || !spec.editable}
max_lines={1} max_lines={1}
/> />
{:else if spec.type === "boolean"} {:else if spec.type === "boolean"}
<Checkbox <Checkbox
value={node.properties[spec.name] || spec.defaultValue} value={node.properties[spec.name] || spec.defaultValue}
label={spec.name} label={spec.name}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateProperty(spec, e.detail)} on:change={(e) => updateProperty(spec, e.detail)}
/> />
{:else if spec.type === "number"} {:else if spec.type === "number"}
@@ -205,6 +211,7 @@
name={spec.name} name={spec.name}
value={node.properties[spec.name] || spec.defaultValue} value={node.properties[spec.name] || spec.defaultValue}
step={1} step={1}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateProperty(spec, e.detail)} on:change={(e) => updateProperty(spec, e.detail)}
/> />
{:else if spec.type === "enum"} {:else if spec.type === "enum"}
@@ -212,6 +219,7 @@
name={spec.name} name={spec.name}
value={node.properties[spec.name] || spec.defaultValue} value={node.properties[spec.name] || spec.defaultValue}
values={spec.values} values={spec.values}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateProperty(spec, e.detail)} on:change={(e) => updateProperty(spec, e.detail)}
/> />
{/if} {/if}
@@ -224,12 +232,14 @@
on:change={(e) => updateVar(spec, e.detail)} on:change={(e) => updateVar(spec, e.detail)}
on:input={(e) => updateVar(spec, e.detail)} on:input={(e) => updateVar(spec, e.detail)}
label={spec.name} label={spec.name}
disabled={!$uiState.uiUnlocked || !spec.editable}
max_lines={1} max_lines={1}
/> />
{:else if spec.type === "boolean"} {:else if spec.type === "boolean"}
<Checkbox <Checkbox
value={getVar(node, spec)} value={getVar(node, spec)}
on:change={(e) => updateVar(spec, e.detail)} on:change={(e) => updateVar(spec, e.detail)}
disabled={!$uiState.uiUnlocked || !spec.editable}
label={spec.name} label={spec.name}
/> />
{:else if spec.type === "number"} {:else if spec.type === "number"}
@@ -237,6 +247,7 @@
name={spec.name} name={spec.name}
value={getVar(node, spec)} value={getVar(node, spec)}
step={1} step={1}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateVar(spec, e.detail)} on:change={(e) => updateVar(spec, e.detail)}
/> />
{:else if spec.type === "enum"} {:else if spec.type === "enum"}
@@ -244,6 +255,7 @@
name={spec.name} name={spec.name}
value={getVar(node, spec)} value={getVar(node, spec)}
values={spec.values} values={spec.values}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateVar(spec, e.detail)} on:change={(e) => updateVar(spec, e.detail)}
/> />
{/if} {/if}
@@ -257,12 +269,14 @@
on:change={(e) => updateWorkflowAttribute(spec, e.detail)} on:change={(e) => updateWorkflowAttribute(spec, e.detail)}
on:input={(e) => updateWorkflowAttribute(spec, e.detail)} on:input={(e) => updateWorkflowAttribute(spec, e.detail)}
label={spec.name} label={spec.name}
disabled={!$uiState.uiUnlocked || !spec.editable}
max_lines={1} max_lines={1}
/> />
{:else if spec.type === "boolean"} {:else if spec.type === "boolean"}
<Checkbox <Checkbox
value={$layoutState.attrs[spec.name] || spec.defaultValue} value={$layoutState.attrs[spec.name] || spec.defaultValue}
on:change={(e) => updateWorkflowAttribute(spec, e.detail)} on:change={(e) => updateWorkflowAttribute(spec, e.detail)}
disabled={!$uiState.uiUnlocked || !spec.editable}
label={spec.name} label={spec.name}
/> />
{:else if spec.type === "number"} {:else if spec.type === "number"}
@@ -270,6 +284,7 @@
name={spec.name} name={spec.name}
value={$layoutState.attrs[spec.name] || spec.defaultValue} value={$layoutState.attrs[spec.name] || spec.defaultValue}
step={1} step={1}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateWorkflowAttribute(spec, e.detail)} on:change={(e) => updateWorkflowAttribute(spec, e.detail)}
/> />
{:else if spec.type === "enum"} {:else if spec.type === "enum"}
@@ -277,6 +292,7 @@
name={spec.name} name={spec.name}
value={$layoutState.attrs[spec.name] || spec.defaultValue} value={$layoutState.attrs[spec.name] || spec.defaultValue}
values={spec.values} values={spec.values}
disabled={!$uiState.uiUnlocked || !spec.editable}
on:change={(e) => updateWorkflowAttribute(spec, e.detail)} on:change={(e) => updateWorkflowAttribute(spec, e.detail)}
/> />
{/if} {/if}

2
src/lib/components/ComfyUIPane.svelte
View File

@@ -50,7 +50,7 @@
function ungroup() { function ungroup() {
const item = layoutState.getCurrentSelection()[0] const item = layoutState.getCurrentSelection()[0]
if (item.type !== "container") if (!item || item.type !== "container")
return; return;
$layoutState.currentSelection = [] $layoutState.currentSelection = []