mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-24 00:34:09 +00:00
## Summary Merges latest changes from `main` as of 10-06-2025. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5965-Merge-main-as-of-10-06-2025-into-rh-test-2856d73d3650812cb95fd8917278a770) by [Unito](https://www.unito.io) --------- Signed-off-by: Marcel Petrick <mail@marcelpetrick.it> Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com> Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Alexander Brown <drjkl@comfy.org> Co-authored-by: Benjamin Lu <benceruleanlu@proton.me> Co-authored-by: Terry Jia <terryjia88@gmail.com> Co-authored-by: snomiao <snomiao@gmail.com> Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com> Co-authored-by: Jake Schroeder <jake.schroeder@isophex.com> Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com> Co-authored-by: AustinMroz <4284322+AustinMroz@users.noreply.github.com> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com> Co-authored-by: Marcel Petrick <mail@marcelpetrick.it> Co-authored-by: Alexander Brown <DrJKL0424@gmail.com> Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com> Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com> Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe> Co-authored-by: JakeSchroeder <jake@axiom.co> Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: DrJKL <DrJKL@users.noreply.github.com> Co-authored-by: ComfyUI Wiki <contact@comfyui-wiki.com>
186 lines
5.2 KiB
Vue
186 lines
5.2 KiB
Vue
<template>
|
|
<div
|
|
ref="workflowTabRef"
|
|
class="flex p-2 gap-2 workflow-tab group"
|
|
v-bind="$attrs"
|
|
@mouseenter="handleMouseEnter"
|
|
@mouseleave="handleMouseLeave"
|
|
@click="handleClick"
|
|
>
|
|
<span class="workflow-label text-sm max-w-[150px] truncate inline-block">
|
|
{{ workflowOption.workflow.filename }}
|
|
</span>
|
|
<div class="relative">
|
|
<span
|
|
v-if="shouldShowStatusIndicator"
|
|
class="group-hover:hidden absolute font-bold text-2xl top-1/2 left-1/2 -translate-1/2 z-10 bg-(--comfy-menu-bg) w-4"
|
|
>•</span
|
|
>
|
|
<Button
|
|
class="close-button p-0 w-auto invisible"
|
|
icon="pi pi-times"
|
|
text
|
|
severity="secondary"
|
|
size="small"
|
|
@click.stop="onCloseWorkflow(workflowOption)"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<WorkflowTabPopover
|
|
ref="popoverRef"
|
|
:workflow-filename="workflowOption.workflow.filename"
|
|
:thumbnail-url="thumbnailUrl"
|
|
:is-active-tab="isActiveTab"
|
|
/>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import Button from 'primevue/button'
|
|
import { computed, onUnmounted, ref } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import {
|
|
usePragmaticDraggable,
|
|
usePragmaticDroppable
|
|
} from '@/composables/usePragmaticDragAndDrop'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
|
|
import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
|
|
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
|
|
import { useWorkflowThumbnail } from '@/renderer/core/thumbnail/useWorkflowThumbnail'
|
|
import { useWorkspaceStore } from '@/stores/workspaceStore'
|
|
|
|
import WorkflowTabPopover from './WorkflowTabPopover.vue'
|
|
|
|
interface WorkflowOption {
|
|
value: string
|
|
workflow: ComfyWorkflow
|
|
}
|
|
|
|
const props = defineProps<{
|
|
class?: string
|
|
workflowOption: WorkflowOption
|
|
}>()
|
|
|
|
const { t } = useI18n()
|
|
|
|
const workspaceStore = useWorkspaceStore()
|
|
const workflowStore = useWorkflowStore()
|
|
const settingStore = useSettingStore()
|
|
const workflowTabRef = ref<HTMLElement | null>(null)
|
|
const popoverRef = ref<InstanceType<typeof WorkflowTabPopover> | null>(null)
|
|
const workflowThumbnail = useWorkflowThumbnail()
|
|
|
|
// Use computed refs to cache autosave settings
|
|
const autoSaveSetting = computed(() =>
|
|
settingStore.get('Comfy.Workflow.AutoSave')
|
|
)
|
|
const autoSaveDelay = computed(() =>
|
|
settingStore.get('Comfy.Workflow.AutoSaveDelay')
|
|
)
|
|
|
|
const shouldShowStatusIndicator = computed(() => {
|
|
if (workspaceStore.shiftDown) {
|
|
// Branch 1: Shift key is held down, do not show the status indicator.
|
|
return false
|
|
}
|
|
if (!props.workflowOption.workflow.isPersisted) {
|
|
// Branch 2: Workflow is not persisted, show the status indicator.
|
|
return true
|
|
}
|
|
if (props.workflowOption.workflow.isModified) {
|
|
// Branch 3: Workflow is modified.
|
|
if (autoSaveSetting.value === 'off') {
|
|
// Sub-branch 3a: Autosave is off, so show the status indicator.
|
|
return true
|
|
}
|
|
if (autoSaveSetting.value === 'after delay' && autoSaveDelay.value > 3000) {
|
|
// Sub-branch 3b: Autosave delay is too high, so show the status indicator.
|
|
return true
|
|
}
|
|
// Sub-branch 3c: Workflow is modified but no condition applies, do not show the status indicator.
|
|
return false
|
|
}
|
|
// Default: do not show the status indicator. This should not be reachable.
|
|
return false
|
|
})
|
|
|
|
const isActiveTab = computed(() => {
|
|
return workflowStore.activeWorkflow?.key === props.workflowOption.workflow.key
|
|
})
|
|
|
|
const thumbnailUrl = computed(() => {
|
|
return workflowThumbnail.getThumbnail(props.workflowOption.workflow.key)
|
|
})
|
|
|
|
// Event handlers that delegate to the popover component
|
|
const handleMouseEnter = (event: Event) => {
|
|
popoverRef.value?.showPopover(event)
|
|
}
|
|
|
|
const handleMouseLeave = () => {
|
|
popoverRef.value?.hidePopover()
|
|
}
|
|
|
|
const handleClick = (event: Event) => {
|
|
popoverRef.value?.togglePopover(event)
|
|
}
|
|
|
|
const closeWorkflows = async (options: WorkflowOption[]) => {
|
|
for (const opt of options) {
|
|
if (
|
|
!(await useWorkflowService().closeWorkflow(opt.workflow, {
|
|
warnIfUnsaved: !workspaceStore.shiftDown,
|
|
hint: t('sideToolbar.workflowTab.dirtyCloseHint')
|
|
}))
|
|
) {
|
|
// User clicked cancel
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
const onCloseWorkflow = async (option: WorkflowOption) => {
|
|
await closeWorkflows([option])
|
|
}
|
|
const tabGetter = () => workflowTabRef.value as HTMLElement
|
|
|
|
usePragmaticDraggable(tabGetter, {
|
|
getInitialData: () => {
|
|
return {
|
|
workflowKey: props.workflowOption.workflow.key
|
|
}
|
|
}
|
|
})
|
|
|
|
usePragmaticDroppable(tabGetter, {
|
|
getData: () => {
|
|
return {
|
|
workflowKey: props.workflowOption.workflow.key
|
|
}
|
|
},
|
|
onDrop: (e) => {
|
|
const fromIndex = workflowStore.openWorkflows.findIndex(
|
|
(wf) => wf.key === e.source.data.workflowKey
|
|
)
|
|
const toIndex = workflowStore.openWorkflows.findIndex(
|
|
(wf) => wf.key === e.location.current.dropTargets[0]?.data.workflowKey
|
|
)
|
|
if (fromIndex !== toIndex) {
|
|
workflowStore.reorderWorkflows(fromIndex, toIndex)
|
|
}
|
|
}
|
|
})
|
|
|
|
onUnmounted(() => {
|
|
popoverRef.value?.hidePopover()
|
|
})
|
|
</script>
|
|
|
|
<style>
|
|
.p-tooltip.workflow-tab-tooltip {
|
|
z-index: 1200 !important;
|
|
}
|
|
</style>
|