mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-30 12:59:55 +00:00
Replace magic numbers with LGraphEventMode (#1809)
This commit is contained in:
@@ -16,6 +16,7 @@ import { useWorkspaceStore } from '@/stores/workspaceStore'
|
||||
import { LGraphGroup } from '@comfyorg/litegraph'
|
||||
import { LiteGraph } from '@comfyorg/litegraph'
|
||||
import { LGraphNode } from '@comfyorg/litegraph'
|
||||
import { LGraphEventMode } from '@comfyorg/litegraph/dist/types/globalEnums'
|
||||
|
||||
export function useCoreCommands(): ComfyCommand[] {
|
||||
const getTracker = () => useWorkflowStore()?.activeWorkflow?.changeTracker
|
||||
@@ -32,10 +33,10 @@ export function useCoreCommands(): ComfyCommand[] {
|
||||
return result
|
||||
}
|
||||
|
||||
const toggleSelectedNodesMode = (mode: number) => {
|
||||
const toggleSelectedNodesMode = (mode: LGraphEventMode) => {
|
||||
getSelectedNodes().forEach((node) => {
|
||||
if (node.mode === mode) {
|
||||
node.mode = 0 // always
|
||||
node.mode = LGraphEventMode.ALWAYS
|
||||
} else {
|
||||
node.mode = mode
|
||||
}
|
||||
@@ -340,7 +341,7 @@ export function useCoreCommands(): ComfyCommand[] {
|
||||
label: 'Mute/Unmute Selected Nodes',
|
||||
versionAdded: '1.3.11',
|
||||
function: () => {
|
||||
toggleSelectedNodesMode(2) // muted
|
||||
toggleSelectedNodesMode(LGraphEventMode.NEVER)
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -349,7 +350,7 @@ export function useCoreCommands(): ComfyCommand[] {
|
||||
label: 'Bypass/Unbypass Selected Nodes',
|
||||
versionAdded: '1.3.11',
|
||||
function: () => {
|
||||
toggleSelectedNodesMode(4) // bypassed
|
||||
toggleSelectedNodesMode(LGraphEventMode.BYPASS)
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -60,6 +60,7 @@ import { type IBaseWidget } from '@comfyorg/litegraph/dist/types/widgets'
|
||||
import { workflowService } from '@/services/workflowService'
|
||||
import { useWidgetStore } from '@/stores/widgetStore'
|
||||
import { deserialiseAndCreate } from '@/extensions/core/vintageClipboard'
|
||||
import { LGraphEventMode } from '@comfyorg/litegraph/dist/types/globalEnums'
|
||||
|
||||
export const ANIM_PREVIEW_WIDGET = '$$comfy_animation_preview'
|
||||
|
||||
@@ -585,8 +586,9 @@ export class ComfyApp {
|
||||
options.push({
|
||||
content: 'Bypass',
|
||||
callback: (obj) => {
|
||||
if (this.mode === 4) this.mode = 0
|
||||
else this.mode = 4
|
||||
if (this.mode === LGraphEventMode.BYPASS)
|
||||
this.mode = LGraphEventMode.ALWAYS
|
||||
else this.mode = LGraphEventMode.BYPASS
|
||||
this.graph.change()
|
||||
}
|
||||
})
|
||||
@@ -1477,15 +1479,12 @@ export class ComfyApp {
|
||||
const old_color = node.color
|
||||
const old_bgcolor = node.bgcolor
|
||||
|
||||
if (node.mode === 2) {
|
||||
// never
|
||||
if (node.mode === LGraphEventMode.NEVER) {
|
||||
this.editor_alpha = 0.4
|
||||
}
|
||||
|
||||
// ComfyUI's custom node mode enum value 4 => bypass/never.
|
||||
let bgColor: string
|
||||
if (node.mode === 4) {
|
||||
// never
|
||||
if (node.mode === LGraphEventMode.BYPASS) {
|
||||
bgColor = app.bypassBgColor
|
||||
this.editor_alpha = 0.2
|
||||
} else {
|
||||
@@ -2304,7 +2303,9 @@ export class ComfyApp {
|
||||
const output = {}
|
||||
// Process nodes in order of execution
|
||||
for (const outerNode of graph.computeExecutionOrder(false)) {
|
||||
const skipNode = outerNode.mode === 2 || outerNode.mode === 4
|
||||
const skipNode =
|
||||
outerNode.mode === LGraphEventMode.NEVER ||
|
||||
outerNode.mode === LGraphEventMode.BYPASS
|
||||
const innerNodes =
|
||||
!skipNode && outerNode.getInnerNodes
|
||||
? outerNode.getInnerNodes()
|
||||
@@ -2314,7 +2315,10 @@ export class ComfyApp {
|
||||
continue
|
||||
}
|
||||
|
||||
if (node.mode === 2 || node.mode === 4) {
|
||||
if (
|
||||
node.mode === LGraphEventMode.NEVER ||
|
||||
node.mode === LGraphEventMode.BYPASS
|
||||
) {
|
||||
// Don't serialize muted nodes
|
||||
continue
|
||||
}
|
||||
@@ -2339,7 +2343,10 @@ export class ComfyApp {
|
||||
let parent = node.getInputNode(i)
|
||||
if (parent) {
|
||||
let link = node.getInputLink(i)
|
||||
while (parent.mode === 4 || parent.isVirtualNode) {
|
||||
while (
|
||||
parent.mode === LGraphEventMode.BYPASS ||
|
||||
parent.isVirtualNode
|
||||
) {
|
||||
let found = false
|
||||
if (parent.isVirtualNode) {
|
||||
link = parent.getInputLink(link.origin_slot)
|
||||
@@ -2349,7 +2356,7 @@ export class ComfyApp {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
} else if (link && parent.mode === 4) {
|
||||
} else if (link && parent.mode === LGraphEventMode.BYPASS) {
|
||||
let all_inputs = [link.origin_slot]
|
||||
if (parent.inputs) {
|
||||
all_inputs = all_inputs.concat(Object.keys(parent.inputs))
|
||||
|
||||
Reference in New Issue
Block a user