mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-29 02:32:18 +00:00
Merge remote-tracking branch 'origin/main' into bl-more-slots
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
@@ -112,16 +112,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="transition-opacity flex gap-3 h-0"
|
class="transition-opacity flex gap-3 h-0 items-center"
|
||||||
:class="{
|
:class="{
|
||||||
'opacity-40': selected && selected !== 'cpu'
|
'opacity-40': selected && selected !== 'cpu'
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<ToggleSwitch
|
<ToggleSwitch v-model="cpuMode" input-id="cpu-mode" />
|
||||||
v-model="cpuMode"
|
|
||||||
input-id="cpu-mode"
|
|
||||||
class="-translate-y-40"
|
|
||||||
/>
|
|
||||||
<label for="cpu-mode" class="select-none">
|
<label for="cpu-mode" class="select-none">
|
||||||
{{ $t('install.gpuSelection.enableCpuMode') }}
|
{{ $t('install.gpuSelection.enableCpuMode') }}
|
||||||
</label>
|
</label>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
ref="workflowTabRef"
|
ref="workflowTabRef"
|
||||||
class="flex p-2 gap-2 workflow-tab"
|
class="flex p-2 gap-2 workflow-tab group"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
@mouseenter="handleMouseEnter"
|
@mouseenter="handleMouseEnter"
|
||||||
@mouseleave="handleMouseLeave"
|
@mouseleave="handleMouseLeave"
|
||||||
@@ -11,9 +11,13 @@
|
|||||||
{{ workflowOption.workflow.filename }}
|
{{ workflowOption.workflow.filename }}
|
||||||
</span>
|
</span>
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<span v-if="shouldShowStatusIndicator" class="status-indicator">•</span>
|
<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-secondary-bg) w-4"
|
||||||
|
>•</span
|
||||||
|
>
|
||||||
<Button
|
<Button
|
||||||
class="close-button p-0 w-auto"
|
class="close-button p-0 w-auto invisible"
|
||||||
icon="pi pi-times"
|
icon="pi pi-times"
|
||||||
text
|
text
|
||||||
severity="secondary"
|
severity="secondary"
|
||||||
@@ -174,18 +178,6 @@ onUnmounted(() => {
|
|||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
@reference '../../assets/css/style.css';
|
|
||||||
|
|
||||||
.status-indicator {
|
|
||||||
@apply absolute font-bold;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
top: 50%;
|
|
||||||
left: 50%;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.p-tooltip.workflow-tab-tooltip {
|
.p-tooltip.workflow-tab-tooltip {
|
||||||
z-index: 1200 !important;
|
z-index: 1200 !important;
|
||||||
|
|||||||
@@ -358,14 +358,6 @@ onUpdated(() => {
|
|||||||
@apply visible;
|
@apply visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.p-togglebutton:hover) .status-indicator {
|
|
||||||
@apply hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.p-togglebutton) .close-button {
|
|
||||||
@apply invisible;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.p-scrollpanel-content) {
|
:deep(.p-scrollpanel-content) {
|
||||||
@apply h-full;
|
@apply h-full;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<!-- Display mode: Rendered markdown -->
|
<!-- Display mode: Rendered markdown -->
|
||||||
<div
|
<div
|
||||||
v-if="!isEditing"
|
v-if="!isEditing"
|
||||||
class="comfy-markdown-content text-xs min-h-[60px] rounded-lg px-4 py-2 overflow-y-auto"
|
class="comfy-markdown-content text-xs min-h-[60px] rounded-lg px-4 py-2 overflow-y-auto lod-toggle"
|
||||||
v-html="renderedHtml"
|
v-html="renderedHtml"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -28,6 +28,7 @@
|
|||||||
@click.stop
|
@click.stop
|
||||||
@keydown.stop
|
@keydown.stop
|
||||||
/>
|
/>
|
||||||
|
<LODFallback />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -39,6 +40,8 @@ import { useStringWidgetValue } from '@/composables/graph/useWidgetValue'
|
|||||||
import type { SimplifiedWidget } from '@/types/simplifiedWidget'
|
import type { SimplifiedWidget } from '@/types/simplifiedWidget'
|
||||||
import { renderMarkdownToHtml } from '@/utils/markdownRendererUtil'
|
import { renderMarkdownToHtml } from '@/utils/markdownRendererUtil'
|
||||||
|
|
||||||
|
import LODFallback from '../../components/LODFallback.vue'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
widget: SimplifiedWidget<string>
|
widget: SimplifiedWidget<string>
|
||||||
modelValue: string
|
modelValue: string
|
||||||
|
|||||||
Reference in New Issue
Block a user