Compare commits

...
6 Commits
Author SHA1 Message Date
ketle-manandClaude Sonnet 4.6 390921a13d release: v0.3.63 — ノードタブ複数選択・全タブフィルタークリア・検索Xボタン
- Nodes tab: Ctrl+click / Shift+click multi-select with bulk action bar (add/remove/create group, bulk favorite/unfavorite)
- All tabs (Workflow/Nodes/Models/Gallery): ✕ Clear button resets all filters in one click
- All tabs: inline ✕ overlay button on search inputs clears text immediately
- Fix: node bulk bar layout collapse (moved outside flex container)
- Fix: search clear button not showing (display:'flex' instead of '')
- Fix: node card multi-selected style not applied (added .wfm-card.multi-selected to main.css)
- docs/12_Tagger.png, docs/13_ImageEdit.png added (missed in v0.3.62)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-28 13:23:15 +09:00
ketle-manandClaude Sonnet 4.6 78b34c99f7 feat: WFS_PromptText を GenerateUI Prompt タブで認識・ドロップ title 固定
- analyzeWorkflow に WFS_PromptText 検出を追加(positive/negative を個別の prompt_node として登録)
- _getWidgetMapping に WFS_PromptText フォールバックマッピングを追加(UI→API 変換対応)
- placePromptNode のドロップ時 title をプリセット名から「Wfs Prompt」固定に変更

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-27 21:58:27 +09:00
ketle-manandClaude Sonnet 4.6 71ed9788a6 release: v0.3.62 — Send GenUI Image ボタン追加・tagger_settings.json バグ修正
- Gallery タブツールバーに Send GenUI Image ボタンを追加(Image Edit ボタン右隣)
  選択画像を ComfyUI へアップロードし GenerateUI Input Image スロット 0 に自動適用
- tagger_settings.json がデータエクスポート対象から漏れていたバグを修正
- ヘルプ helpGallery17 を EN/JA/ZH で追加
- README: v0.3.62 Changelog・スクリーンショット(Tagger/Image Edit)追加
- DEVLOG 更新・pyproject.toml バージョン 0.3.62 に更新

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-27 18:10:47 +09:00
ketle-manandClaude Sonnet 4.6 4cfc793c76 docs: Send GenUI Image ボタンのヘルプを追加(helpGallery17)
- templates/index.html: wfm-help-gallery-17 エントリ追加
- static/js/i18n.js: helpGallery17 キー追加(EN/JA/ZH)
- static/js/app.js: helpIdMap に wfm-help-gallery-17 → helpGallery17 追加

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-27 17:54:06 +09:00
ketle-manandClaude Sonnet 4.6 a7b5667a50 feat: ギャラリータブに Send GenUI Image ボタンを追加
ギャラリーツールバーの Image Edit ボタン右隣に「Send GenUI Image」ボタンを
設置。選択中の画像をギャラリーから取得し、ComfyUI にアップロードした後、
GenerateUI タブの Input > Image スロット 0 へ自動的に適用する。

- templates/index.html: Send GenUI Image ボタン追加
- static/js/comfyui-editor.js: comfyEditor.applyImageToSlot() メソッド追加
- static/js/gallery-tab.js: comfyUI/comfyEditor をインポート、ボタンハンドラ追加
- static/js/i18n.js: galleryNoLoadImageNode / gallerySentGenUI キー追加(EN/JA/ZH)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-27 17:49:14 +09:00
ketle-manandClaude Sonnet 4.6 1eaf4b2158 fix: tagger_settings.json をデータエクスポート/インポート対象に追加
settings_routes.py の _DATA_FILES リストから tagger_settings.json が
漏れており、データバックアップ時にTagger設定が含まれなかった。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-27 17:36:29 +09:00
18 changed files with 767 additions and 13 deletions
+175
View File
@@ -1,5 +1,180 @@
# DEVLOG - ComfyUI-Workflow-Studio
## 2026-06-28: v0.3.63 — ノードタブ複数選択・全タブフィルタークリア・検索Xボタン
**変更ファイル**: `static/js/nodes-tab.js`, `static/js/workflow-tab.js`, `static/js/models-tab.js`, `static/js/gallery-tab.js`, `static/js/util.js`, `static/js/i18n.js`, `static/css/main.css`, `templates/index.html`
### 概要
ノードタブにギャラリー同様の複数選択+一括グループ・お気に入り操作を追加。ワークフロー/ノード/モデル/ギャラリーの4タブ全てに「✕ クリア」ボタンと検索入力オーバーレイXボタンを追加。
---
### ノードタブ: 複数選択バルクメニュー
#### 操作方法
| 操作 | 動作 |
|------|------|
| Ctrl+クリック | 個別選択/解除トグル |
| Shift+クリック | アンカーから範囲一括選択 |
| カードビュー・テーブルビュー | 両対応 |
#### 一括操作バー(選択時に自動表示)
- **グループに追加** — 既存グループに選択ノードを一括追加
- **グループから削除** — 既存グループから選択ノードを一括削除
- **作成して追加** — 新規グループを作成して一括追加
- **★ お気に入り追加(全件)** — 選択ノードを全件お気に入り登録
- **☆ お気に入り解除(全件)** — 選択ノードを全件お気に入り解除
- **選択解除** — 選択状態をリセット
#### 実装詳細
- `state.selectedNodes`(Set)と `state.lastSelectionIndex` を追加
- `_applyNodeSelectionToDOM()` — 再レンダリング後に選択状態を DOM に同期
- `updateNodeBulkBar()` — バー表示/非表示とグループセレクト更新
- バルクバーを `wfm-workflow-area`(flex コンテナ)の**外**に配置(レイアウト崩れ防止)
- `.wfm-card.multi-selected` スタイルを `main.css` に追加(オレンジ `#f59e0b` でギャラリーと統一)
---
### 全タブ: フィルタークリアボタン(✕ クリア)
各タブのツールバー最右端に「✕ クリア」ボタンを追加。クリックで全フィルターを一括リセット。
| タブ | リセット対象 |
|------|-------------|
| ワークフロー | 検索テキスト・グループ・バッジフィルタ(ALL に戻す)・バッチ表示フラグ |
| ノード | 検索テキスト・カテゴリ・パッケージ・タグ・グループ・お気に入りフラグ |
| モデル | 検索テキスト・タグ・フォルダ・グループ・ステータス・お気に入り・バッチフラグ |
| ギャラリー | 検索テキスト・タグ・グループ・お気に入りフラグ(ソート順は維持) |
---
### 全タブ: 検索入力オーバーレイ X ボタン
検索テキストボックス右端に `✕` ボタンをオーバーレイ表示。
- 入力が**空のときは非表示**、文字を入力すると自動表示
- クリックで入力をクリアしてフォーカスを戻し、即時フィルタリング更新
- 汎用関数 `setupSearchClearBtn(inputId, clearBtnId, onClear)` を `util.js` に追加し4タブで共通使用
- `.wfm-search-wrap` / `.wfm-search-clear-btn` スタイルを `main.css` に追加
#### 対象
- ワークフロータブ: `wfm-search`
- ノードタブ: `wfm-nodes-search`
- モデルタブ: `wfm-models-search`
- ギャラリータブ: `wfm-gallery-search`
---
### バグ修正
- **ノードバルクバーレイアウト崩れ** — バルクバーを `wfm-nodes-browser`(`display:flex` コンテナ)内から外側に移動
- **検索Xボタン非表示** — `btn.style.display = ""` がCSS `display:none` を復元してしまうバグを `"flex"` 明示指定に修正
- **ノードカード multi-selected 未適用** — `.wfm-card.multi-selected` が `main.css` になく視覚変化なしだったため追加
---
## 2026-06-27: WFS_PromptText の GenerateUI 対応・ドロップ時 title 固定
**変更ファイル**: `static/js/comfyui-workflow.js`, `web/comfyui/node_sets_menu.js`
### 概要
`WFS_PromptText` ノードを含むワークフローを GenerateUI タブで読み込んだ際に、Prompt タブの Positive/Negative テキストエリアへ正しく反映されるよう対応。あわせてサイドバーのプロンプトプリセットをキャンバスにドロップしたときのノード title をプリセット名から「Wfs Prompt」固定に変更し、ワークフローの再利用性を向上。
---
### WFS_PromptText → GenerateUI Prompt タブ対応
#### 変更内容(`static/js/comfyui-workflow.js`)
- **`analyzeWorkflow` Pass2** に `WFS_PromptText` 検出を追加
- `inputs.positive` が文字列 → `role: "positive"`, `textKey: "positive"` で `prompt_nodes` に登録
- `inputs.negative` が文字列 → `role: "negative"`, `textKey: "negative"` で `prompt_nodes` に登録
- 同一ノードが positive/negative の両ロールを持つため(CLIPTextEncode 経由の伝播で両参照される)、`getRole()` に依存せず固定ロールで登録
- **`_getWidgetMapping`** に `WFS_PromptText: ["positive", "negative"]` を追加
- UI 形式 → API 形式変換時のフォールバック: `widgets_values[0]` → `inputs.positive`、`[1]` → `inputs.negative`
#### 動作
| 手順 | 内容 |
|------|------|
| UI 形式読み込み | `convertUiToApi` が `widgets_values` を `inputs.positive/negative` にマップ |
| 解析 | `analyzeWorkflow` が `WFS_PromptText` を positive/negative 2 つの `prompt_node` として認識 |
| 表示 | Prompt タブのセレクトに `ID:X Wfs Prompt [positive]` / `[negative]` が表示される |
| Apply | `textKey: "positive"/"negative"` でワークフローへ書き戻し |
---
### ドロップ時 title 固定(`web/comfyui/node_sets_menu.js`)
- `placePromptNode` 内の `if (promptName) node.title = promptName;` を `node.title = "Wfs Prompt";` に変更
- サイドバーの Prompts タブからどのプリセットをドロップしても title が「Wfs Prompt」固定になる
- プリセット内容(positive/negative テキスト)はウィジェット値として保存されるため変わらない
---
## 2026-06-27: v0.3.62 — Send GenUI Image ボタン追加・tagger_settings.json バグ修正・README 更新
**変更ファイル**: `static/js/gallery-tab.js`, `static/js/comfyui-editor.js`, `static/js/i18n.js`, `static/js/app.js`, `templates/index.html`, `py/routes/settings_routes.py`, `README.md`
### 概要
ギャラリータブのツールバーに **Send GenUI Image** ボタンを追加。選択画像を GenerateUI タブの Input → Image スロット 0 へ自動適用できるようになった。データエクスポートのバグ修正(tagger_settings.json 漏れ)も同梱。
---
### Send GenUI Image ボタン(Gallery タブ)
#### 実装内容
- `templates/index.html` — ギャラリーツールバーの Image Edit ボタン右隣に `#wfm-gallery-send-genui-image-btn` を追加
- `static/js/comfyui-editor.js` — `comfyEditor.applyImageToSlot(file, slotIndex)` メソッドを追加:
- `comfyUI.currentAnalysis.load_image_nodes[slotIndex]` でターゲットノードを特定
- `comfyUI.uploadImage()` で ComfyUI input フォルダへアップロード
- `currentWorkflow[node.id].inputs.image` を更新してワークフローへ即時反映
- GenerateUI の Input > Image スロット UI(プレビュー・ファイル名・ステータス)を即時更新
- `static/js/gallery-tab.js` — ボタンクリックハンドラを追加:
- 選択画像の blob を fetch → File オブジェクト化
- DOM クリックチェーン(main tab → subtab → inner tab)で GenerateUI Input Image タブへ自動遷移
- `comfyEditor.applyImageToSlot(file, 0)` 呼び出し後にサクセストーストを表示
- `static/js/i18n.js` — `galleryNoLoadImageNode` / `gallerySentGenUI` / `helpGallery17` を EN/JA/ZH で追加
- `static/js/app.js` — `helpIdMap` に `"wfm-help-gallery-17": "helpGallery17"` を追加
- `templates/index.html` — ヘルプ `#wfm-help-gallery-17` を追加
#### 動作条件
- ワークフローが GenerateUI に読み込まれており、LoadImage ノードが 1 つ以上存在すること
- 画像が Gallery で選択されていること
---
### データ管理バグ修正 — tagger_settings.json をエクスポート対象に追加
- `py/routes/settings_routes.py` の `_DATA_FILES` リストに `"tagger_settings.json"` を追加
- Tagger のカスタムモデルディレクトリ・閾値設定がエクスポート/インポートされない問題を修正
- `tagger.db`(SQLite)と `wildcard/`(ディレクトリ)は JSON バンドル非対応のため除外継続
---
## 2026-06-27: データ管理バグ修正 — tagger_settings.json をエクスポート対象に追加
**変更ファイル**: `py/routes/settings_routes.py`
### 概要
設定タブのデータエクスポート/インポート機能(`_DATA_FILES`リスト)に `tagger_settings.json` が漏れていたバグを修正。
`config.py` で定義されている全JSONデータファイルと `_DATA_FILES` を照合したところ、Taggerの設定ファイル(カスタムモデルディレクトリ・タグ閾値など)がバックアップ対象から除外されていた。`settings_routes.py` の `_DATA_FILES` リストに `"tagger_settings.json"` を追加して修正。
`tagger.db`(SQLite)と `wildcard/`(ディレクトリ)はJSONバンドルに含められないため除外のまま。
---
## 2026-06-27: v0.3.61 — G'MIC バグ修正・セキュリティ・Draw/Mask ブラシ操作性改善
**変更ファイル**: `py/routes/gmic_routes.py`, `static/js/image-edit-tab.js`, `static/js/image-edit/DrawTool.js`, `static/js/image-edit/MaskTool.js`, `static/js/settings-tab.js`, `static/js/i18n.js`, `static/js/app.js`, `templates/index.html`
+27 -1
View File
@@ -18,7 +18,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- Built-in AI tools (translation and more)
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.3.61-green)
![Version](https://img.shields.io/badge/version-0.3.63-green)
## Screenshots
@@ -42,6 +42,10 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|:---:|:---:|
| ![WS Library](docs/6_ws_library.png) | ![Library Information](docs/7_library_Infomation.png) |
| Tagger Tab | Image Edit Tab |
|:---:|:---:|
| ![Tagger Tab](docs/12_Tagger.png) | ![Image Edit Tab](docs/13_ImageEdit.png) |
| Customize | |
|:---:|:---:|
| ![Customize](docs/8_Customize.png) | |
@@ -60,6 +64,8 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- **AI summary** — generate workflow descriptions using Ollama
- **Import / Export** — import workflows from files or clipboard; **Send to Canvas** button sends the selected workflow directly to the ComfyUI canvas (UI and API formats both supported)
- **Default view setting** — persist your preferred view mode (Thumbnail / Table)
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, group filter, and badge filter (ALL) in one click
### Canvas Snapshot (v0.1.2)
- **One-click capture** — click the camera button in ComfyUI's top bar to snapshot the current workflow canvas
@@ -165,6 +171,10 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Detail panel** — view filename, path, tags, groups, and metadata in a slide-out panel
- **Workflow viewer** — Metadata tab displays workflow JSON from PNG embedded data (`prompt` / `workflow` keys) or from workflow saved by the Generate UI tab; **Copy & Send Canvas** button copies the JSON to the clipboard and sends the workflow directly to the ComfyUI canvas (UI and API formats both supported)
- **Load GenUI button** — loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; shows a warning toast if no workflow is embedded or the format is unsupported; Metadata button is styled green, Load GenUI button uses the primary accent color
- **Image Edit button** — toolbar button; sends the selected image directly to the Image Edit tab as the base layer
- **Send GenUI Image button** — toolbar button (next to Image Edit); uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, tag filter, group filter, and favorites filter in one click (sort order is preserved)
- **Workflow auto-save** — images generated from the Generate UI tab have their workflow automatically saved to gallery metadata
- **Output folder configurable** — set the scanned output folder from Settings tab
- **Performance** — server-side 256px JPEG thumbnail generation with disk cache (`data/thumb_cache/`); infinite-scroll paging (50 images per page, IntersectionObserver); folder-level mtime cache (60s TTL); bulk operations use single-request API endpoints
@@ -176,6 +186,9 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Node detail panel** — view I/O specifications, edit tags, manage groups
- **Node Sets** — save multiple nodes + connections as reusable sets from the ComfyUI canvas
- **Right-click context menu** — "Save as Node Set" option on any node in ComfyUI
- **Multi-select** — Ctrl+click to toggle individual nodes, Shift+click for range selection; bulk action bar appears with: add to group / remove from group / create & add group / bulk favorite / unfavorite
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, category, package, tag, group, and favorites filter in one click
### Models Tab (v0.2.3)
- **Model Browser** — browse all installed ComfyUI models (Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder, Hypernetwork, Embedding) with sub-tab switching
@@ -198,6 +211,8 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Group row** — select an existing group and **Add** / **Remove**, or type a new name and **Create & Add**
- **Badge row** — select a badge and **+Badge** / **−Badge** to apply or remove from all selected
- **File row** — select a destination subfolder (or type a new folder name and create it) then **Move** to relocate the model file with all sidecar files; **Delete Files** (right end) permanently removes selected models and all associated files
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, tag filter, folder filter, group filter, favorites filter, and status filter in one click
### Tagger Tab (v0.3.38)
- **3 sub-tabs** — Single / Batch / DB for single-image tagging, folder batch processing, and tag database management
@@ -356,6 +371,17 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
## Changelog
### v0.3.63
- **Nodes tab — multi-select** — Ctrl+click to toggle individual nodes, Shift+click for range selection; bulk action bar appears with add to group / remove from group / create & add group / bulk favorite / unfavorite; works in both Card and Table view modes
- **All tabs — search clear (✕)** — inline ✕ overlay button inside each search box (Workflow / Nodes / Models / Gallery); shown only when text is entered, click to clear and re-filter immediately
- **All tabs — clear all filters button** — new ✕ Clear button at the rightmost end of each tab's toolbar; resets all active filters (search, group, tag, folder, favorites, badge) in one click; Gallery sort order is preserved
### v0.3.62
- **Gallery tab — Send GenUI Image button** — new toolbar button (next to Image Edit); uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; `comfyEditor.applyImageToSlot(file, slotIndex)` added to `comfyui-editor.js` for reusable image-slot injection
- **Bug fix: tagger_settings.json missing from data export** — `tagger_settings.json` was absent from `_DATA_FILES` in `settings_routes.py`; Tagger model directory and threshold settings were silently excluded from Settings → Data Management export/import; fixed by adding the file to the export list
- **Help — Send GenUI Image** — new help card (`helpGallery17`) added in EN/JA/ZH; registered in `helpIdMap`
- **Screenshots — Tagger and Image Edit tabs** — `docs/12_Tagger.png` and `docs/13_ImageEdit.png` added to the README screenshots section
### v0.3.61
- **Image Edit — Draw / Mask brush cursor** — cursor replaced with a size-accurate circle overlay matching the current brush size; the circle scales correctly with canvas zoom so the visible area matches exactly what will be painted
- **Image Edit — Draw / Mask out-of-canvas strokes** — strokes can now start from the canvas margin area (outside the image boundary) and continue past the edge without interruption; `window`-level `mousemove` / `mouseup` tracking keeps the stroke alive when the pointer leaves the canvas element
Binary file not shown.

After

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

+1
View File
@@ -23,6 +23,7 @@ _DATA_FILES = [
"prompts.json",
"model_metadata.json",
"gallery_metadata.json",
"tagger_settings.json",
]
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "comfyui-workflow-studio"
description = "A comprehensive workflow, asset management, and generation UI plugin for ComfyUI. Manage workflows, models, images, and prompts; batch generation and Image Feeder in the GenerateUI tab; library side panel with canvas drag & drop and AI tools."
version = "0.3.61"
version = "0.3.63"
license = "MIT"
requires-python = ">= 3.10"
dependencies = ["jinja2"]
+44
View File
@@ -217,6 +217,39 @@ body {
Search
============================================ */
.wfm-search-wrap {
position: relative;
display: inline-flex;
align-items: center;
}
.wfm-search-clear-btn {
position: absolute;
right: 5px;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
cursor: pointer;
font-size: 11px;
color: var(--wfm-text-secondary);
padding: 2px 3px;
line-height: 1;
border-radius: 50%;
display: none;
opacity: 0.7;
}
.wfm-search-clear-btn:hover {
color: var(--wfm-text-primary);
background: rgba(255,255,255,0.1);
opacity: 1;
}
.wfm-search-wrap .wfm-search-input {
padding-right: 22px;
}
.wfm-search-input {
padding: 6px 12px;
border: 1px solid var(--wfm-border);
@@ -1579,6 +1612,17 @@ body {
background: color-mix(in srgb, var(--wfm-primary) 10%, var(--wfm-surface));
}
.wfm-card.multi-selected {
border-color: #f59e0b !important;
box-shadow: 0 0 0 2px #f59e0b !important;
background: color-mix(in srgb, #f59e0b 10%, var(--wfm-surface));
}
.wfm-nodes-table-row.multi-selected {
background: rgba(245, 158, 11, 0.15);
outline: 1px solid #f59e0b;
}
/* ============================================
Side Panel
============================================ */
+2
View File
@@ -385,6 +385,7 @@ function applyI18nToHtml() {
"wfm-help-nodes-1": "helpNodes1", "wfm-help-nodes-2": "helpNodes2",
"wfm-help-nodes-3": "helpNodes3", "wfm-help-nodes-4": "helpNodes4",
"wfm-help-nodes-5": "helpNodes5", "wfm-help-nodes-6": "helpNodes6",
"wfm-help-nodes-7": "helpNodes7",
"wfm-help-models-1": "helpModels1", "wfm-help-models-2": "helpModels2",
"wfm-help-models-3": "helpModels3", "wfm-help-models-4": "helpModels4",
"wfm-help-models-5": "helpModels5", "wfm-help-models-6": "helpModels6",
@@ -400,6 +401,7 @@ function applyI18nToHtml() {
"wfm-help-gallery-11": "helpGallery11", "wfm-help-gallery-12": "helpGallery12",
"wfm-help-gallery-13": "helpGallery13", "wfm-help-gallery-14": "helpGallery14",
"wfm-help-gallery-15": "helpGallery15", "wfm-help-gallery-16": "helpGallery16",
"wfm-help-gallery-17": "helpGallery17",
"wfm-help-tagger-title": "helpTaggerTitle",
"wfm-help-tagger-1": "helpTagger1", "wfm-help-tagger-2": "helpTagger2",
"wfm-help-tagger-3": "helpTagger3", "wfm-help-tagger-4": "helpTagger4",
+30
View File
@@ -1131,6 +1131,36 @@ export const comfyEditor = {
});
},
async applyImageToSlot(file, slotIndex = 0) {
const loadNodes = comfyUI.currentAnalysis?.load_image_nodes || [];
const node = loadNodes[slotIndex];
if (!node) throw new Error("No LoadImage node at slot " + slotIndex);
const result = await comfyUI.uploadImage(file, file.name);
if (!result.name) throw new Error("Upload returned no filename");
if (comfyUI.currentWorkflow?.[node.id]) {
comfyUI.currentWorkflow[node.id].inputs.image = result.name;
}
const previewWrap = document.getElementById(`wfm-i2i-preview-wrap-${slotIndex}`);
const previewImg = document.getElementById(`wfm-i2i-preview-${slotIndex}`);
const filenameEl = document.getElementById(`wfm-i2i-filename-${slotIndex}`);
const statusEl = document.getElementById(`wfm-i2i-status-${slotIndex}`);
const applyBtn = document.querySelector(`.wfm-i2i-apply[data-slot="${slotIndex}"]`);
if (previewImg) {
previewImg.src = `/view?filename=${encodeURIComponent(result.name)}&type=input`;
if (previewWrap) previewWrap.style.display = "";
}
if (filenameEl) filenameEl.textContent = result.name;
if (statusEl) { statusEl.textContent = `✓ ${result.name}`; statusEl.style.color = "var(--wfm-success)"; }
if (applyBtn) applyBtn.disabled = true;
_syncRawJson();
return result.name;
},
syncToWorkflow() {
// Sync prompt texts before generation
const posSelect = document.getElementById("wfm-prompt-pos-target");
+17
View File
@@ -713,6 +713,22 @@ export const comfyWorkflow = {
}
}
// WFS_PromptText — 2出力ノード。output[0]=positive / output[1]=negative
if (ct === "WFS_PromptText") {
if (typeof inputs.positive === "string") {
result.prompt_nodes.push({
id, type: ct, title: `${title} [positive]`, role: "positive",
text: inputs.positive, textKey: "positive",
});
}
if (typeof inputs.negative === "string") {
result.prompt_nodes.push({
id, type: ct, title: `${title} [negative]`, role: "negative",
text: inputs.negative, textKey: "negative",
});
}
}
// PrimitiveStringMultiline / PrimitiveString — when feeding a prompt node
if ((ct === "PrimitiveStringMultiline" || ct === "PrimitiveString") && (isPos || isNeg)) {
result.prompt_nodes.push({
@@ -899,6 +915,7 @@ function _getWidgetMapping(nodeType) {
// vary between versions and include frontend-only extras, so we leave them unmapped.
ImpactWildcardProcessor: ["wildcard_text"],
ImpactWildcardEncode: ["wildcard_text"],
WFS_PromptText: ["positive", "negative"],
};
return mappings[nodeType] || null;
}
+61 -1
View File
@@ -7,8 +7,10 @@ import { showToast } from "./app.js";
import { t } from "./i18n.js";
import { loadFileIntoMetadataTab } from "./metadata-tab.js";
import { loadWorkflowIntoEditor } from "./generate-tab.js";
import { escapeHtml } from "./util.js";
import { escapeHtml, setupSearchClearBtn } from "./util.js";
import { comfyWorkflow } from "./comfyui-workflow.js";
import { comfyUI } from "./comfyui-client.js";
import { comfyEditor } from "./comfyui-editor.js";
// ── 定数 ─────────────────────────────────────────────────────
@@ -1471,11 +1473,48 @@ function bindEvents() {
}
});
// 選択画像を GenerateUI Image タブへ送信
document.getElementById("wfm-gallery-send-genui-image-btn")?.addEventListener("click", async () => {
if (!state.selectedImage) {
showToast(t("gallerySelectImageFirst"), "info");
return;
}
if (!comfyUI.currentAnalysis) {
showToast(t("noWorkflowLoaded"), "info");
return;
}
const loadNodes = comfyUI.currentAnalysis.load_image_nodes || [];
if (loadNodes.length === 0) {
showToast(t("galleryNoLoadImageNode"), "info");
return;
}
try {
const res = await fetch(API.serveImage(state.selectedImage.path));
if (!res.ok) throw new Error(`HTTP ${res.status}`);
const blob = await res.blob();
const file = new File([blob], state.selectedImage.filename, { type: blob.type || "image/png" });
// GenerateUI → Input subtab → Image inner tab へ切り替え
document.querySelector('[data-tab="generate"]')?.click();
document.querySelector('.wfm-gen-subtab-btn[data-subtab="input"]')?.click();
document.querySelector('.wfm-input-inner-tab[data-input-tab="image"]')?.click();
await comfyEditor.applyImageToSlot(file, 0);
showToast(t("gallerySentGenUI"), "success");
} catch (e) {
showToast(t("errorWithMsg", e.message), "error");
}
});
// 検索
document.getElementById("wfm-gallery-search")?.addEventListener("input", (e) => {
state.search = e.target.value;
loadImages();
});
setupSearchClearBtn("wfm-gallery-search", "wfm-gallery-search-clear-btn", () => {
state.search = "";
loadImages();
});
// ソート
document.getElementById("wfm-gallery-sort")?.addEventListener("change", (e) => {
@@ -1704,4 +1743,25 @@ function bindEvents() {
document.querySelectorAll(".wfm-gallery-lightbox").forEach(el => el.remove());
}
});
// Clear filters button
const galleryClearBtn = document.getElementById("wfm-gallery-clear-filters-btn");
if (galleryClearBtn) {
galleryClearBtn.textContent = t("clearFilters");
galleryClearBtn.addEventListener("click", () => {
state.search = "";
state.favoriteOnly = false;
state.tagFilter = "";
state.groupFilter = "";
const searchInput = document.getElementById("wfm-gallery-search");
if (searchInput) searchInput.value = "";
const tagFilter = document.getElementById("wfm-gallery-tag-filter");
if (tagFilter) tagFilter.value = "";
const groupFilter = document.getElementById("wfm-gallery-group-filter");
if (groupFilter) groupFilter.value = "";
const favBtn = document.getElementById("wfm-gallery-fav-btn");
if (favBtn) favBtn.classList.remove("active");
loadImages();
});
}
}
+42
View File
@@ -17,6 +17,7 @@ const LANGUAGES = {
test: "Test",
copy: "Copy",
close: "Close",
clearFilters: "✕ Clear",
error: "Error",
// -- Tabs --
@@ -468,6 +469,8 @@ const LANGUAGES = {
galleryOutputDirLabel: "Output Folder Path",
galleryOutputDirHint: "Set the ComfyUI output folder to browse in the Gallery tab. Leave blank to use ComfyUI's default output directory.",
gallerySelectImageFirst: "Please select an image first",
galleryNoLoadImageNode: "No LoadImage node in current workflow",
gallerySentGenUI: "Sent to GenerateUI Image tab",
galleryNoEmbeddedWorkflow: "No ComfyUI workflow embedded in this image.",
galleryBulkSelected: "selected",
galleryBulkDeselectAll: "Deselect All",
@@ -481,6 +484,15 @@ const LANGUAGES = {
galleryBulkMoveTo: "Move To...",
galleryBulkExport: "Export",
galleryBulkDelete: "Delete File",
nodesBulkSelected: "selected",
nodesBulkDeselect: "Deselect All",
nodesBulkAddToGroup: "Select Group",
nodesBulkGroupAdd: "Add to Group",
nodesBulkGroupRemove: "Remove from Group",
nodesBulkNewGroup: "New Group Name",
nodesBulkCreateAdd: "Create & Add",
nodesBulkFavAll: "★ Favorite All",
nodesBulkUnfavAll: "☆ Unfavorite All",
downloadStarted: "Download started",
exportCompleted: "Export completed. ZIP file is downloading.",
@@ -667,6 +679,7 @@ const LANGUAGES = {
helpNodes4: "Create, rename, delete node groups and assign/remove nodes",
helpNodes5: "Side panel: Details (class name, package, category, description, flags), I/O Spec (inputs/outputs with types and defaults), Groups management",
helpNodes6: "Node Sets: create reusable node collections with descriptions, tags, and link definitions between nodes",
helpNodes7: "Multi-select: Ctrl+click to toggle individual nodes, Shift+click for range selection; bulk action bar appears with add to group / remove from group / create & add group / bulk favorite / unfavorite",
helpModels1: "Browse installed models: Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder, Hypernetwork, Embedding with sub-tab switching",
helpModels2: "Thumbnail and Table view modes with pagination; Table view shows Type and Base Model columns sourced from CivitAI data alongside filename, subdirectory, and extension; column headers are clickable to sort — click once for ascending (▲), again for descending (▼), a third time to clear the sort; the E/D column sorts by enable/disable status",
helpModels3: "Search, tag filter, group filter, favorites filter, and status filter (All / Enabled only / Disabled only)",
@@ -696,6 +709,7 @@ const LANGUAGES = {
helpGallery14: "Tagger button (purple, in the detail panel action row): opens the selected image directly in the Tagger tab's Single mode for instant tagging",
helpGallery15: "F button (cyan overlay, top-left of each thumbnail): toggle the image in/out of the __Feeder__ group with a single click; cyan and always visible when in group, visible on hover only when not; quickly queue images for the Feeder tab Gallery mode",
helpGallery16: "Image Edit button (toolbar, next to Refresh): sends the currently selected image to the Image Edit tab; if layers already exist the image is added as a new layer scaled to fit the canvas, otherwise it becomes Layer 1",
helpGallery17: "Send GenUI Image button (toolbar, next to Image Edit): uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded first",
// -- Tagger Tab --
helpTaggerTitle: "Tagger Tab",
@@ -971,6 +985,7 @@ const LANGUAGES = {
test: "テスト",
copy: "コピー",
close: "閉じる",
clearFilters: "✕ クリア",
error: "エラー",
// -- Tabs --
@@ -1422,6 +1437,8 @@ const LANGUAGES = {
galleryOutputDirLabel: "Outputフォルダのパス",
galleryOutputDirHint: "ギャラリータブで参照するComfyUIのoutputフォルダを設定します。空欄の場合はComfyUIのデフォルトoutputディレクトリを使用します。",
gallerySelectImageFirst: "先に画像を選択してください",
galleryNoLoadImageNode: "現在のワークフローにLoadImageノードがありません",
gallerySentGenUI: "GenerateUI Imageタブへ送信しました",
galleryNoEmbeddedWorkflow: "この画像にはComfyUIワークフローが埋め込まれていません。",
galleryBulkSelected: "件選択中",
galleryBulkDeselectAll: "選択解除",
@@ -1435,6 +1452,15 @@ const LANGUAGES = {
galleryBulkMoveTo: "移動先...",
galleryBulkExport: "エクスポート",
galleryBulkDelete: "ファイル削除",
nodesBulkSelected: "件選択中",
nodesBulkDeselect: "選択解除",
nodesBulkAddToGroup: "グループ選択",
nodesBulkGroupAdd: "グループに追加",
nodesBulkGroupRemove: "グループから削除",
nodesBulkNewGroup: "新しいグループ名",
nodesBulkCreateAdd: "作成して追加",
nodesBulkFavAll: "★ お気に入り追加(全件)",
nodesBulkUnfavAll: "☆ お気に入り解除(全件)",
downloadStarted: "ダウンロード開始",
exportCompleted: "エクスポート完了。ZIPファイルをダウンロード中です。",
@@ -1621,6 +1647,7 @@ const LANGUAGES = {
helpNodes4: "ノードグループの作成・名前変更・削除、ノードの割り当て・解除",
helpNodes5: "サイドパネル:詳細(クラス名、パッケージ、カテゴリ、説明、フラグ)、I/O仕様(入出力の型・デフォルト値)、グループ管理",
helpNodes6: "ノードセット:再利用可能なノードコレクションの作成(説明、タグ、ノード間リンク定義付き)",
helpNodes7: "複数選択:Ctrl+クリックで個別トグル、Shift+クリックで範囲選択;一括操作バーでグループへの追加・削除・新規作成して追加・お気に入り一括登録/解除が可能",
helpModels1: "インストール済みモデルの閲覧:Checkpoint、LoRA、VAE、ControlNet、UNET、TextEncoder、Hypernetwork、Embeddingをサブタブで切り替え",
helpModels2: "サムネイル / テーブル表示モード切り替え(ページネーション付き)。テーブル表示ではファイル名・サブフォルダ・拡張子に加えCivitAI由来のType / Base Model列を表示。列ヘッダーをクリックでソート — 1回で昇順(▲)、2回で降順(▼)、3回でソート解除。E/D列は有効/無効状態でソート",
helpModels3: "検索、タグフィルタ、グループフィルタ、お気に入りフィルタ、ステータスフィルタ(すべて / 有効のみ / 無効のみ)",
@@ -1650,6 +1677,7 @@ const LANGUAGES = {
helpGallery14: "Taggerボタン(紫、詳細パネルのアクション行):選択画像をTaggerタブのSingleモードで直接開き、即座にタグ付けを開始できる",
helpGallery15: "Fボタン(シアン色オーバーレイ、各サムネイル左上):クリック一つで画像を __Feeder__ グループに追加/削除;グループ内の場合は常にシアン色で表示、非グループ時はホバー時のみ表示;FeederタブのGalleryモードへ素早く画像を追加できる",
helpGallery16: "Image Editボタン(ツールバー、Refreshボタン横):選択中の画像をImage Editタブに送信;既にレイヤーが存在する場合はキャンバスに合わせてスケールして新規レイヤーとして追加、存在しない場合はLayer 1になる",
helpGallery17: "Send GenUI Imageボタン(ツールバー、Image Editボタン横):選択画像をComfyUIにアップロードし、GenerateUIタブの最初のLoadImageノードへ入力として設定;GenerateUI → Input → Imageへ自動切り替え;事前にLoadImageノードを含むワークフローの読み込みが必要",
// -- Tagger Tab --
helpTaggerTitle: "Taggerタブ",
@@ -1924,6 +1952,7 @@ const LANGUAGES = {
test: "测试",
copy: "复制",
close: "关闭",
clearFilters: "✕ 清除",
error: "错误",
// -- Tabs --
@@ -2375,6 +2404,8 @@ const LANGUAGES = {
galleryOutputDirLabel: "输出文件夹路径",
galleryOutputDirHint: "设置图库标签页浏览的ComfyUI输出文件夹。留空则使用ComfyUI默认输出目录。",
gallerySelectImageFirst: "请先选择图像",
galleryNoLoadImageNode: "当前工作流中没有LoadImage节点",
gallerySentGenUI: "已发送至GenerateUI图像标签",
galleryNoEmbeddedWorkflow: "此图像中未嵌入ComfyUI工作流。",
galleryBulkSelected: "项已选择",
galleryBulkDeselectAll: "取消全选",
@@ -2388,6 +2419,15 @@ const LANGUAGES = {
galleryBulkMoveTo: "移动到...",
galleryBulkExport: "导出",
galleryBulkDelete: "删除文件",
nodesBulkSelected: "项已选择",
nodesBulkDeselect: "取消全选",
nodesBulkAddToGroup: "选择分组",
nodesBulkGroupAdd: "添加到分组",
nodesBulkGroupRemove: "从分组中删除",
nodesBulkNewGroup: "新建分组名称",
nodesBulkCreateAdd: "创建并添加",
nodesBulkFavAll: "★ 全部收藏",
nodesBulkUnfavAll: "☆ 全部取消收藏",
downloadStarted: "下载开始",
exportCompleted: "导出完成。正在下载 ZIP 文件。",
@@ -2574,6 +2614,7 @@ const LANGUAGES = {
helpNodes4: "创建、重命名、删除节点组,分配/移除节点",
helpNodes5: "侧面板:详情(类名、包、分类、描述、标志)、I/O规格(输入输出类型和默认值)、组管理",
helpNodes6: "节点集:创建可复用的节点集合(含描述、标签、节点间链接定义)",
helpNodes7: "多选:Ctrl+点击切换单个节点,Shift+点击范围选择;出现批量操作栏,可添加到组/从组移除/新建组并添加/批量收藏/取消收藏",
helpModels1: "浏览已安装模型:Checkpoint、LoRA、VAE、ControlNet、UNET、TextEncoder、Hypernetwork、Embedding,通过子标签切换",
helpModels2: "缩略图和表格视图模式切换(带分页)。表格视图除文件名、子文件夹和扩展名外,还显示来自CivitAI数据的Type / Base Model列。点击列标题可排序 — 第一次升序(▲),第二次降序(▼),第三次取消排序。E/D列按启用/禁用状态排序",
helpModels3: "搜索、标签筛选、分组筛选、收藏筛选、状态筛选(全部 / 仅启用 / 仅禁用)",
@@ -2603,6 +2644,7 @@ const LANGUAGES = {
helpGallery14: "Tagger按钮(紫色,位于详情面板操作行):将所选图像直接在Tagger标签的Single模式中打开,即可立即进行标注",
helpGallery15: "F按钮(青色悬浮按钮,每个缩略图左上角):单击即可将图像添加到/从__Feeder__组中移除;图像在组中时始终显示青色,不在组中时仅悬停时可见;可快速为Feeder标签Gallery模式添加队列图像",
helpGallery16: "Image Edit按钮(工具栏,Refresh按钮旁):将当前选中的图像发送到Image Edit标签;如果已有图层则按比例缩放添加为新图层,否则将成为Layer 1",
helpGallery17: "Send GenUI Image按钮(工具栏,Image Edit按钮旁):将选中图像上传至ComfyUI并设置为GenerateUI标签中第一个LoadImage节点的输入;自动切换至GenerateUI → Input → Image;需要预先加载包含至少一个LoadImage节点的工作流",
// -- Tagger Tab --
helpTaggerTitle: "Tagger标签",
+37 -1
View File
@@ -7,7 +7,7 @@ import { showToast, openModal, closeModal } from "./app.js";
import { t } from "./i18n.js";
import { comfyUI } from "./comfyui-client.js";
import { comfyEditor } from "./comfyui-editor.js";
import { escapeHtml, readJsonStorage } from "./util.js";
import { escapeHtml, readJsonStorage, setupSearchClearBtn } from "./util.js";
// ── Constants ─────────────────────────────────────────────
const RESERVED_GROUPS = ["Batch", "Stack"];
@@ -2319,6 +2319,11 @@ export function initModelsTab() {
renderModelGrid();
});
}
setupSearchClearBtn("wfm-models-search", "wfm-models-search-clear-btn", () => {
state.searchText = "";
state.currentPage = 0;
renderModelGrid();
});
// Tag filter
document.getElementById("wfm-models-tag-filter")?.addEventListener("change", (e) => {
@@ -2404,6 +2409,37 @@ export function initModelsTab() {
clearStackGroup();
});
// Clear filters button
const modelsClearBtn = document.getElementById("wfm-models-clear-filters-btn");
if (modelsClearBtn) {
modelsClearBtn.textContent = t("clearFilters");
modelsClearBtn.addEventListener("click", () => {
state.searchText = "";
state.tagFilter = "";
state.dirFilter = "";
state.groupFilter = "";
state.statusFilter = "all";
state.showFavoritesOnly = false;
state.showBatchOnly = false;
state.currentPage = 0;
const searchInput = document.getElementById("wfm-models-search");
if (searchInput) searchInput.value = "";
const tagFilter = document.getElementById("wfm-models-tag-filter");
if (tagFilter) tagFilter.value = "";
const dirFilter = document.getElementById("wfm-models-dir-filter");
if (dirFilter) dirFilter.value = "";
const groupFilter = document.getElementById("wfm-models-group-filter");
if (groupFilter) groupFilter.value = "";
const statusFilter = document.getElementById("wfm-models-status-filter");
if (statusFilter) statusFilter.value = "all";
const favBtn = document.getElementById("wfm-models-fav-btn");
if (favBtn) favBtn.classList.remove("active");
const batchFilterBtn = document.getElementById("wfm-models-batch-filter-btn");
if (batchFilterBtn) batchFilterBtn.classList.remove("active");
renderModelGrid();
});
}
// View mode (thumb / card / table)
document.querySelectorAll("[data-models-view]").forEach((btn) => {
if (btn.dataset.modelsView === state.viewMode) {
+238 -3
View File
@@ -5,7 +5,7 @@
import { showToast } from "./app.js";
import { comfyUI } from "./comfyui-client.js";
import { t } from "./i18n.js";
import { escapeHtml } from "./util.js";
import { escapeHtml, setupSearchClearBtn } from "./util.js";
// ── State ─────────────────────────────────────────────────
@@ -26,6 +26,8 @@ const state = {
activeSubView: "browser",
loaded: false,
currentPage: 0,
selectedNodes: new Set(),
lastSelectionIndex: -1,
};
// ── Helpers ───────────────────────────────────────────────
@@ -273,6 +275,9 @@ function createNodeCard(node) {
if (state.selectedNode && state.selectedNode.name === node.name) {
card.classList.add("wfm-card-selected");
}
if (state.selectedNodes.has(node.name)) {
card.classList.add("multi-selected");
}
card.dataset.nodeName = node.name;
card.style.borderLeft = `3px solid ${packageColor(node.package)}`;
@@ -294,7 +299,32 @@ function createNodeCard(node) {
e.stopPropagation();
toggleFavorite(node.name, e.currentTarget);
});
card.addEventListener("click", () => showNodeSidePanel(node));
card.addEventListener("click", (e) => {
const filtered = filterNodes();
const idx = filtered.findIndex(n => n.name === node.name);
if (e.shiftKey && state.lastSelectionIndex !== -1) {
const from = Math.min(state.lastSelectionIndex, idx);
const to = Math.max(state.lastSelectionIndex, idx);
for (let i = from; i <= to; i++) {
state.selectedNodes.add(filtered[i].name);
}
_applyNodeSelectionToDOM();
updateNodeBulkBar();
} else if (e.ctrlKey || e.metaKey) {
if (state.selectedNodes.has(node.name)) {
state.selectedNodes.delete(node.name);
card.classList.remove("multi-selected");
} else {
state.selectedNodes.add(node.name);
card.classList.add("multi-selected");
}
state.lastSelectionIndex = idx;
updateNodeBulkBar();
} else {
state.lastSelectionIndex = idx;
showNodeSidePanel(node);
}
});
return card;
}
@@ -319,6 +349,9 @@ function renderNodeTableView(grid, filtered) {
if (state.selectedNode && state.selectedNode.name === node.name) {
tr.classList.add("wfm-card-selected");
}
if (state.selectedNodes.has(node.name)) {
tr.classList.add("multi-selected");
}
const inputCount = Object.keys(node.input.required || {}).length +
Object.keys(node.input.optional || {}).length;
const outputCount = (node.output || []).length;
@@ -332,7 +365,31 @@ function renderNodeTableView(grid, filtered) {
e.stopPropagation();
toggleFavorite(node.name, e.currentTarget);
});
tr.addEventListener("click", () => showNodeSidePanel(node));
tr.addEventListener("click", (e) => {
const idx = filtered.findIndex(n => n.name === node.name);
if (e.shiftKey && state.lastSelectionIndex !== -1) {
const from = Math.min(state.lastSelectionIndex, idx);
const to = Math.max(state.lastSelectionIndex, idx);
for (let i = from; i <= to; i++) {
state.selectedNodes.add(filtered[i].name);
}
_applyNodeSelectionToDOM();
updateNodeBulkBar();
} else if (e.ctrlKey || e.metaKey) {
if (state.selectedNodes.has(node.name)) {
state.selectedNodes.delete(node.name);
tr.classList.remove("multi-selected");
} else {
state.selectedNodes.add(node.name);
tr.classList.add("multi-selected");
}
state.lastSelectionIndex = idx;
updateNodeBulkBar();
} else {
state.lastSelectionIndex = idx;
showNodeSidePanel(node);
}
});
tbody.appendChild(tr);
});
table.appendChild(tbody);
@@ -351,6 +408,100 @@ async function toggleFavorite(nodeName, btnEl) {
btnEl.classList.toggle("active", newFav);
}
// ── 複数選択ユーティリティ ─────────────────────────────────
function _applyNodeSelectionToDOM() {
const grid = document.getElementById("wfm-nodes-grid");
if (!grid) return;
grid.querySelectorAll("[data-node-name]").forEach(el => {
el.classList.toggle("multi-selected", state.selectedNodes.has(el.dataset.nodeName));
});
}
function updateNodeBulkBar() {
const bar = document.getElementById("wfm-nodes-bulk-bar");
const countEl = document.getElementById("wfm-nodes-bulk-count");
if (!bar) return;
const count = state.selectedNodes.size;
if (count > 0) {
bar.style.display = "";
if (countEl) countEl.textContent = `${count} ${t("nodesBulkSelected")}`;
} else {
bar.style.display = "none";
}
const groupSel = document.getElementById("wfm-nodes-bulk-group-select");
if (groupSel) {
const current = groupSel.value;
const grpNames = Object.keys(state.nodeGroups).sort();
groupSel.innerHTML = `<option value="">${t("nodesBulkAddToGroup")}</option>` +
grpNames.map(g => `<option value="${escapeHtml(g)}">${escapeHtml(g)}</option>`).join("");
if (grpNames.includes(current)) groupSel.value = current;
}
}
// ── 一括操作 ──────────────────────────────────────────────
async function bulkNodeAddToGroup(groupName) {
if (!groupName || state.selectedNodes.size === 0) return;
const nodeNames = [...state.selectedNodes];
if (!state.nodeGroups[groupName]) state.nodeGroups[groupName] = [];
let added = 0;
nodeNames.forEach(name => {
if (!state.nodeGroups[groupName].includes(name)) {
state.nodeGroups[groupName].push(name);
added++;
}
});
await saveNodeGroups(state.nodeGroups);
renderFilters();
if (state.selectedNode) renderSideGroups(state.selectedNode);
showToast(t("addedNImagesToGroup", added, groupName), "success");
}
async function bulkNodeRemoveFromGroup(groupName) {
if (!groupName || state.selectedNodes.size === 0) return;
if (!state.nodeGroups[groupName]) return;
const nodeNames = new Set(state.selectedNodes);
const before = state.nodeGroups[groupName].length;
state.nodeGroups[groupName] = state.nodeGroups[groupName].filter(n => !nodeNames.has(n));
const removed = before - state.nodeGroups[groupName].length;
if (state.nodeGroups[groupName].length === 0) delete state.nodeGroups[groupName];
await saveNodeGroups(state.nodeGroups);
renderFilters();
if (state.selectedNode) renderSideGroups(state.selectedNode);
showToast(t("removedNImagesFromGroup", removed, groupName), "success");
}
async function bulkNodeCreateAndAddToGroup(name) {
if (!name || state.selectedNodes.size === 0) return;
if (state.nodeGroups[name] !== undefined) {
showToast(t("groupExists"), "warning");
return;
}
state.nodeGroups[name] = [...state.selectedNodes];
await saveNodeGroups(state.nodeGroups);
renderFilters();
if (state.selectedNode) renderSideGroups(state.selectedNode);
updateNodeBulkBar();
showToast(t("groupCreated", name), "success");
}
async function bulkNodeSetFavorite(value) {
if (state.selectedNodes.size === 0) return;
const nodeNames = [...state.selectedNodes].filter(name => {
const meta = state.nodeMetadata[name];
return (meta?.favorite ?? false) !== value;
});
if (nodeNames.length === 0) return;
await Promise.all(nodeNames.map(name => saveNodeMetadata(name, { favorite: value })));
nodeNames.forEach(name => {
if (!state.nodeMetadata[name]) state.nodeMetadata[name] = {};
state.nodeMetadata[name].favorite = value;
});
renderNodeGrid();
showToast(value ? t("favoritedNImages", nodeNames.length) : t("unfavoritedNImages", nodeNames.length), "success");
}
// ── Side Panel ────────────────────────────────────────────
function showNodeSidePanel(node) {
@@ -1044,6 +1195,11 @@ export function initNodesTab() {
renderNodeGrid();
});
}
setupSearchClearBtn("wfm-nodes-search", "wfm-nodes-search-clear-btn", () => {
state.searchText = "";
state.currentPage = 0;
renderNodeGrid();
});
// Filters
document.getElementById("wfm-nodes-category-filter")?.addEventListener("change", e => {
@@ -1109,9 +1265,88 @@ export function initNodesTab() {
});
});
// 一括操作バー: テキストをi18nで設定
const bulkDeselBtn = document.getElementById("wfm-nodes-bulk-deselect");
if (bulkDeselBtn) bulkDeselBtn.textContent = t("nodesBulkDeselect");
const bulkGroupAddBtn = document.getElementById("wfm-nodes-bulk-group-add");
if (bulkGroupAddBtn) bulkGroupAddBtn.textContent = t("nodesBulkGroupAdd");
const bulkGroupRemBtn = document.getElementById("wfm-nodes-bulk-group-remove");
if (bulkGroupRemBtn) bulkGroupRemBtn.textContent = t("nodesBulkGroupRemove");
const bulkCreateAddBtn = document.getElementById("wfm-nodes-bulk-create-add");
if (bulkCreateAddBtn) bulkCreateAddBtn.textContent = t("nodesBulkCreateAdd");
const bulkFavBtn = document.getElementById("wfm-nodes-bulk-fav");
if (bulkFavBtn) bulkFavBtn.textContent = t("nodesBulkFavAll");
const bulkUnfavBtn = document.getElementById("wfm-nodes-bulk-unfav");
if (bulkUnfavBtn) bulkUnfavBtn.textContent = t("nodesBulkUnfavAll");
const bulkNewGroupInput = document.getElementById("wfm-nodes-bulk-new-group");
if (bulkNewGroupInput) bulkNewGroupInput.placeholder = t("nodesBulkNewGroup");
document.getElementById("wfm-nodes-bulk-deselect")?.addEventListener("click", () => {
state.selectedNodes.clear();
state.lastSelectionIndex = -1;
updateNodeBulkBar();
document.querySelectorAll("#wfm-nodes-grid .multi-selected").forEach(el => el.classList.remove("multi-selected"));
});
document.getElementById("wfm-nodes-bulk-group-add")?.addEventListener("click", () => {
const sel = document.getElementById("wfm-nodes-bulk-group-select");
if (sel?.value) {
bulkNodeAddToGroup(sel.value);
} else {
showToast(t("selectGroupFirst"), "error");
}
});
document.getElementById("wfm-nodes-bulk-group-remove")?.addEventListener("click", () => {
const sel = document.getElementById("wfm-nodes-bulk-group-select");
if (sel?.value) {
bulkNodeRemoveFromGroup(sel.value);
} else {
showToast(t("selectGroupFirst"), "error");
}
});
document.getElementById("wfm-nodes-bulk-create-add")?.addEventListener("click", () => {
const input = document.getElementById("wfm-nodes-bulk-new-group");
const name = input?.value?.trim();
if (!name) return;
bulkNodeCreateAndAddToGroup(name).then(() => { if (input) input.value = ""; });
});
document.getElementById("wfm-nodes-bulk-fav")?.addEventListener("click", () => bulkNodeSetFavorite(true));
document.getElementById("wfm-nodes-bulk-unfav")?.addEventListener("click", () => bulkNodeSetFavorite(false));
// Create node set button
document.getElementById("wfm-node-set-create-btn")?.addEventListener("click", showCreateSetModal);
// Clear filters button
const nodesClearBtn = document.getElementById("wfm-nodes-clear-filters-btn");
if (nodesClearBtn) {
nodesClearBtn.textContent = t("clearFilters");
nodesClearBtn.addEventListener("click", () => {
state.searchText = "";
state.categoryFilter = "";
state.packageFilter = "";
state.tagFilter = "";
state.groupFilter = "";
state.showFavoritesOnly = false;
state.currentPage = 0;
const searchInput = document.getElementById("wfm-nodes-search");
if (searchInput) searchInput.value = "";
const catFilter = document.getElementById("wfm-nodes-category-filter");
if (catFilter) catFilter.value = "";
const pkgFilter = document.getElementById("wfm-nodes-package-filter");
if (pkgFilter) pkgFilter.value = "";
const tagFilter = document.getElementById("wfm-nodes-tag-filter");
if (tagFilter) tagFilter.value = "";
const grpFilter = document.getElementById("wfm-nodes-group-filter");
if (grpFilter) grpFilter.value = "";
const favBtn = document.getElementById("wfm-nodes-fav-btn");
if (favBtn) favBtn.classList.remove("active");
renderNodeGrid();
});
}
// Lazy load on first tab click
document.querySelector('[data-tab="nodes"]')?.addEventListener("click", () => {
if (!state.loaded) loadNodesData();
+27
View File
@@ -26,3 +26,30 @@ export function readJsonStorage(key, fallback = {}) {
export function getSettings() {
return readJsonStorage("wfm_settings");
}
/**
* 検索inputにオーバーレイXボタンを設定する。
* @param {string} inputId - 検索inputのID
* @param {string} clearBtnId - クリアボタンのID
* @param {Function} onClear - クリア時に呼び出すコールバック(inputは既に空になった後で呼ばれる)
*/
export function setupSearchClearBtn(inputId, clearBtnId, onClear) {
const input = document.getElementById(inputId);
const btn = document.getElementById(clearBtnId);
if (!input || !btn) return;
const sync = () => {
btn.style.display = input.value ? "flex" : "none";
};
input.addEventListener("input", sync);
btn.addEventListener("click", () => {
input.value = "";
btn.style.display = "none";
input.focus();
onClear();
});
// 初期値が入っている場合に備えて同期
sync();
}
+25 -1
View File
@@ -10,7 +10,7 @@ import { loadWorkflowIntoEditor } from "./generate-tab.js";
import { t, getSummaryPrompt } from "./i18n.js";
import { highlightJSON } from "./json-highlight.js";
import { openBadgeEditModal } from "./models-tab.js";
import { escapeHtml, getSettings, readJsonStorage } from "./util.js";
import { escapeHtml, getSettings, readJsonStorage, setupSearchClearBtn } from "./util.js";
// ============================================
// Constants
@@ -1227,6 +1227,11 @@ export function initWorkflowTab() {
renderGrid();
});
}
setupSearchClearBtn("wfm-search", "wfm-search-clear-btn", () => {
state.searchText = "";
state.currentPage = 0;
renderGrid();
});
// Drag & drop on workflow grid
const grid = document.getElementById("wfm-workflow-grid");
@@ -1354,6 +1359,25 @@ export function initWorkflowTab() {
clearBatch();
});
// Toolbar: Clear filters button
const wfClearBtn = document.getElementById("wfm-wf-clear-filters-btn");
if (wfClearBtn) {
wfClearBtn.textContent = t("clearFilters");
wfClearBtn.addEventListener("click", () => {
state.activeBadge = "ALL";
state.showBatchOnly = false;
state.searchText = "";
state.groupFilter = "";
state.currentPage = 0;
const searchInput = document.getElementById("wfm-search");
if (searchInput) searchInput.value = "";
const groupFilter = document.getElementById("wfm-group-filter");
if (groupFilter) groupFilter.value = "";
renderModelFilters();
renderGrid();
});
}
// Initial load
loadWorkflows();
}
+39 -4
View File
@@ -46,7 +46,10 @@
</div>
<!-- Row 2: Search, group filter, actions -->
<div class="wfm-toolbar-row">
<input type="text" id="wfm-search" class="wfm-search-input" placeholder="Search...">
<div class="wfm-search-wrap">
<input type="text" id="wfm-search" class="wfm-search-input" placeholder="Search...">
<button class="wfm-search-clear-btn" id="wfm-search-clear-btn" title="Clear search">✕</button>
</div>
<select id="wfm-group-filter" class="wfm-select wfm-toolbar-select">
<option value="">All Groups</option>
</select>
@@ -67,6 +70,7 @@
<div id="wfm-badge-settings-panel" class="wfm-badge-settings-panel" style="display:none;"></div>
</div>
<button id="wfm-wf-batch-clear-btn" class="wfm-btn wfm-btn-sm" title="Clear all batch workflows">BC</button>
<button id="wfm-wf-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
</div>
</div>
<div class="wfm-workflow-area">
@@ -124,7 +128,10 @@
<!-- Browser toolbar -->
<div id="wfm-nodes-browser-toolbar" class="wfm-toolbar-row" style="gap:6px;flex-wrap:wrap;">
<button class="wfm-filter-btn" id="wfm-nodes-fav-btn" title="Favorites">&#9733;</button>
<input type="text" id="wfm-nodes-search" class="wfm-search-input" placeholder="Search nodes...">
<div class="wfm-search-wrap">
<input type="text" id="wfm-nodes-search" class="wfm-search-input" placeholder="Search nodes...">
<button class="wfm-search-clear-btn" id="wfm-nodes-search-clear-btn" title="Clear search">✕</button>
</div>
<select id="wfm-nodes-category-filter" class="wfm-select wfm-toolbar-select"><option value="">All Categories</option></select>
<select id="wfm-nodes-package-filter" class="wfm-select wfm-toolbar-select"><option value="">All Packages</option></select>
<select id="wfm-nodes-tag-filter" class="wfm-select wfm-toolbar-select"><option value="">All Tags</option></select>
@@ -135,9 +142,26 @@
</div>
<span id="wfm-nodes-count" class="wfm-nodes-count"></span>
<button id="wfm-nodes-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh</button>
<button id="wfm-nodes-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
</div>
</div>
<!-- 複数選択時の一括操作バー(ブラウザエリア外に配置) -->
<div id="wfm-nodes-bulk-bar" class="wfm-gallery-bulk-bar" style="display:none;">
<span id="wfm-nodes-bulk-count" class="wfm-gallery-bulk-count"></span>
<button id="wfm-nodes-bulk-deselect" class="wfm-btn wfm-btn-sm"></button>
<span style="border-left:1px solid var(--wfm-border);height:18px;margin:0 2px;"></span>
<select id="wfm-nodes-bulk-group-select" class="wfm-select" style="font-size:12px;padding:2px 4px;max-width:140px;"></select>
<button id="wfm-nodes-bulk-group-add" class="wfm-btn wfm-btn-sm"></button>
<button id="wfm-nodes-bulk-group-remove" class="wfm-btn wfm-btn-sm"></button>
<span style="border-left:1px solid var(--wfm-border);height:18px;margin:0 2px;"></span>
<input type="text" id="wfm-nodes-bulk-new-group" class="wfm-input" style="font-size:12px;padding:2px 6px;width:130px;">
<button id="wfm-nodes-bulk-create-add" class="wfm-btn wfm-btn-sm"></button>
<span style="border-left:1px solid var(--wfm-border);height:18px;margin:0 2px;"></span>
<button id="wfm-nodes-bulk-fav" class="wfm-btn wfm-btn-sm"></button>
<button id="wfm-nodes-bulk-unfav" class="wfm-btn wfm-btn-sm"></button>
</div>
<!-- Browser sub-view -->
<div id="wfm-nodes-browser" class="wfm-workflow-area">
<div id="wfm-nodes-grid" class="wfm-grid wfm-view-card">
@@ -195,7 +219,10 @@
<div id="wfm-models-toolbar" class="wfm-toolbar-row" style="gap:6px;flex-wrap:wrap;">
<button class="wfm-filter-btn" id="wfm-models-fav-btn" title="Favorites">&#9733;</button>
<button class="wfm-filter-btn" id="wfm-models-batch-filter-btn" title="Batch">B</button>
<input type="text" id="wfm-models-search" class="wfm-search-input" placeholder="Search models...">
<div class="wfm-search-wrap">
<input type="text" id="wfm-models-search" class="wfm-search-input" placeholder="Search models...">
<button class="wfm-search-clear-btn" id="wfm-models-search-clear-btn" title="Clear search">✕</button>
</div>
<select id="wfm-models-tag-filter" class="wfm-select wfm-toolbar-select"><option value="">All Tags</option></select>
<select id="wfm-models-dir-filter" class="wfm-select wfm-toolbar-select"><option value="">All Folders</option></select>
<select id="wfm-models-group-filter" class="wfm-select wfm-toolbar-select"><option value="">All Groups</option></select>
@@ -216,6 +243,7 @@
<button id="wfm-models-select-btn" class="wfm-btn wfm-btn-sm wfm-btn-success" title="Multi-select models">Select</button>
<button id="wfm-models-batch-clear-btn" class="wfm-btn wfm-btn-sm" title="Clear all batch entries">BC</button>
<button id="wfm-models-stack-clear-btn" class="wfm-btn wfm-btn-sm" title="Clear all stack entries (Lora)">SC</button>
<button id="wfm-models-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
</div>
<!-- Bulk action bar (shown in select mode) -->
<div id="wfm-models-bulk-bar" class="wfm-bulk-bar" style="display:none;"></div>
@@ -1172,6 +1200,7 @@
<li id="wfm-help-nodes-4">Create, rename, delete node groups and assign/remove nodes</li>
<li id="wfm-help-nodes-5">Side panel: Details (class name, package, category, description, flags), I/O Spec (inputs/outputs with types and defaults), Groups management</li>
<li id="wfm-help-nodes-6">Node Sets: create reusable node collections with descriptions, tags, and link definitions between nodes</li>
<li id="wfm-help-nodes-7">Multi-select: Ctrl+click to toggle individual nodes, Shift+click for range selection; bulk action bar appears with add to group / remove from group / create &amp; add group / bulk favorite / unfavorite</li>
</ul>
</div>
</div>
@@ -1196,6 +1225,7 @@
<li id="wfm-help-gallery-13"><b>Load GenUI</b> button (blue, in the detail panel tab bar): loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab and switches to it; shows a warning toast if no workflow is embedded or the format is not supported</li>
<li id="wfm-help-gallery-14"><b>Tagger</b> button (purple, in the detail panel action row): opens the selected image directly in the Tagger tab's Single mode for instant tagging</li>
<li id="wfm-help-gallery-16"><b>Image Edit</b> button (toolbar, next to Refresh): sends the currently selected image to the Image Edit tab; if layers already exist the image is added as a new layer scaled to fit the canvas, otherwise it becomes Layer 1</li>
<li id="wfm-help-gallery-17"><b>Send GenUI Image</b> button (toolbar, next to Image Edit): uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded first</li>
</ul>
</div>
</div>
@@ -1465,7 +1495,10 @@
<div class="wfm-toolbar">
<div class="wfm-toolbar-row" style="gap:6px;flex-wrap:wrap;align-items:center;">
<button id="wfm-gallery-fav-btn" class="wfm-filter-btn" title="Favorites">&#9733;</button>
<input type="text" id="wfm-gallery-search" class="wfm-search-input" placeholder="Search images...">
<div class="wfm-search-wrap">
<input type="text" id="wfm-gallery-search" class="wfm-search-input" placeholder="Search images...">
<button class="wfm-search-clear-btn" id="wfm-gallery-search-clear-btn" title="Clear search">✕</button>
</div>
<select id="wfm-gallery-tag-filter" class="wfm-select wfm-toolbar-select">
<option value="">All Tags</option>
</select>
@@ -1486,6 +1519,8 @@
<span id="wfm-gallery-count" class="wfm-nodes-count"></span>
<button id="wfm-gallery-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh</button>
<button id="wfm-gallery-send-image-edit-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to Image Edit tab">Image Edit</button>
<button id="wfm-gallery-send-genui-image-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to GenerateUI Image input">Send GenUI Image</button>
<button id="wfm-gallery-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
</div>
<!-- 複数選択時の一括操作バー -->
<div id="wfm-gallery-bulk-bar" class="wfm-gallery-bulk-bar" style="display:none;">
+1 -1
View File
@@ -408,7 +408,7 @@ const placePromptNode = (posText, negText, promptName, pos) => {
}
node.pos = pos || [100, 100];
if (promptName) node.title = promptName;
node.title = "Wfs Prompt";
graph.add(node);