Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
ComfyUI
Commits
9a7a52f8
Unverified
Commit
9a7a52f8
authored
Aug 03, 2023
by
Michael Poutre
Browse files
refactor/fix: Treat forceInput widgets as standard widgets
parent
cfe1c54d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
18 deletions
+34
-18
web/extensions/core/widgetInputs.js
web/extensions/core/widgetInputs.js
+20
-3
web/scripts/app.js
web/scripts/app.js
+14
-15
No files found.
web/extensions/core/widgetInputs.js
View file @
9a7a52f8
...
...
@@ -5,7 +5,7 @@ const CONVERTED_TYPE = "converted-widget";
const
VALID_TYPES
=
[
"
STRING
"
,
"
combo
"
,
"
number
"
,
"
BOOLEAN
"
];
function
isConvertableWidget
(
widget
,
config
)
{
return
VALID_TYPES
.
includes
(
widget
.
type
)
||
VALID_TYPES
.
includes
(
config
[
0
]);
return
(
VALID_TYPES
.
includes
(
widget
.
type
)
||
VALID_TYPES
.
includes
(
config
[
0
])
)
&&
!
widget
.
options
?.
forceInput
;
}
function
hideWidget
(
node
,
widget
,
suffix
=
""
)
{
...
...
@@ -103,6 +103,9 @@ app.registerExtension({
let
toInput
=
[];
let
toWidget
=
[];
for
(
const
w
of
this
.
widgets
)
{
if
(
w
.
options
?.
forceInput
)
{
continue
;
}
if
(
w
.
type
===
CONVERTED_TYPE
)
{
toWidget
.
push
({
content
:
`Convert
${
w
.
name
}
to widget`
,
...
...
@@ -130,6 +133,20 @@ app.registerExtension({
return
r
;
};
const
origOnNodeCreated
=
nodeType
.
prototype
.
onNodeCreated
nodeType
.
prototype
.
onNodeCreated
=
function
()
{
const
r
=
origOnNodeCreated
?
origOnNodeCreated
.
apply
(
this
)
:
undefined
;
if
(
this
.
widgets
)
{
for
(
const
w
of
this
.
widgets
)
{
if
(
w
?.
options
?.
forceInput
)
{
const
config
=
nodeData
?.
input
?.
required
[
w
.
name
]
||
nodeData
?.
input
?.
optional
?.[
w
.
name
]
||
[
w
.
type
,
w
.
options
||
{}];
convertToInput
(
this
,
w
,
config
);
}
}
}
return
r
;
}
// On initial configure of nodes hide all converted widgets
const
origOnConfigure
=
nodeType
.
prototype
.
onConfigure
;
nodeType
.
prototype
.
onConfigure
=
function
()
{
...
...
@@ -137,7 +154,7 @@ app.registerExtension({
if
(
this
.
inputs
)
{
for
(
const
input
of
this
.
inputs
)
{
if
(
input
.
widget
)
{
if
(
input
.
widget
&&
!
input
.
widget
.
config
[
1
]?.
forceInput
)
{
const
w
=
this
.
widgets
.
find
((
w
)
=>
w
.
name
===
input
.
widget
.
name
);
if
(
w
)
{
hideWidget
(
this
,
w
);
...
...
@@ -374,7 +391,7 @@ app.registerExtension({
}
for
(
const
k
in
config1
[
1
])
{
if
(
k
!==
"
default
"
)
{
if
(
k
!==
"
default
"
&&
k
!==
'
forceInput
'
)
{
if
(
config1
[
1
][
k
]
!==
config2
[
1
][
k
])
{
return
false
;
}
...
...
web/scripts/app.js
View file @
9a7a52f8
...
...
@@ -1151,9 +1151,6 @@ export class ComfyApp {
const
inputData
=
inputs
[
inputName
];
const
type
=
inputData
[
0
];
if
(
inputData
[
1
]?.
forceInput
)
{
this
.
addInput
(
inputName
,
type
);
}
else
{
if
(
Array
.
isArray
(
type
))
{
// Enums
Object
.
assign
(
config
,
widgets
.
COMBO
(
this
,
inputName
,
inputData
,
app
)
||
{});
...
...
@@ -1167,6 +1164,8 @@ export class ComfyApp {
// Node connection inputs
this
.
addInput
(
inputName
,
type
);
}
if
(
inputData
[
1
]?.
forceInput
&&
config
?.
widget
)
{
config
.
widget
.
options
.
forceInput
=
inputData
[
1
].
forceInput
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment