diff --git a/src/stores/imagePreviewStore.ts b/src/stores/imagePreviewStore.ts index ee8ae759b..346011d45 100644 --- a/src/stores/imagePreviewStore.ts +++ b/src/stores/imagePreviewStore.ts @@ -40,7 +40,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { const { nodeIdToNodeLocatorId, nodeToNodeLocatorId } = useWorkflowStore() const { executionIdToNodeLocatorId } = useExecutionStore() const scheduledRevoke: Record void }> = {} - const latestOutput = ref([]) + const latestPreview = ref([]) function scheduleRevoke(locator: NodeLocatorId, cb: () => void) { scheduledRevoke[locator]?.stop() @@ -147,13 +147,6 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { } } - //TODO:Preview params and deduplication - latestOutput.value = - (outputs as ExecutedWsMessage['output'])?.images?.map((image) => { - const imgUrlPart = new URLSearchParams(image) - const rand = app.getRandParam() - return api.apiURL(`/view?${imgUrlPart}${rand}`) - }) ?? [] app.nodeOutputs[nodeLocatorId] = outputs nodeOutputs.value[nodeLocatorId] = outputs } @@ -221,7 +214,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { scheduledRevoke[nodeLocatorId].stop() delete scheduledRevoke[nodeLocatorId] } - latestOutput.value = previewImages + latestPreview.value = previewImages app.nodePreviewImages[nodeLocatorId] = previewImages nodePreviewImages.value[nodeLocatorId] = previewImages } @@ -391,6 +384,6 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { // State nodeOutputs, nodePreviewImages, - latestOutput + latestPreview } }) diff --git a/src/views/LinearView.vue b/src/views/LinearView.vue index 4a5ab8dc8..1372bde7d 100644 --- a/src/views/LinearView.vue +++ b/src/views/LinearView.vue @@ -33,15 +33,16 @@ import WidgetInputNumberInput from '@/renderer/extensions/vueNodes/widgets/compo import { app } from '@/scripts/app' import { useCommandStore } from '@/stores/commandStore' import { useExecutionStore } from '@/stores/executionStore' +import { useNodeOutputStore } from '@/stores/imagePreviewStore' import { useQueueSettingsStore } from '@/stores/queueStore' import { cn } from '@/utils/tailwindUtil' -const outputs = useMediaAssets('output') - const commandStore = useCommandStore() const executionStore = useExecutionStore() -const workflowStore = useWorkflowStore() +const outputs = useMediaAssets('output') +const nodeOutputStore = useNodeOutputStore() const { isActiveSubscription } = useSubscription() +const workflowStore = useWorkflowStore() const graphNodes = shallowRef(app.rootGraph.nodes) useEventListener( @@ -388,7 +389,16 @@ function handleCenterWheel(e: WheelEvent) { v-slot="slotProps" class="flex-1 w-full" > - + +