[Refactor] Add util to merge input spec (#2834)

This commit is contained in:
Chenlei Hu
2025-03-03 15:23:47 -05:00
committed by GitHub
parent f76995a3b9
commit 603825b2a0
6 changed files with 407 additions and 109 deletions

View File

@@ -3,8 +3,8 @@ import type { IComboWidget } from '@comfyorg/litegraph/dist/types/widgets'
import {
type InputSpec,
isComboInputSpec,
isComboInputSpecV2
getComboSpecComboOptions,
isComboInputSpec
} from '@/schemas/nodeDefSchema'
import { addValueControlWidgets } from '@/scripts/widgets'
import type { ComfyWidgetConstructor } from '@/scripts/widgets'
@@ -24,9 +24,7 @@ export const useComboWidget = () => {
const widgetStore = useWidgetStore()
const inputOptions = inputData[1] ?? {}
const comboOptions =
(isComboInputSpecV2(inputData) ? inputOptions.options : inputData[0]) ??
[]
const comboOptions = getComboSpecComboOptions(inputData)
const defaultValue = widgetStore.getDefaultValue(inputData)