mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-29 10:42:44 +00:00
Merge branch 'main' into feat/survey-eligibility
This commit is contained in:
@@ -1350,12 +1350,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
|
|||||||
})
|
})
|
||||||
|
|
||||||
function inner_clicked(
|
function inner_clicked(
|
||||||
this: ContextMenu<string>,
|
this: ContextMenuDivElement,
|
||||||
v?: string | IContextMenuValue<string>
|
v?: string | IContextMenuValue<string>
|
||||||
) {
|
) {
|
||||||
if (!node || typeof v === 'string' || !v?.value) return
|
if (!node || typeof v === 'string' || !v?.value) return
|
||||||
|
|
||||||
const rect = this.root.getBoundingClientRect()
|
const rect = this.getBoundingClientRect()
|
||||||
canvas.showEditPropertyValue(node, v.value, {
|
canvas.showEditPropertyValue(node, v.value, {
|
||||||
position: [rect.left, rect.top]
|
position: [rect.left, rect.top]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,40 +1,26 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex gap-3">
|
<div class="flex gap-3 items-center">
|
||||||
<SearchBox
|
<SearchBox
|
||||||
:model-value="searchQuery"
|
:model-value="searchQuery"
|
||||||
:placeholder="$t('sideToolbar.searchAssets') + '...'"
|
:placeholder="$t('sideToolbar.searchAssets') + '...'"
|
||||||
@update:model-value="handleSearchChange"
|
@update:model-value="handleSearchChange"
|
||||||
/>
|
/>
|
||||||
<MediaAssetFilterButton
|
<div class="flex gap-1.5 items-center">
|
||||||
v-if="isCloud"
|
<MediaAssetFilterButton v-if="isCloud" v-tooltip.top="{ value: $t('assetBrowser.filterBy') }" size="md">
|
||||||
v-tooltip.top="{ value: $t('assetBrowser.filterBy') }"
|
<template #default="{ close }">
|
||||||
size="md"
|
<MediaAssetFilterMenu
|
||||||
>
|
:media-type-filters
|
||||||
<template #default="{ close }">
|
:close
|
||||||
<MediaAssetFilterMenu
|
@update:media-type-filters="handleMediaTypeFiltersChange" />
|
||||||
:media-type-filters="mediaTypeFilters"
|
</template>
|
||||||
:close="close"
|
</MediaAssetFilterButton>
|
||||||
@update:media-type-filters="handleMediaTypeFiltersChange"
|
<AssetSortButton v-if="isCloud" v-tooltip.top="{ value: $t('assetBrowser.sortBy') }" size="md">
|
||||||
/>
|
<template #default="{ close }">
|
||||||
</template>
|
<MediaAssetSortMenu v-model:sort-by="sortBy" :show-generation-time-sort :close />
|
||||||
</MediaAssetFilterButton>
|
</template>
|
||||||
<AssetSortButton
|
</AssetSortButton>
|
||||||
v-if="isCloud"
|
<MediaAssetViewModeToggle v-if="isQueuePanelV2Enabled" v-model:view-mode="viewMode" />
|
||||||
v-tooltip.top="{ value: $t('assetBrowser.sortBy') }"
|
</div>
|
||||||
size="md"
|
|
||||||
>
|
|
||||||
<template #default="{ close }">
|
|
||||||
<MediaAssetSortMenu
|
|
||||||
v-model:sort-by="sortBy"
|
|
||||||
:show-generation-time-sort
|
|
||||||
:close="close"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</AssetSortButton>
|
|
||||||
<MediaAssetViewModeToggle
|
|
||||||
v-if="isQueuePanelV2Enabled"
|
|
||||||
v-model:view-mode="viewMode"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user