mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-28 10:44:12 +00:00
Update lockfile after rebase (#5254)
* chore: Update pnpm-lock.yaml after rebase
Add new dependencies from main branch:
- chart.js@^4.5.0
- clsx@^2.1.1
- tailwind-merge@^3.3.1
- yjs@^13.6.27
* Fix SelectionOverlay rebase issue (#5255)
* fix: Remove SelectionOverlay import accidentally re-added during rebase
During the rebase, the SelectionOverlay component import and usage was accidentally
re-introduced. This component was removed in commit 84e7102f (#5158) to fix
performance issues. The SelectionToolbox should be used directly without a wrapper.
The current main branch correctly uses:
<SelectionToolbox v-if="selectionToolboxEnabled" />
Ref: https://github.com/Comfy-Org/ComfyUI_frontend/pull/5158
* Deduplicate i18n keys from rebasing (#5257)
* fix: Add missing comma in zh locale JSON
Fixes JSON syntax error introduced during rebase.
* dedup i18n keys
* fix: Restore simplified Chinese translation for Toggle Workflows Sidebar
The previous dedup commit accidentally left a traditional Chinese
translation in the simplified Chinese locale file.
* fix: Replace remaining traditional Chinese characters in simplified Chinese locale
- Changed '檔案' to '文件' (file)
- Changed '擴充功能' to '扩展功能' (extensions)
This commit is contained in:
@@ -87,9 +87,7 @@
|
||||
canvasStore.canvas to be initialized. -->
|
||||
<template v-if="comfyAppReady">
|
||||
<TitleEditor />
|
||||
<SelectionOverlay v-if="selectionToolboxEnabled">
|
||||
<SelectionToolbox />
|
||||
</SelectionOverlay>
|
||||
<SelectionToolbox v-if="selectionToolboxEnabled" />
|
||||
<!-- Render legacy DOM widgets only when Vue nodes are disabled -->
|
||||
<DomWidgets v-if="!shouldRenderVueNodes" />
|
||||
</template>
|
||||
@@ -114,7 +112,6 @@ import DomWidgets from '@/components/graph/DomWidgets.vue'
|
||||
import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue'
|
||||
import MiniMap from '@/components/graph/MiniMap.vue'
|
||||
import NodeTooltip from '@/components/graph/NodeTooltip.vue'
|
||||
import SelectionOverlay from '@/components/graph/SelectionOverlay.vue'
|
||||
import SelectionToolbox from '@/components/graph/SelectionToolbox.vue'
|
||||
import TitleEditor from '@/components/graph/TitleEditor.vue'
|
||||
import TransformPane from '@/components/graph/TransformPane.vue'
|
||||
|
||||
Reference in New Issue
Block a user