Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-02-03 22:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy paste of widget value (#284)

Browse Source 
* Fix copy paste of widget value

* Fix ui tests

* Allow undefined group font size

* Update test expectations [skip ci]

* nit

---------

Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
Chenlei Hu
2024-08-03 14:22:43 -04:00
committed by GitHub
parent f0f867481d
commit 0cf5e647af
8 changed files with 93 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/scripts/app.ts
View File

@@ -17,7 +17,7 @@ import { applyTextReplacements, addStylesheet } from './utils'
import type { ComfyExtension } from '@/types/comfy'
import {
type ComfyWorkflowJSON,
parseComfyWorkflow
validateComfyWorkflow
} from '../types/comfyWorkflow'
import { ComfyNodeDef } from '@/types/apiTypes'
import { lightenColor } from '@/utils/colorUtil'
@@ -1114,12 +1114,12 @@ export class ComfyApp {
let workflow: ComfyWorkflowJSON
try {
data = data.slice(data.indexOf('{'))
workflow = await parseComfyWorkflow(data)
workflow = JSON.parse(data)
} catch (err) {
try {
data = data.slice(data.indexOf('workflow\n'))
data = data.slice(data.indexOf('{'))
workflow = await parseComfyWorkflow(data)
workflow = JSON.parse(data)
} catch (error) {
console.error(error)
}
@@ -1906,7 +1906,7 @@ export class ComfyApp {
try {
const loadWorkflow = async (json) => {
if (json) {
const workflow = await parseComfyWorkflow(json)
const workflow = JSON.parse(json)
const workflowName = getStorageValue('Comfy.PreviousWorkflow')
await this.loadGraphData(workflow, true, true, workflowName)
return true
@@ -2236,6 +2236,9 @@ export class ComfyApp {
console.error(error)
}
graphData = await validateComfyWorkflow(graphData, /* onError=*/ alert)
if (!graphData) return
const missingNodeTypes = []
await this.#invokeExtensionsAsync(
'beforeConfigureGraph',
@@ -2662,7 +2665,7 @@ export class ComfyApp {
const pngInfo = await getPngMetadata(file)
if (pngInfo?.workflow) {
await this.loadGraphData(
await parseComfyWorkflow(pngInfo.workflow),
JSON.parse(pngInfo.workflow),
true,
true,
fileName
@@ -2683,12 +2686,7 @@ export class ComfyApp {
const prompt = pngInfo?.prompt || pngInfo?.Prompt
if (workflow) {
this.loadGraphData(
await parseComfyWorkflow(workflow),
true,
true,
fileName
)
this.loadGraphData(JSON.parse(workflow), true, true, fileName)
} else if (prompt) {
this.loadApiJson(JSON.parse(prompt), fileName)
} else {
@@ -2700,12 +2698,7 @@ export class ComfyApp {
const prompt = pngInfo?.prompt || pngInfo?.Prompt
if (workflow) {
this.loadGraphData(
await parseComfyWorkflow(workflow),
true,
true,
fileName
)
this.loadGraphData(JSON.parse(workflow), true, true, fileName)
} else if (prompt) {
this.loadApiJson(JSON.parse(prompt), fileName)
} else {
@@ -2724,11 +2717,7 @@ export class ComfyApp {
} else if (this.isApiJson(jsonContent)) {
this.loadApiJson(jsonContent, fileName)
} else {
await this.loadGraphData(
await parseComfyWorkflow(readerResult),
true,
fileName
)
await this.loadGraphData(JSON.parse(readerResult), true, fileName)
}
}
reader.readAsText(file)
@@ -2742,7 +2731,7 @@ export class ComfyApp {
if (info.workflow) {
await this.loadGraphData(
// @ts-ignore
await parseComfyWorkflow(info.workflow),
JSON.parse(info.workflow),
true,
true,
fileName