mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-05-16 10:07:36 -03:00
fix(ui): default_active in group mode should not propagate to children; hide group badge/edit for single-child groups (#929)
This commit is contained in:
@@ -658,32 +658,34 @@ export function addTagsWidget(node, name, opts, callback, wheelSensitivity = 0.0
|
|||||||
textEl.style.maxWidth = "140px";
|
textEl.style.maxWidth = "140px";
|
||||||
}
|
}
|
||||||
|
|
||||||
const countBadge = document.createElement("span");
|
if (tagData.items.length > 1) {
|
||||||
countBadge.className = "lm-trigger-count-badge";
|
const countBadge = document.createElement("span");
|
||||||
countBadge.textContent = `${groupState.activeChildren}/${groupState.totalChildren}`;
|
countBadge.className = "lm-trigger-count-badge";
|
||||||
Object.assign(countBadge.style, {
|
countBadge.textContent = `${groupState.activeChildren}/${groupState.totalChildren}`;
|
||||||
fontSize: "11px",
|
|
||||||
padding: "1px 6px",
|
|
||||||
borderRadius: "999px",
|
|
||||||
backgroundColor: "rgba(255,255,255,0.12)",
|
|
||||||
color: "inherit",
|
|
||||||
flexShrink: "0",
|
|
||||||
boxSizing: "border-box",
|
|
||||||
minWidth: "42px",
|
|
||||||
display: "inline-flex",
|
|
||||||
alignItems: "center",
|
|
||||||
justifyContent: "center",
|
|
||||||
lineHeight: "1",
|
|
||||||
fontVariantNumeric: "tabular-nums",
|
|
||||||
});
|
|
||||||
if (groupState.hasInactiveChildren) {
|
|
||||||
countBadge.classList.add("lm-trigger-count-badge--edited");
|
|
||||||
Object.assign(countBadge.style, {
|
Object.assign(countBadge.style, {
|
||||||
backgroundColor: "rgba(255,255,255,0.08)",
|
fontSize: "11px",
|
||||||
boxShadow: "inset 0 0 0 1px rgba(255,255,255,0.28)",
|
padding: "1px 6px",
|
||||||
|
borderRadius: "999px",
|
||||||
|
backgroundColor: "rgba(255,255,255,0.12)",
|
||||||
|
color: "inherit",
|
||||||
|
flexShrink: "0",
|
||||||
|
boxSizing: "border-box",
|
||||||
|
minWidth: "42px",
|
||||||
|
display: "inline-flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
lineHeight: "1",
|
||||||
|
fontVariantNumeric: "tabular-nums",
|
||||||
});
|
});
|
||||||
|
if (groupState.hasInactiveChildren) {
|
||||||
|
countBadge.classList.add("lm-trigger-count-badge--edited");
|
||||||
|
Object.assign(countBadge.style, {
|
||||||
|
backgroundColor: "rgba(255,255,255,0.08)",
|
||||||
|
boxShadow: "inset 0 0 0 1px rgba(255,255,255,0.28)",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
groupChip.appendChild(countBadge);
|
||||||
}
|
}
|
||||||
groupChip.appendChild(countBadge);
|
|
||||||
|
|
||||||
if (showStrengthInfo) {
|
if (showStrengthInfo) {
|
||||||
const strengthBadge = createStrengthBadge();
|
const strengthBadge = createStrengthBadge();
|
||||||
@@ -697,39 +699,43 @@ export function addTagsWidget(node, name, opts, callback, wheelSensitivity = 0.0
|
|||||||
groupChip.title = activePreview ? `${tagData.text}\nActive: ${activePreview}` : tagData.text;
|
groupChip.title = activePreview ? `${tagData.text}\nActive: ${activePreview}` : tagData.text;
|
||||||
}
|
}
|
||||||
|
|
||||||
const editButton = document.createElement("button");
|
let editButton = null;
|
||||||
editButton.type = "button";
|
|
||||||
editButton.className = "lm-trigger-group-edit-button";
|
|
||||||
editButton.textContent = "⋯";
|
|
||||||
Object.assign(editButton.style, {
|
|
||||||
border: "none",
|
|
||||||
background: "transparent",
|
|
||||||
color: "inherit",
|
|
||||||
cursor: "pointer",
|
|
||||||
fontSize: "14px",
|
|
||||||
lineHeight: "1",
|
|
||||||
padding: "0 2px",
|
|
||||||
marginLeft: "2px",
|
|
||||||
opacity: groupState.hasInactiveChildren ? "0.9" : "0.72",
|
|
||||||
flexShrink: "0",
|
|
||||||
});
|
|
||||||
editButton.title = "Edit group tags";
|
|
||||||
|
|
||||||
const openEditor = (event) => {
|
if (tagData.items.length > 1) {
|
||||||
event.preventDefault();
|
editButton = document.createElement("button");
|
||||||
event.stopPropagation();
|
editButton.type = "button";
|
||||||
toggleGroupEditor(widget, index, groupChip);
|
editButton.className = "lm-trigger-group-edit-button";
|
||||||
renderGroupEditor(widget, tagData, index);
|
editButton.textContent = "⋯";
|
||||||
};
|
Object.assign(editButton.style, {
|
||||||
|
border: "none",
|
||||||
|
background: "transparent",
|
||||||
|
color: "inherit",
|
||||||
|
cursor: "pointer",
|
||||||
|
fontSize: "14px",
|
||||||
|
lineHeight: "1",
|
||||||
|
padding: "0 2px",
|
||||||
|
marginLeft: "2px",
|
||||||
|
opacity: groupState.hasInactiveChildren ? "0.9" : "0.72",
|
||||||
|
flexShrink: "0",
|
||||||
|
});
|
||||||
|
editButton.title = "Edit group tags";
|
||||||
|
|
||||||
editButton.addEventListener("click", openEditor);
|
const openEditor = (event) => {
|
||||||
groupChip.addEventListener("contextmenu", openEditor);
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
toggleGroupEditor(widget, index, groupChip);
|
||||||
|
renderGroupEditor(widget, tagData, index);
|
||||||
|
};
|
||||||
|
|
||||||
groupChip.appendChild(editButton);
|
editButton.addEventListener("click", openEditor);
|
||||||
|
groupChip.addEventListener("contextmenu", openEditor);
|
||||||
|
|
||||||
|
groupChip.appendChild(editButton);
|
||||||
|
}
|
||||||
|
|
||||||
groupChip.addEventListener("click", (e) => {
|
groupChip.addEventListener("click", (e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
if (e.target === editButton) {
|
if (editButton && e.target === editButton) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
updateWidgetValue(widget, (updatedTags) => {
|
updateWidgetValue(widget, (updatedTags) => {
|
||||||
@@ -740,7 +746,7 @@ export function addTagsWidget(node, name, opts, callback, wheelSensitivity = 0.0
|
|||||||
|
|
||||||
if (showStrengthInfo) {
|
if (showStrengthInfo) {
|
||||||
groupChip.addEventListener("wheel", (e) => {
|
groupChip.addEventListener("wheel", (e) => {
|
||||||
if (e.target === editButton) {
|
if (editButton && e.target === editButton) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|||||||
@@ -303,6 +303,8 @@ app.registerExtension({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const groupMode = groupModeWidget?.value ?? false;
|
||||||
|
|
||||||
const updatedTags = node.tagWidget.value.map((tag) => {
|
const updatedTags = node.tagWidget.value.map((tag) => {
|
||||||
if (!Array.isArray(tag.items)) {
|
if (!Array.isArray(tag.items)) {
|
||||||
return {
|
return {
|
||||||
@@ -311,6 +313,15 @@ app.registerExtension({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// In group mode, default_active only controls the group-level switch.
|
||||||
|
// Children's individual active states are managed exclusively via the group editor.
|
||||||
|
if (groupMode) {
|
||||||
|
return {
|
||||||
|
...tag,
|
||||||
|
active: value,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...tag,
|
...tag,
|
||||||
active: value,
|
active: value,
|
||||||
@@ -320,7 +331,6 @@ app.registerExtension({
|
|||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
node.tagWidget.value = updatedTags;
|
node.tagWidget.value = updatedTags;
|
||||||
node.applyTriggerHighlightState?.();
|
node.applyTriggerHighlightState?.();
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user