diff --git a/.vs/ComfyUI/FileContentIndex/read.lock b/.vs/ComfyUI/FileContentIndex/read.lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/.vs/ComfyUI/v17/.suo b/.vs/ComfyUI/v17/.suo deleted file mode 100644 index 564078dfd..000000000 Binary files a/.vs/ComfyUI/v17/.suo and /dev/null differ diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json deleted file mode 100644 index f8b488856..000000000 --- a/.vs/ProjectSettings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "CurrentProjectSetting": null -} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json deleted file mode 100644 index 6e79ddaa6..000000000 --- a/.vs/VSWorkspaceState.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ExpandedNodes": [ - "", - "\\web", - "\\web\\extensions", - "\\web\\extensions\\core", - "\\web\\scripts" - ], - "SelectedNode": "\\web\\scripts\\widgets.js", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite deleted file mode 100644 index 3bcc9c10f..000000000 Binary files a/.vs/slnx.sqlite and /dev/null differ diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js index f55abfc45..0b2695f23 100644 --- a/web/extensions/core/widgetInputs.js +++ b/web/extensions/core/widgetInputs.js @@ -5,9 +5,13 @@ const CONVERTED_TYPE = "converted-widget"; const VALID_TYPES = ["STRING", "combo", "number"]; function isConvertableWidget(widget, config) { - return VALID_TYPES.includes(widget.type) || VALID_TYPES.includes(config[0]); + if (widget.name == "seed control after generating") + widget.allowConvertToInput = false; + else + return VALID_TYPES.includes(widget.type) || VALID_TYPES.includes(config[0]); } + function hideWidget(node, widget, suffix = "") { widget.origType = widget.type; widget.origComputeSize = widget.computeSize; diff --git a/web/scripts/app.js b/web/scripts/app.js index a26c3547a..17d699507 100644 --- a/web/scripts/app.js +++ b/web/scripts/app.js @@ -773,8 +773,9 @@ class ComfyApp { } if (widget.name == "seed control after generating") { - if (widget.value == true) + if (widget.value == true) { widget.value = "fixed seed"; + } } } } diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js index dbaa44908..9f1302ed4 100644 --- a/web/scripts/widgets.js +++ b/web/scripts/widgets.js @@ -10,16 +10,17 @@ function getNumberDefaults(inputData, defaultStep) { return { val: defaultVal, config: { min, max, step: 10.0 * step } }; } -export function addSeedControlWidget(node, targetWidget, defauly, options) { +export function addSeedControlWidget(node, targetWidget, defaultValue = "fixed seed", values) { const seedControl = node.addWidget("combo", "seed control after generating", "fixed seed", function (v) { }, { - values: ["fixed seed", "increment", "decrement", "randomize"] },) + values: ["fixed seed", "increment", "decrement", "randomize"] + }) seedControl.afterQueued = () => { var v = seedControl.value; switch (v) { case ("fixed seed"): - console.log("fixed seed"); + console.log("Fixed Seed"); break; case ("increment"): targetWidget.value += 1; @@ -49,7 +50,7 @@ export function addSeedControlWidget(node, targetWidget, defauly, options) { console.log("default (fail)"); } }; - + return seedControl; } @@ -58,7 +59,7 @@ function seedWidget(node, inputName, inputData) { const seedControl = addSeedControlWidget(node, seed.widget, "fixed seed"); seed.widget.linkedWidgets = [seedControl]; - return { widget: seed, seedControl}; + return { widget: seed, seedControl }; } const MultilineSymbol = Symbol();