Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be66dc3d5a | ||
|
|
5a3d69fe14 | ||
|
|
8c5fce77c5 | ||
|
|
7360b17842 |
@@ -1,5 +1,200 @@
|
||||
# DEVLOG - ComfyUI-Workflow-Studio
|
||||
|
||||
## 2026-06-26: v0.3.56 — Style機能追加(GenerateUI ツールバー & Batchタブ)
|
||||
|
||||
**変更ファイル**: `py/routes/settings_routes.py`, `static/js/generate-tab.js`, `templates/index.html`, `README.md`
|
||||
|
||||
### 概要
|
||||
|
||||
Fooocus形式(`{name, prompt, negative_prompt}`)のスタイルJSONを生成時に自動適用する機能を追加。`user/default/Workflow-Studio/style/` に置いた `*.json` ファイルをすべて読み込んでドロップダウンに表示し、ポジティブ/ネガティブプロンプトへ適用する。ワークフロー本体は変更せず生成ごとのコピーにのみ適用される。
|
||||
|
||||
---
|
||||
|
||||
### バックエンド
|
||||
|
||||
#### `py/routes/settings_routes.py`
|
||||
|
||||
- **`GET /api/wfm/styles`** を追加
|
||||
- `DATA_DIR/style/*.json` をファイル名順に読み込み、各ファイルの配列を結合して返す
|
||||
- ファイル読み込みに失敗した場合はその1ファイルをスキップしてログを出力(全体のエラーにはしない)
|
||||
|
||||
---
|
||||
|
||||
### フロントエンド
|
||||
|
||||
#### `static/js/generate-tab.js`
|
||||
|
||||
**スタイル管理**
|
||||
|
||||
- `_stylesData` — ロードしたスタイルオブジェクト配列(`{name, prompt?, negative_prompt?}`)
|
||||
- `_batchStyleSelected` — Batchタブで選択中のスタイル名 Set
|
||||
- `_batchStyleOverride` — Styleバッチ実行中に適用スタイルを一時的に上書きする変数(`null` のとき通常モード)
|
||||
|
||||
**追加関数**
|
||||
|
||||
| 関数 | 概要 |
|
||||
|---|---|
|
||||
| `_loadStyles()` | `/api/wfm/styles` を取得しドロップダウンとバッチリストを更新 |
|
||||
| `_renderStyleDropdown()` | ツールバーの `#wfm-style-select` をスタイル名で再描画 |
|
||||
| `_rebuildStyleList()` | `_buildSimpleGroupList` を使って左ペインのスタイル一覧を描画 |
|
||||
| `_applyNamedStyle(workflow, style)` | プロンプトノードにスタイルを適用したワークフローのコピーを返す共通ロジック |
|
||||
| `_applyStyleToWorkflow(workflow)` | バッチ上書きがあればそれを優先、なければツールバー設定を参照して `_applyNamedStyle` を呼ぶ |
|
||||
|
||||
**適用ロジック(`_applyNamedStyle`)**
|
||||
|
||||
- ポジティブノード: `style.prompt` に `{prompt}` が含まれる場合は置換、含まれない場合は `元のプロンプト, スタイルプロンプト` で連結
|
||||
- ネガティブノード: `style.negative_prompt` を元のネガティブプロンプトの末尾に `, ` で連結
|
||||
- ワークフローコピー(`JSON.parse(JSON.stringify(workflow))`)に対して操作するため、`comfyUI.currentWorkflow` は変更されない
|
||||
|
||||
**既存関数の変更**
|
||||
|
||||
- `_coreGenerate()`: ワイルドカード展開後に `_applyStyleToWorkflow()` を呼ぶよう変更(変数名 `workflowForGenerate` → `workflowExpanded` → `workflowForGenerate` の2段階に分割)
|
||||
- `_updateBatchTypeLabel()`: `labels` マップに `style: "Style"` を追加
|
||||
- `_renderBatchPreview()`: Style列の更新を追加(`wfm-batch-style-count` / `wfm-batch-style-preview-list`)
|
||||
- `initBatchTab()`: Styleタブ切り替え時に `_rebuildStyleList()` を呼ぶよう追加、All/Noneボタン(`wfm-style-batch-select-all` / `wfm-style-batch-deselect-all`)のイベントリスナーを追加、Batchタブ表示時に `_rebuildStyleList()` を追加
|
||||
- `initGenerateTab()`: 初期化時に `await _loadStyles()` を追加
|
||||
- `_runBatchGenerate()`: `case "style"` を追加 — 選択スタイルを `_batchStyleOverride` にセットして `_runBatchLoop` を実行、finally で `_batchStyleOverride = null` にリセット
|
||||
|
||||
---
|
||||
|
||||
#### `templates/index.html`
|
||||
|
||||
**ツールバー(Styleセレクター)**
|
||||
|
||||
Reset Workflow ボタンの右隣に以下を追加:
|
||||
- `<label id="wfm-style-label">` + `<input type="checkbox" id="wfm-style-enabled">` — Style の有効/無効チェックボックス
|
||||
- `<select id="wfm-style-select">` — スタイルドロップダウン(`min-width:120px / max-width:220px`)
|
||||
|
||||
**Batchタブ左ペイン**
|
||||
|
||||
- `wfm-batch-left-tab-nav` に `<button data-left-tab="style">Style</button>` を追加
|
||||
- `wfm-batch-left-style` コンテンツを追加(All/Noneボタン + `wfm-batch-style-list`)
|
||||
|
||||
**Batchタブ Batch Queue(右ペイン)**
|
||||
|
||||
- Style 列を追加(`wfm-batch-style-count` / `wfm-batch-style-preview-list` / `data-batch-type="style"` チェックボックス)
|
||||
|
||||
**ヘルプ**
|
||||
|
||||
- `wfm-help-gen-2`: ツールバーへのStyle追加とスタイルファイルパス・適用ロジックを追記
|
||||
- `wfm-help-gen-12`: 左ペインのタブ数 3→4、Styleタブの説明を追記
|
||||
- `wfm-help-gen-14`: Batch Queue の列数 6→7 に更新
|
||||
- `wfm-help-gen-17`(新規): Styleバッチ専用の説明を追加
|
||||
|
||||
---
|
||||
|
||||
### スタイルファイル仕様
|
||||
|
||||
`user/default/Workflow-Studio/style/` 配下の任意の `*.json`(複数可)を配置する。各ファイルはオブジェクトの配列形式で、以下のフィールドを持つ:
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"name": "スタイル名",
|
||||
"prompt": "スタイルプロンプト({prompt} プレースホルダー使用可)",
|
||||
"negative_prompt": "ネガティブプロンプト"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
`prompt` / `negative_prompt` はいずれも省略可能。Fooocusの `sdxl_styles_*.json` 形式をそのまま使用できる。
|
||||
|
||||
---
|
||||
|
||||
## 2026-06-25: v0.3.55 — グループ機能バグ修正(全タブ)
|
||||
|
||||
**変更ファイル**: `py/services/models_service.py`, `static/js/models-tab.js`, `static/js/generate-tab.js`, `static/js/prompt-tab.js`, `static/js/i18n.js`
|
||||
|
||||
### 根本原因(データ消失): パス区切り文字の不一致
|
||||
|
||||
Windows 環境で ComfyUI が返す Checkpoint/LoRA 名はバックスラッシュ区切り(例: `Illustrious\\model.safetensors`)だが、バックエンドの `_scan_model_names` はフォワードスラッシュで正規化するため、グループ保存時にサブディレクトリ内モデルが「存在しない」と判定され全件削除・上書き保存されていた。
|
||||
|
||||
**修正箇所**
|
||||
|
||||
#### `py/services/models_service.py`
|
||||
|
||||
- **パス正規化**: `get_model_groups` でメンバー名を比較前にバックスラッシュ→フォワードスラッシュへ正規化。`save_model_groups` でも保存時に正規化し、以後バックスラッシュが混入しない
|
||||
- **ネットワークドライブ保護**: モデルディレクトリが1つもアクセスできない場合(外付けHDD切断・ネットワークドライブ未接続等)はクリーンアップをスキップし、グループ全消去を防止
|
||||
- **スキャンキャッシュ**: `_scan_model_names` に 30秒 TTL キャッシュを追加。起動時の多重スキャン(モデルタブ + 生成UIタブ)による高負荷を軽減
|
||||
|
||||
#### `static/js/models-tab.js`
|
||||
|
||||
- **`bulkRemoveFromGroup`**: RESERVED_GROUPS(Batch/Stack)の最後のメンバーを削除しても、キーごと消えないよう保護
|
||||
- **`renderGroupFilter`**: グループ削除後に `state.groupFilter` が削除済みグループを指したままモデルが全件非表示になるバグを修正(削除検出時に自動リセット)
|
||||
- **`toggleGroupEnable`**: グループ一括 enable/disable の部分失敗時、失敗したモデルもクライアント側で成功扱いになりサーバーと状態が乖離していた → `data.ok` リストのモデルのみ更新
|
||||
|
||||
#### `static/js/generate-tab.js`
|
||||
|
||||
- **Checkpoint/LoRA/Prompt/Workflow 全バッチグループ**: v0.3.55 で誤って追加した予約グループ(Batch/Stack)除外フィルターを削除 → Batch/Stack グループはバッチ実行UIに表示され正常に選択可能
|
||||
- **LoRA グループ**: API取得後にバックスラッシュ→フォワードスラッシュ正規化を追加(Checkpoint 修正と同等)
|
||||
- **`batchComplete` トースト**: 英語ハードコード文字列を削除し `t("batchComplete", ...)` に変更
|
||||
|
||||
#### `static/js/prompt-tab.js`
|
||||
|
||||
- **`migrateLocalStoragePresets`**: localStorage→API 移行時に `negText`(ネガティブプロンプト)が完全消失していたバグを修正
|
||||
- **`renderPmGroups`**: グループビューでメンバーを全削除したとき、Batch 予約グループがキーごと消失していたのを保護
|
||||
|
||||
#### `static/js/i18n.js`
|
||||
|
||||
- `batchComplete` キーを英語・日本語・中国語に追加
|
||||
|
||||
#### ヘルプタブ — Image Edit i18n 対応
|
||||
|
||||
**変更ファイル**: `templates/index.html`, `static/js/app.js`, `static/js/i18n.js`
|
||||
|
||||
- Image Edit ヘルプページ(`wfm-help-page-imageedit`)の全要素が英語ハードコードのままで、言語切替に追従していなかった問題を修正
|
||||
- 6セクション(Image Edit Tab / Tools / Layer Panel / Text Object Quality / Export & Navigation / Keyboard Shortcuts)の見出し6件・本文30件すべてに `id` 属性を付与
|
||||
- Shortcuts ページの Image Edit Tab Shortcuts セクションにも `id` 属性を付与(本文はキーを再利用)
|
||||
- `static/js/app.js` の `helpIdMap` に `wfm-help-imageedit-*` → `helpImageEdit*` の45エントリを追加
|
||||
- `static/js/i18n.js` に英語・日本語・中国語の3言語で37キー(タイトル7 + 本文30)を追加
|
||||
|
||||
---
|
||||
|
||||
## 2026-06-25: v0.3.54 — Image Edit Shape ツール追加・Models タブ overlay バグ修正
|
||||
|
||||
**変更ファイル**: `static/js/image-edit/ShapeTool.js`(新規), `static/js/image-edit-tab.js`, `templates/index.html`, `static/js/models-tab.js`
|
||||
|
||||
### Image Edit Tab — Shape ツール(□ / S キー)
|
||||
|
||||
Eagle Comic Creator の画像編集タブ形状描画機能を移植。
|
||||
|
||||
**対応形状**
|
||||
- **Rect** — 矩形(Rounded チェックで角丸)
|
||||
- **Ellipse** — 楕円
|
||||
- **Line** — 直線(Stroke None 非表示 / 常にストローク有効)
|
||||
- **FreeLine** — フリーハンド曲線(旧 Curve。Stroke None 非表示 / 常にストローク有効)
|
||||
|
||||
**Tool Options バー**
|
||||
- Shape ドロップダウン、Rounded チェック(Rect/Ellipse のみ表示)
|
||||
- Fill: None チェック + カラーピッカー(Line/FreeLine 時は非表示)
|
||||
- Stroke: None チェック + カラーピッカー + 幅入力(Line/FreeLine 時は None チェック非表示)
|
||||
- Opacity スライダー、↩ Undo ボタン
|
||||
|
||||
**動作**
|
||||
- ドラッグ中: overlayCanvas に青い破線でプレビュー表示(FreeLine はリアルタイム描画)
|
||||
- ドラッグ離す: 確定 → 独立した draw レイヤーとして LayerManager に追加 → Undo 1操作で除去可
|
||||
- `ShapeTool.drawShape(ctx, shapeObj)` スタティックメソッドでレイヤー canvas に描画
|
||||
|
||||
**実装ファイル**
|
||||
- `static/js/image-edit/ShapeTool.js`(新規): ShapeTool クラス(プレビュー・確定・静的描画メソッド)
|
||||
- `image-edit-tab.js`: import・TOOL_DEFS 追加・`_setActiveTool`/`_activateCurrentTool`/`_renderToolOptions`/マウスハンドラー/`_initCanvases` を更新
|
||||
- `templates/index.html`: □ ツールボタン追加
|
||||
|
||||
**ヘルプ更新**
|
||||
- Image Edit Tab Tools セクション: Shape ツールの説明を追加
|
||||
- Image Edit Keyboard Shortcuts: `S: Shape tool` を追記(ヘルプ内・グローバル Shortcuts ページ)
|
||||
- `image-edit-tab.js` キーボードハンドラーに `s` → `"shape"` を追加(ヘルプ記載と実装を一致)
|
||||
|
||||
### Models タブ — overlay ボタン非更新バグ修正
|
||||
|
||||
`async` イベントハンドラー内で `await` 後に `e.currentTarget` が `null` になる問題を 2箇所修正。
|
||||
|
||||
- **B(Batch)ボタン** — 前回修正済み
|
||||
- **S(Stack)ボタン** — `await toggleStack()` 後に `e.currentTarget.classList.toggle()` を呼んでいたため `TypeError` が発生し黄色に変わらなかった → `const btn = e.currentTarget` を await 前に保存して修正
|
||||
- **⏸ enable/disable ボタン** — 非 async ハンドラーで `renderModelGrid()` 経由の再描画を使用しており問題なし(確認のみ)
|
||||
|
||||
---
|
||||
|
||||
## 2026-06-25: v0.3.53 — Image Edit Tab 実装・レイヤーロック・ギャラリー保存
|
||||
|
||||
**変更ファイル**: `static/js/image-edit-tab.js`, `static/js/image-edit/LayerManager.js`, `static/js/image-edit/SelectTool.js`, `static/js/image-edit/TextTool.js`, `static/css/image-edit-tab.css`, `templates/index.html`, `static/js/gallery-tab.js`, `py/routes/gallery_routes.py`
|
||||
|
||||
@@ -18,7 +18,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- Built-in AI tools (translation and more)
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## Screenshots
|
||||
|
||||
@@ -76,11 +76,12 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- **Always-visible Raw JSON** — edit the API-format JSON directly from any tab with syntax highlighting; Apply button reloads the workflow; built-in **search bar** (always shown) finds all matches as you type with count display (`3/12`); navigate with ↑/↓ buttons or Enter / Shift+Enter; Escape or ✕ clears; current match highlighted in orange, other matches in yellow
|
||||
- **One-click generation** — queue prompts to ComfyUI without leaving the studio
|
||||
- **Seed control** — randomize, lock, or manually set seeds; seed input and mode selector stacked vertically for readability
|
||||
- **Batch type selector** — check one of the column header checkboxes in the Batch Queue pane (Checkpoint / Lora / Prompt / Workflow) to activate that batch type; only one type can be active at a time; the Batch panel below Generate shows the active type, progress, and Pause/Resume/Stop controls
|
||||
- **Style selector** — checkbox and dropdown next to the Reset Workflow button; enable to apply a Fooocus-style JSON to positive and negative prompts at generation time; style files (`*.json`) are loaded from `user/default/Workflow-Studio/style/`; the style's `{prompt}` placeholder is replaced with the original prompt text, or the style is appended if no placeholder exists; `negative_prompt` is appended to the existing negative prompt; styles are applied to a per-generation copy and do not modify the loaded workflow
|
||||
- **Batch type selector** — check one of the column header checkboxes in the Batch Queue pane (Checkpoint / Lora / Prompt / Workflow / Sampler / Scheduler / Style) to activate that batch type; only one type can be active at a time; the Batch panel below Generate shows the active type, progress, and Pause/Resume/Stop controls
|
||||
- **Batch tab** (v0.3.18) — dedicated 3-pane layout for assembling the batch queue:
|
||||
- **Left pane** — file-tree checkpoint selection; Filter input to search; All / None buttons; initial state is all unchecked
|
||||
- **Left pane** — 4 tabs: **Checkpoints** (file-tree; Filter / All / None), **Sampler** (KSampler sampler list), **Scheduler** (KSampler scheduler list), **Style** (flat list of all styles from `Workflow-Studio/style/`; All / None buttons)
|
||||
- **Center pane** — group-based selection with inner tabs (Checkpoint | Lora | Prompt | Workflow); Checkpoint/Lora groups come from the Models tab, Prompt groups from the Prompt tab, Workflow groups from the Workflow tab — check a group to add all its members, expand ▶ to select individually
|
||||
- **Right pane (Batch Queue)** — shows items queued for each batch type; column headers (Checkpoint / Lora / Prompt / Workflow) each have a checkbox — check one to activate that batch type (radio behavior: only one at a time); count shown at top
|
||||
- **Right pane (Batch Queue)** — 7 columns: Checkpoint / Lora / Prompt / Workflow / Sampler / Scheduler / **Style**; each column header has an enable checkbox (radio behavior: only one at a time); count shown per column; Style batch applies each selected style sequentially to a workflow copy
|
||||
- **UI-to-API conversion** — automatic conversion supporting subgraphs (nested workflows), COMBO types, and display-only node exclusion; improved analysis covers SDXL multi-hop CONDITIONING chains, CLIPTextEncodeSDXL, SDXLPromptStyler, KSamplerAdvanced, and more
|
||||
- **Eagle integration** — auto-save generated images to [Eagle](https://eagle.cool/) with metadata
|
||||
|
||||
@@ -212,16 +213,17 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
|
||||
- **Layer-based image editor** — compose images with multiple layers (Image, Text, Draw types) and export the composite as PNG
|
||||
- **Loading images** — drag & drop onto the canvas, Upload button, or send from the Gallery tab via the **Image Edit** toolbar button; first image becomes Layer 1 (auto-locked), subsequent images are added as new layers scaled to fit the canvas
|
||||
- **New button** — create a blank canvas with custom dimensions (WxH prompt); clears all existing layers
|
||||
- **Tools** — Select (V), Draw (B), Text (T); tool options bar updates per active tool
|
||||
- **Tools** — Select (V), Draw (B), Text (T), Shape (S); tool options bar updates per active tool
|
||||
- **Select** — click to select; drag to move; drag corner handles to resize; drag circle handle to rotate; Flip H / Flip V / Rotate angle in the options bar; double-click a text layer to re-edit its content
|
||||
- **Draw** — freehand brush; options: color, brush size, blend mode
|
||||
- **Text** — click to place; configure font, size, bold/italic, align, and color; placed as an exact-size text layer sized to the measured bounding box; double-click to re-edit
|
||||
- **Shape** — drag to draw geometric shapes (Rect / Ellipse / Line / FreeLine); options: shape type, Rounded toggle (Rect/Ellipse), Fill color, Stroke color + width, Opacity; each committed shape becomes an independent draw layer; Stroke None hidden for Line/FreeLine (stroke always active)
|
||||
- **Layer panel** — layer list with visibility (👁/🚫) and lock (🔒/🔓) toggles; opacity slider; type icons (🖼 image / T text / ✏ draw); Layer 1 is automatically locked on first image load
|
||||
- **Layer lock** — locked layers show an orange bounding box and 🔒 icon on the canvas; move/resize/rotate are disabled while locked; click the 🔓 button in the layer row to unlock
|
||||
- **Text quality** — text layers are rendered at their measured bounding-box size; resizing with the Select tool regenerates the canvas at the new display resolution so text stays sharp
|
||||
- **Export** — Save PNG (download composite locally); **Save to Gallery** (saves to Gallery root folder with a timestamped default name `wfs-image-YYYYMMDDHHmmss`); **Send to ComfyUI** (uploads to ComfyUI input folder for use in Load Image nodes)
|
||||
- **Canvas navigation** — scroll-wheel zoom, Space + drag to pan; zoom indicator in the bottom bar
|
||||
- **Undo / Redo** — Ctrl+Z / Ctrl+Y (or toolbar buttons); keyboard shortcuts: V (Select), B (Draw), T (Text), Delete (remove selected layer when 2+ exist)
|
||||
- **Undo / Redo** — Ctrl+Z / Ctrl+Y (or toolbar buttons); keyboard shortcuts: V (Select), B (Draw), T (Text), S (Shape), Delete (remove selected layer when 2+ exist)
|
||||
|
||||
### AI TOOL Tab (v0.3.14)
|
||||
- **4-pane layout** — Translation | Chat | TOOLS | Settings; all panes always visible simultaneously; no sub-tab switching required
|
||||
@@ -349,6 +351,27 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
|
||||
|
||||
## Changelog
|
||||
|
||||
### v0.3.56
|
||||
- **GenerateUI — Style selector** — new checkbox and dropdown next to the Reset Workflow button; when enabled, a Fooocus-style JSON style is applied to positive and negative prompts at generation time; style files (`*.json`) are read from `user/default/Workflow-Studio/style/`; multiple files are merged into a single list sorted by filename; the style's `{prompt}` placeholder is replaced with the original prompt text, otherwise the style text is appended; `negative_prompt` is appended to the existing negative prompt; styles are applied to a per-generation workflow copy and never modify the loaded workflow
|
||||
- **Batch tab — Style batch** — new **Style** tab in the Batch left pane lists all styles loaded from the style directory (flat list with All / None buttons); select any combination, enable the **Style** column in Batch Queue, then Generate to run each selected style sequentially; Batch Queue expanded from 6 to 7 columns (Style added as the rightmost column)
|
||||
|
||||
### v0.3.55
|
||||
- **Group feature — fix data loss on Windows (backslash/slash mismatch)** — on Windows, ComfyUI returns model paths with backslashes (`sub\model.safetensors`) while the backend normalized to forward slashes; this caused all subdir group members to be flagged as missing and deleted on save; fixed by normalizing both stored and scanned paths to forward slashes in `get_model_groups` and `save_model_groups`
|
||||
- **Group feature — network drive protection** — if no model directories are accessible (e.g. external drive disconnected), the group cleanup step is now skipped entirely to prevent wiping all group memberships
|
||||
- **Group feature — scan cache** — `_scan_model_names` now caches results for 30 seconds to eliminate redundant full directory scans on startup (caused high CPU load / crash on large model sets)
|
||||
- **Group feature — RESERVED_GROUPS protection** — `bulkRemoveFromGroup` and `renderPmGroups` now prevent Batch/Stack reserved group keys from being deleted even when all members are removed
|
||||
- **Group feature — stale groupFilter reset** — after deleting a group, `state.groupFilter` is automatically cleared if it pointed to the now-deleted group (previously showed 0 models)
|
||||
- **Group feature — toggleGroupEnable partial failure** — only models listed in `data.ok` are updated client-side, preventing state divergence when some enable/disable calls fail
|
||||
- **GenerateUI batch groups — restore Batch/Stack visibility** — reverts an incorrect filter that hid Batch and Stack groups from the batch group selection UI; these groups are now selectable for batch execution as intended
|
||||
- **GenerateUI LoRA groups — path normalization** — backslash-to-slash normalization added after fetching LoRA groups from the API, matching the Checkpoint fix
|
||||
- **Batch complete toast — i18n** — replaced hardcoded English toast with `t("batchComplete", ...)` supporting all 3 languages
|
||||
- **Prompt tab migration — fix negText loss** — `migrateLocalStoragePresets` now correctly passes `negText` when calling `apiCreatePreset`, preventing negative prompts from being silently dropped during localStorage→API migration
|
||||
- **Help tab — Image Edit section i18n** — the Image Edit help page was hardcoded in English with no language switching support; all 6 sections (30 items + 7 headings) now have i18n IDs wired to English / Japanese / Chinese translations
|
||||
|
||||
### v0.3.54
|
||||
- **Image Edit — Shape tool (S)** — new Shape tool added to the Image Edit toolbar; draw Rect, Ellipse, Line, and FreeLine shapes by dragging; each committed shape becomes an independent draw layer that can be undone in a single step; Tool Options: shape type selector, Rounded toggle (Rect/Ellipse only), Fill color + None toggle (hidden for Line/FreeLine), Stroke color + width (Stroke None hidden for Line/FreeLine where stroke is always active), Opacity slider, Undo button; blue dashed outline previews the shape during drag; keyboard shortcut **S** activates the tool
|
||||
- **Models tab — fix B/S overlay buttons not highlighting** — the Batch (B) and Stack (S) card overlay buttons failed to turn yellow after clicking because `e.currentTarget` is nulled by the browser after an `async` event handler yields at `await`; fixed by capturing `const btn = e.currentTarget` before the await in both handlers
|
||||
|
||||
### v0.3.53
|
||||
- **Image Edit Tab** — new layer-based image editing tab with Select / Draw / Text tools, multi-layer compositing, canvas zoom & pan, and Undo/Redo; text layers are sized to exact bounding-box dimensions and regenerated at display resolution on resize to prevent blurring; double-click a text layer to re-edit its content; Gallery tab gains an "Image Edit" toolbar button to send the selected image directly to the editor
|
||||
- **Image Edit — Layer lock** — lock icon (🔒/🔓) on each layer row; locked layers display an orange bounding box and ignore all Select-tool transforms; Layer 1 is auto-locked when the first image is loaded to prevent accidental moves
|
||||
@@ -821,3 +844,4 @@ MIT License
|
||||
- [Pillow (PIL Fork)](https://python-pillow.org/) — server-side thumbnail generation (`data/thumb_cache/`)
|
||||
- [ComfyUI-Gallery](https://github.com/PanicTitan/ComfyUI-Gallery) by PanicTitan — thumbnail grid UX reference
|
||||
- [infinite-image-browsing](https://github.com/zanllp/sd-webui-infinite-image-browsing) by zanllp — thumbnail caching and index strategy reference
|
||||
- [Fooocus](https://github.com/lllyasviel/Fooocus) by lllyasviel — style preset JSON format reference
|
||||
|
||||
@@ -36,6 +36,7 @@ def setup_routes(app: web.Application):
|
||||
app.router.add_post("/api/wfm/settings/output-dir", handle_set_output_dir)
|
||||
app.router.add_get("/api/wfm/settings/export", handle_export)
|
||||
app.router.add_post("/api/wfm/settings/import", handle_import)
|
||||
app.router.add_get("/api/wfm/styles", handle_get_styles)
|
||||
|
||||
|
||||
async def handle_get(request: web.Request) -> web.Response:
|
||||
@@ -241,3 +242,30 @@ async def handle_import(request: web.Request) -> web.Response:
|
||||
except Exception as e:
|
||||
logger.error("Error importing data: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
|
||||
def _load_styles() -> list:
|
||||
"""Load all style JSON files from DATA_DIR/style/ directory."""
|
||||
style_dir = DATA_DIR / "style"
|
||||
styles = []
|
||||
if not style_dir.is_dir():
|
||||
return styles
|
||||
for json_file in sorted(style_dir.glob("*.json")):
|
||||
try:
|
||||
with open(json_file, "r", encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
if isinstance(data, list):
|
||||
styles.extend(data)
|
||||
except Exception as e:
|
||||
logger.warning("Failed to load style file %s: %s", json_file.name, e)
|
||||
return styles
|
||||
|
||||
|
||||
async def handle_get_styles(request: web.Request) -> web.Response:
|
||||
"""GET /api/wfm/styles - Get all styles from style directory."""
|
||||
try:
|
||||
styles = await asyncio.to_thread(_load_styles)
|
||||
return web.json_response(styles)
|
||||
except Exception as e:
|
||||
logger.error("Error loading styles: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import json
|
||||
import logging
|
||||
import shutil
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
|
||||
@@ -10,6 +11,8 @@ from ..config import MODEL_METADATA_FILE
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_SCAN_CACHE_TTL = 30 # seconds — reuse scan result within this window
|
||||
|
||||
# Preview image extensions to search for (in priority order)
|
||||
_PREVIEW_EXTENSIONS = [".preview.png", ".preview.jpg", ".preview.jpeg", ".preview.webp",
|
||||
".png", ".jpg", ".jpeg", ".webp"]
|
||||
@@ -71,6 +74,7 @@ class ModelsService:
|
||||
|
||||
def __init__(self):
|
||||
self.metadata_file = MODEL_METADATA_FILE
|
||||
self._scan_cache: dict = {} # model_type -> (timestamp, frozenset)
|
||||
|
||||
def _now_iso(self):
|
||||
return datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
|
||||
@@ -113,7 +117,15 @@ class ModelsService:
|
||||
return entry
|
||||
|
||||
def _scan_model_names(self, model_type: str) -> set:
|
||||
"""モデルタイプの全ファイル名をスキャンして返す(相対パス、/区切り、.disabled除く)"""
|
||||
"""モデルタイプの全ファイル名をスキャンして返す(相対パス、/区切り、.disabled除く)。
|
||||
結果は30秒キャッシュされ、起動時の多重スキャンによる高負荷を防ぐ。"""
|
||||
now = time.monotonic()
|
||||
cached = self._scan_cache.get(model_type)
|
||||
if cached is not None:
|
||||
ts, names = cached
|
||||
if now - ts < _SCAN_CACHE_TTL:
|
||||
return names
|
||||
|
||||
dirs = _get_model_dirs(model_type)
|
||||
names = set()
|
||||
for d in dirs:
|
||||
@@ -129,6 +141,8 @@ class ModelsService:
|
||||
names.add(rel)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
self._scan_cache[model_type] = (now, names)
|
||||
return names
|
||||
|
||||
def list_model_files(self, model_type: str) -> list:
|
||||
@@ -170,17 +184,36 @@ class ModelsService:
|
||||
|
||||
if model_type:
|
||||
groups = raw.get(model_type, {})
|
||||
|
||||
# Guard: if no model directories are accessible (e.g. network drive disconnected),
|
||||
# skip cleanup entirely to prevent mass-deletion of group members.
|
||||
accessible_dirs = [d for d in _get_model_dirs(model_type) if d.is_dir()]
|
||||
if not accessible_dirs:
|
||||
configured_dirs = _get_model_dirs(model_type)
|
||||
if configured_dirs:
|
||||
logger.warning(
|
||||
"No accessible directories for model_type=%s — skipping group cleanup "
|
||||
"to avoid data loss (drives may be disconnected)", model_type
|
||||
)
|
||||
return {g: [m.replace("\\", "/") for m in members]
|
||||
for g, members in groups.items()}
|
||||
# No directories configured at all — return as-is (nothing to validate against)
|
||||
return {g: [m.replace("\\", "/") for m in members] for g, members in groups.items()}
|
||||
|
||||
valid_names = self._scan_model_names(model_type)
|
||||
cleaned = {}
|
||||
dirty = False
|
||||
for g_name, members in groups.items():
|
||||
filtered = [m for m in members if m in valid_names]
|
||||
# Normalize backslashes (Windows ComfyUI paths) to forward slashes
|
||||
normalized = [m.replace("\\", "/") for m in members]
|
||||
filtered = [m for m in normalized if m in valid_names]
|
||||
cleaned[g_name] = filtered
|
||||
if len(filtered) != len(members):
|
||||
if len(filtered) != len(members) or normalized != list(members):
|
||||
dirty = True
|
||||
if dirty:
|
||||
removed = sum(len(groups[g]) - len(cleaned[g]) for g in groups)
|
||||
logger.info("Cleaned up %d stale group entries for model_type=%s", removed, model_type)
|
||||
if removed > 0:
|
||||
logger.info("Cleaned up %d stale group entries for model_type=%s", removed, model_type)
|
||||
if not isinstance(data.get("_groups"), dict):
|
||||
data["_groups"] = {}
|
||||
data["_groups"][model_type] = cleaned
|
||||
@@ -189,12 +222,16 @@ class ModelsService:
|
||||
return raw
|
||||
|
||||
def save_model_groups(self, groups, model_type):
|
||||
# Normalize all member names to forward slashes (ComfyUI on Windows uses backslashes)
|
||||
normalized = {g: [m.replace("\\", "/") for m in members] for g, members in groups.items()}
|
||||
data = self._load_metadata()
|
||||
if not isinstance(data.get("_groups"), dict):
|
||||
data["_groups"] = {}
|
||||
data["_groups"][model_type] = groups
|
||||
data["_groups"][model_type] = normalized
|
||||
self._save_metadata(data)
|
||||
return groups
|
||||
# Also invalidate scan cache so next get_model_groups sees the fresh data
|
||||
self._scan_cache.pop(model_type, None)
|
||||
return normalized
|
||||
|
||||
def find_model_file(self, model_type, model_name):
|
||||
"""Find a model file, checking both enabled and disabled states.
|
||||
|
||||
+1
-1
@@ -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.53"
|
||||
version = "0.3.56"
|
||||
license = "MIT"
|
||||
requires-python = ">= 3.10"
|
||||
dependencies = ["jinja2"]
|
||||
|
||||
@@ -418,6 +418,32 @@ function applyI18nToHtml() {
|
||||
"wfm-help-ai-title": "helpAiTitle",
|
||||
"wfm-help-ai-1": "helpAi1", "wfm-help-ai-2": "helpAi2", "wfm-help-ai-3": "helpAi3",
|
||||
"wfm-help-ai-4": "helpAi4", "wfm-help-ai-5": "helpAi5", "wfm-help-ai-6": "helpAi6",
|
||||
"wfm-help-imageedit-title": "helpImageEditTitle",
|
||||
"wfm-help-imageedit-tools-title": "helpImageEditToolsTitle",
|
||||
"wfm-help-imageedit-layer-title": "helpImageEditLayerTitle",
|
||||
"wfm-help-imageedit-text-title": "helpImageEditTextTitle",
|
||||
"wfm-help-imageedit-export-title": "helpImageEditExportTitle",
|
||||
"wfm-help-imageedit-kbd-title": "helpImageEditKbdTitle",
|
||||
"wfm-help-imageedit-1": "helpImageEdit1", "wfm-help-imageedit-2": "helpImageEdit2", "wfm-help-imageedit-3": "helpImageEdit3",
|
||||
"wfm-help-imageedit-4": "helpImageEdit4", "wfm-help-imageedit-5": "helpImageEdit5",
|
||||
"wfm-help-imageedit-6": "helpImageEdit6", "wfm-help-imageedit-7": "helpImageEdit7",
|
||||
"wfm-help-imageedit-8": "helpImageEdit8", "wfm-help-imageedit-9": "helpImageEdit9",
|
||||
"wfm-help-imageedit-10": "helpImageEdit10", "wfm-help-imageedit-11": "helpImageEdit11",
|
||||
"wfm-help-imageedit-12": "helpImageEdit12", "wfm-help-imageedit-13": "helpImageEdit13",
|
||||
"wfm-help-imageedit-14": "helpImageEdit14", "wfm-help-imageedit-15": "helpImageEdit15",
|
||||
"wfm-help-imageedit-16": "helpImageEdit16", "wfm-help-imageedit-17": "helpImageEdit17",
|
||||
"wfm-help-imageedit-18": "helpImageEdit18", "wfm-help-imageedit-19": "helpImageEdit19",
|
||||
"wfm-help-imageedit-20": "helpImageEdit20", "wfm-help-imageedit-21": "helpImageEdit21",
|
||||
"wfm-help-imageedit-22": "helpImageEdit22", "wfm-help-imageedit-23": "helpImageEdit23",
|
||||
"wfm-help-imageedit-24": "helpImageEdit24", "wfm-help-imageedit-25": "helpImageEdit25",
|
||||
"wfm-help-imageedit-26": "helpImageEdit26", "wfm-help-imageedit-27": "helpImageEdit27",
|
||||
"wfm-help-imageedit-28": "helpImageEdit28", "wfm-help-imageedit-29": "helpImageEdit29",
|
||||
"wfm-help-imageedit-30": "helpImageEdit30",
|
||||
"wfm-help-imageedit-tabkbd-title": "helpImageEditTabKbdTitle",
|
||||
"wfm-help-imageedit-tabkbd-1": "helpImageEdit22", "wfm-help-imageedit-tabkbd-2": "helpImageEdit23",
|
||||
"wfm-help-imageedit-tabkbd-3": "helpImageEdit24", "wfm-help-imageedit-tabkbd-4": "helpImageEdit25",
|
||||
"wfm-help-imageedit-tabkbd-5": "helpImageEdit26", "wfm-help-imageedit-tabkbd-6": "helpImageEdit27",
|
||||
"wfm-help-imageedit-tabkbd-7": "helpImageEdit28", "wfm-help-imageedit-tabkbd-8": "helpImageEdit29",
|
||||
"wfm-help-shortcuts-title": "helpShortcutsTitle",
|
||||
"wfm-help-shortcuts-1": "helpShortcuts1", "wfm-help-shortcuts-2": "helpShortcuts2",
|
||||
"wfm-help-shortcuts-3": "helpShortcuts3", "wfm-help-shortcuts-4": "helpShortcuts4",
|
||||
|
||||
+145
-8
@@ -287,7 +287,7 @@ function _setPauseBtnState(paused) {
|
||||
function _updateBatchTypeLabel(running = false) {
|
||||
const el = document.getElementById("wfm-batch-type-label");
|
||||
if (!el) return;
|
||||
const labels = { checkpoint: "Checkpoint", lora: "Lora", prompt: "Prompt", workflow: "Workflow", sampler: "Sampler", scheduler: "Scheduler" };
|
||||
const labels = { checkpoint: "Checkpoint", lora: "Lora", prompt: "Prompt", workflow: "Workflow", sampler: "Sampler", scheduler: "Scheduler", style: "Style" };
|
||||
if (_activeBatchType) {
|
||||
el.textContent = labels[_activeBatchType];
|
||||
el.style.color = running ? "var(--wfm-primary)" : "";
|
||||
@@ -457,6 +457,14 @@ function _renderBatchPreview() {
|
||||
(s) => s,
|
||||
"scheduler", "schedulers"
|
||||
);
|
||||
// Style
|
||||
const styleList = _stylesData.filter((s) => _batchStyleSelected.has(s.name)).map((s) => s.name);
|
||||
_renderQueueColumn(
|
||||
"wfm-batch-style-count", "wfm-batch-style-preview-list",
|
||||
styleList,
|
||||
(s) => s,
|
||||
"style", "styles"
|
||||
);
|
||||
}
|
||||
|
||||
// モデルパスリストをフォルダ → [modelPath, ...] のMapに変換
|
||||
@@ -881,8 +889,15 @@ function _renderAnyGroupList(listEl, groupsData, selectedGroups, partialSelectio
|
||||
async function _loadBatchLoraGroups() {
|
||||
try {
|
||||
const res = await fetch("/api/wfm/models/groups?type=lora");
|
||||
if (res.ok) _batchGroupState.loraGroups = await res.json();
|
||||
else _batchGroupState.loraGroups = {};
|
||||
if (res.ok) {
|
||||
const raw = await res.json();
|
||||
// Normalize backslashes (Windows ComfyUI paths) to forward slashes
|
||||
const normalized = {};
|
||||
for (const [g, members] of Object.entries(raw)) {
|
||||
normalized[g] = members.map((m) => m.replace(/\\/g, "/"));
|
||||
}
|
||||
_batchGroupState.loraGroups = normalized;
|
||||
} else { _batchGroupState.loraGroups = {}; }
|
||||
} catch { _batchGroupState.loraGroups = {}; }
|
||||
|
||||
const currentNames = new Set(Object.keys(_batchGroupState.loraGroups));
|
||||
@@ -1091,6 +1106,7 @@ function initBatchTab() {
|
||||
document.getElementById(`wfm-batch-left-${tabId}`)?.classList.add("active");
|
||||
if (tabId === "sampler") _rebuildSamplerList();
|
||||
else if (tabId === "scheduler") _rebuildSchedulerList();
|
||||
else if (tabId === "style") _rebuildStyleList();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1150,6 +1166,18 @@ function initBatchTab() {
|
||||
_renderBatchPreview();
|
||||
});
|
||||
|
||||
// 全選択 / 全解除(左ペイン Style)
|
||||
document.getElementById("wfm-style-batch-select-all")?.addEventListener("click", () => {
|
||||
_stylesData.forEach((s) => _batchStyleSelected.add(s.name));
|
||||
_rebuildStyleList();
|
||||
_renderBatchPreview();
|
||||
});
|
||||
document.getElementById("wfm-style-batch-deselect-all")?.addEventListener("click", () => {
|
||||
_batchStyleSelected.clear();
|
||||
_rebuildStyleList();
|
||||
_renderBatchPreview();
|
||||
});
|
||||
|
||||
// Batch タブが表示されたときに全グループを読み込む
|
||||
document.querySelector('[data-subtab="batch"]')?.addEventListener("click", () => {
|
||||
_rebuildCkptList();
|
||||
@@ -1157,6 +1185,7 @@ function initBatchTab() {
|
||||
_loadBatchLoraGroups();
|
||||
_loadPromptGroupsForBatch();
|
||||
_loadWorkflowGroupsForBatch();
|
||||
_rebuildStyleList();
|
||||
_renderBatchPreview();
|
||||
});
|
||||
}
|
||||
@@ -1193,6 +1222,101 @@ function initCheckpointBatch() {
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Style (Fooocus-style JSON from DATA_DIR/style/)
|
||||
// ============================================
|
||||
|
||||
let _stylesData = [];
|
||||
const _batchStyleSelected = new Set();
|
||||
let _batchStyleOverride = null; // Style バッチ実行中に一時的にセット
|
||||
|
||||
async function _loadStyles() {
|
||||
try {
|
||||
const res = await fetch("/api/wfm/styles");
|
||||
if (res.ok) _stylesData = await res.json();
|
||||
else _stylesData = [];
|
||||
} catch { _stylesData = []; }
|
||||
_renderStyleDropdown();
|
||||
_rebuildStyleList();
|
||||
}
|
||||
|
||||
function _renderStyleDropdown() {
|
||||
const sel = document.getElementById("wfm-style-select");
|
||||
if (!sel) return;
|
||||
sel.innerHTML = "";
|
||||
if (_stylesData.length === 0) {
|
||||
const opt = document.createElement("option");
|
||||
opt.value = "";
|
||||
opt.textContent = "No styles";
|
||||
sel.appendChild(opt);
|
||||
return;
|
||||
}
|
||||
for (const s of _stylesData) {
|
||||
const opt = document.createElement("option");
|
||||
opt.value = s.name;
|
||||
opt.textContent = s.name;
|
||||
sel.appendChild(opt);
|
||||
}
|
||||
}
|
||||
|
||||
function _rebuildStyleList() {
|
||||
_buildSimpleGroupList(
|
||||
document.getElementById("wfm-batch-style-list"),
|
||||
_stylesData.map((s) => s.name),
|
||||
_batchStyleSelected,
|
||||
"No styles (place JSON files in Workflow-Studio/style/)"
|
||||
);
|
||||
}
|
||||
|
||||
function _applyNamedStyle(workflow, style) {
|
||||
if (!style) return workflow;
|
||||
const analysis = comfyUI.currentAnalysis;
|
||||
if (!analysis) return workflow;
|
||||
|
||||
const positiveNodes = (analysis.prompt_nodes || []).filter((n) => n.role === "positive");
|
||||
const negativeNodes = (analysis.prompt_nodes || []).filter((n) => n.role === "negative");
|
||||
|
||||
const result = JSON.parse(JSON.stringify(workflow));
|
||||
|
||||
if (style.prompt) {
|
||||
for (const node of positiveNodes) {
|
||||
const nodeData = result[node.id];
|
||||
if (!nodeData) continue;
|
||||
const key = node.textKey || "text";
|
||||
const original = nodeData.inputs[key] || "";
|
||||
nodeData.inputs[key] = style.prompt.includes("{prompt}")
|
||||
? style.prompt.replace("{prompt}", original)
|
||||
: original ? `${original}, ${style.prompt}` : style.prompt;
|
||||
}
|
||||
}
|
||||
|
||||
if (style.negative_prompt) {
|
||||
for (const node of negativeNodes) {
|
||||
const nodeData = result[node.id];
|
||||
if (!nodeData) continue;
|
||||
const key = node.textKey || "text";
|
||||
const original = nodeData.inputs[key] || "";
|
||||
nodeData.inputs[key] = original
|
||||
? `${original}, ${style.negative_prompt}`
|
||||
: style.negative_prompt;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function _applyStyleToWorkflow(workflow) {
|
||||
// バッチ実行中は上書きスタイルを優先
|
||||
if (_batchStyleOverride !== null) return _applyNamedStyle(workflow, _batchStyleOverride);
|
||||
|
||||
const enabled = document.getElementById("wfm-style-enabled")?.checked;
|
||||
if (!enabled) return workflow;
|
||||
const selectedName = document.getElementById("wfm-style-select")?.value;
|
||||
if (!selectedName) return workflow;
|
||||
const style = _stylesData.find((s) => s.name === selectedName);
|
||||
return _applyNamedStyle(workflow, style || null);
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// SPA-side wildcard expansion (A1111-style __name__ syntax)
|
||||
// Applies to non-ImpactWildcard nodes only; ImpactWildcard* nodes expand server-side.
|
||||
@@ -1285,7 +1409,8 @@ async function _coreGenerate(silent = false) {
|
||||
if (progressBar) progressBar.style.width = "0%";
|
||||
if (progressText) progressText.textContent = "Starting...";
|
||||
|
||||
const workflowForGenerate = await _expandWildcardsInWorkflow({ ...comfyUI.currentWorkflow });
|
||||
const workflowExpanded = await _expandWildcardsInWorkflow({ ...comfyUI.currentWorkflow });
|
||||
const workflowForGenerate = _applyStyleToWorkflow(workflowExpanded);
|
||||
const { images, seed } = await comfyUI.generate(
|
||||
workflowForGenerate,
|
||||
{
|
||||
@@ -1409,10 +1534,7 @@ async function _runBatchLoop(items, applyFn, labelFn = (x) => String(x)) {
|
||||
if (_ckptBatch.aborted) {
|
||||
showToast(t("batchStopped", completed, failed), "info");
|
||||
} else {
|
||||
showToast(
|
||||
`Batch complete: ${completed}/${items.length}${failed > 0 ? ` (${failed} failed)` : ""}`,
|
||||
failed > 0 ? "error" : "success"
|
||||
);
|
||||
showToast(t("batchComplete", completed, items.length, failed), failed > 0 ? "error" : "success");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1519,6 +1641,18 @@ async function _runBatchGenerate() {
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "style": {
|
||||
const list = _stylesData.filter((s) => _batchStyleSelected.has(s.name));
|
||||
if (list.length === 0) { showToast(t("batchNoneSelected", "styles"), "error"); return; }
|
||||
try {
|
||||
await _runBatchLoop(list, (style) => {
|
||||
_batchStyleOverride = style;
|
||||
}, (s) => s.name);
|
||||
} finally {
|
||||
_batchStyleOverride = null;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1835,6 +1969,9 @@ export async function initGenerateTab() {
|
||||
// Feeder tab
|
||||
await initFeederTab();
|
||||
|
||||
// Style dropdown
|
||||
await _loadStyles();
|
||||
|
||||
// Auto-connect on init
|
||||
const connected = await comfyUI.checkConnection();
|
||||
updateStatus(connected);
|
||||
|
||||
@@ -208,6 +208,7 @@ const LANGUAGES = {
|
||||
batchNoneSelected: (what) => `No ${what} selected`,
|
||||
batchItemFailed: (i, total, msg) => `[${i}/${total}] Failed: ${msg}`,
|
||||
batchStopped: (completed, failed) => `Batch stopped — ${completed} completed, ${failed} failed`,
|
||||
batchComplete: (completed, total, failed) => failed > 0 ? `Batch complete: ${completed}/${total} (${failed} failed)` : `Batch complete: ${completed}/${total}`,
|
||||
connectedToComfyUI: "Connected to ComfyUI",
|
||||
failedToConnect: "Failed to connect",
|
||||
modelListsRefreshed: "Model lists refreshed",
|
||||
@@ -730,6 +731,43 @@ const LANGUAGES = {
|
||||
helpAi4: "TOOLS pane — VLM: drop an image (PNG/JPG/WebP) and select a task (Describe Image, Create Prompt, Create Tags), click Run; or select \"Create wildcards\", enter a category name and count to generate plain-text entries one per line",
|
||||
helpAi5: "Settings pane: choose backend (Ollama / LM Studio), set API URL, test connection, select model, configure Free language names for translation",
|
||||
helpAi6: "Settings are saved to localStorage and shared with the Library panel's A tab",
|
||||
helpImageEditTitle: "Image Edit Tab",
|
||||
helpImageEdit1: "Layer-based image editor — compose images with multiple layers (Image, Text, Draw types) and export the composite",
|
||||
helpImageEdit2: "Loading images: drag & drop onto the canvas, Upload button, or send from the Gallery tab via the Image Edit button in the Gallery toolbar; the first image becomes Layer 1 (auto-locked); subsequent images are added as new layers scaled to fit the canvas",
|
||||
helpImageEdit3: "New button: create a blank canvas — prompts for WxH size (e.g. 512x768); clears all existing layers",
|
||||
helpImageEditToolsTitle: "Tools",
|
||||
helpImageEdit4: "Select (V): click to select a layer; drag to move; drag corner handles to resize; drag the circle above the top edge to rotate; double-click a text layer to re-edit its content; Tool Options bar shows Flip H / Flip V / Rotate field",
|
||||
helpImageEdit5: "Draw (B): freehand brush drawing onto the active draw layer; Tool Options: color, brush size, blend mode",
|
||||
helpImageEdit6: "Text (T): click on the canvas to place a text input overlay; configure font family, size, bold/italic, align, color in the Tool Options bar; click OK to place the text as an exact-size Text layer; double-click an existing text layer with the Select tool to re-edit",
|
||||
helpImageEdit7: "Shape (S): draw geometric shapes onto the canvas; each committed shape becomes an independent draw layer; Tool Options: Shape type (Rect / Ellipse / Line / FreeLine), Rounded checkbox (Rect / Ellipse only), Fill color + None toggle (hidden for Line / FreeLine), Stroke color + width + None toggle (None hidden for Line / FreeLine where stroke is always active), Opacity slider, ↩ Undo button; drag to draw — a blue dashed outline previews the shape; release to commit",
|
||||
helpImageEditLayerTitle: "Layer Panel",
|
||||
helpImageEdit8: "Layers are listed from front (top) to back (bottom); click a layer row to make it active",
|
||||
helpImageEdit9: "👁 / 🚫 button: toggle layer visibility",
|
||||
helpImageEdit10: "🔒 / 🔓 button: toggle layer lock — a locked layer cannot be moved, resized, or rotated (orange bounding box is shown); Layer 1 is locked automatically when the first image is loaded to prevent accidental moves",
|
||||
helpImageEdit11: "Opacity slider at the bottom adjusts the active layer's transparency",
|
||||
helpImageEdit12: "Type icons: 🖼 = image layer, T = text layer, ✏ = draw layer",
|
||||
helpImageEdit13: "Delete key: removes the selected layer (only when 2+ layers exist)",
|
||||
helpImageEditTextTitle: "Text Object Quality",
|
||||
helpImageEdit14: "Text layers are sized exactly to the measured text bounding box — no extra whitespace",
|
||||
helpImageEdit15: "When a text layer is resized with the Select tool, the canvas is regenerated at the new display size so the text remains sharp (no blurring)",
|
||||
helpImageEdit16: "Re-editing a text layer (double-click) resets it to native size; re-scale afterward if needed",
|
||||
helpImageEditExportTitle: "Export & Navigation",
|
||||
helpImageEdit17: "Save PNG: composites all visible layers and downloads the result as a PNG file",
|
||||
helpImageEdit18: "Save to Gallery: prompts for a filename (default: wfs-image-YYYYMMDDHHmmss) and saves the composite PNG directly to the Gallery root folder (configured in Settings > Gallery Output Folder); requires the Gallery tab to have been opened at least once to set the root",
|
||||
helpImageEdit19: "Send to ComfyUI: uploads the composite PNG to ComfyUI's input folder via /upload/image, making it selectable in Load Image nodes",
|
||||
helpImageEdit20: "Canvas navigation: scroll wheel to zoom, Space + drag to pan",
|
||||
helpImageEdit21: "Undo / Redo: Ctrl+Z / Ctrl+Y (or toolbar buttons ↩ ↪)",
|
||||
helpImageEditKbdTitle: "Image Edit Keyboard Shortcuts",
|
||||
helpImageEdit22: "V: Select tool",
|
||||
helpImageEdit23: "B: Draw tool",
|
||||
helpImageEdit24: "T: Text tool",
|
||||
helpImageEdit25: "S: Shape tool",
|
||||
helpImageEdit26: "Delete: Delete selected layer (requires 2+ layers)",
|
||||
helpImageEdit27: "Ctrl+Z / Ctrl+Y: Undo / Redo",
|
||||
helpImageEdit28: "Space + drag: Pan canvas",
|
||||
helpImageEdit29: "Mouse wheel: Zoom in / out",
|
||||
helpImageEdit30: "Double-click (Select tool on text layer): Re-edit text",
|
||||
helpImageEditTabKbdTitle: "Image Edit Tab Shortcuts",
|
||||
helpShortcutsTitle: "Keyboard Shortcuts",
|
||||
helpShortcuts1: "Escape: Close modal/panel",
|
||||
helpShortcuts2: "Enter: Confirm rename, send chat",
|
||||
@@ -1088,6 +1126,7 @@ const LANGUAGES = {
|
||||
batchNoneSelected: (what) => `${what}が選択されていません`,
|
||||
batchItemFailed: (i, total, msg) => `[${i}/${total}] 失敗: ${msg}`,
|
||||
batchStopped: (completed, failed) => `バッチ停止 — 完了${completed}件、失敗${failed}件`,
|
||||
batchComplete: (completed, total, failed) => failed > 0 ? `バッチ完了: ${completed}/${total}件 (${failed}件失敗)` : `バッチ完了: ${completed}/${total}件`,
|
||||
connectedToComfyUI: "ComfyUIに接続しました",
|
||||
failedToConnect: "接続に失敗しました",
|
||||
modelListsRefreshed: "モデルリストを更新しました",
|
||||
@@ -1610,6 +1649,43 @@ const LANGUAGES = {
|
||||
helpAi4: "TOOLS ペイン — VLM:画像(PNG/JPG/WebP)をドロップしてタスク(画像解説 / プロンプト作成 / タグ作成)を選んで Run;または「Create wildcards」を選んでカテゴリ名と件数を入力すると1行1エントリのワイルドカードを生成",
|
||||
helpAi5: "設定ペイン:バックエンド(Ollama / LM Studio)・API URL・接続テスト・モデル選択・Free 言語名を設定",
|
||||
helpAi6: "設定は localStorage に保存され、Library パネルの A タブと共有される",
|
||||
helpImageEditTitle: "Image Edit タブ",
|
||||
helpImageEdit1: "レイヤーベースの画像エディタ — 複数のレイヤー(画像・テキスト・描画)を重ね合わせて画像を合成・エクスポート",
|
||||
helpImageEdit2: "画像の読み込み:キャンバスへのドラッグ&ドロップ、Uploadボタン、またはGalleryタブのImage Editボタンから送信;最初の画像はLayer 1として自動ロック;以降の画像はキャンバスサイズに合わせてスケールされ新規レイヤーとして追加",
|
||||
helpImageEdit3: "Newボタン:空白キャンバスを作成 — W×Hサイズを入力(例: 512x768);既存レイヤーは全て削除",
|
||||
helpImageEditToolsTitle: "ツール",
|
||||
helpImageEdit4: "Select (V):クリックでレイヤーを選択、ドラッグで移動、コーナーハンドルでリサイズ、上辺の円ハンドルで回転;テキストレイヤーをダブルクリックすると再編集可能;ツールオプションバーにFlip H / Flip V / 回転角度入力を表示",
|
||||
helpImageEdit5: "Draw (B):アクティブな描画レイヤーにフリーハンドで描画;ツールオプション:カラー、ブラシサイズ、ブレンドモード",
|
||||
helpImageEdit6: "Text (T):キャンバス上をクリックしてテキスト入力オーバーレイを表示;ツールオプションバーでフォントファミリー・サイズ・太字/斜体・配置・カラーを設定;OKをクリックするとテキストの正確なサイズのテキストレイヤーとして配置;Selectツールで既存テキストレイヤーをダブルクリックすると再編集可能",
|
||||
helpImageEdit7: "Shape (S):キャンバスに図形を描画;確定した図形は独立した描画レイヤーになる;ツールオプション:Shapeタイプ(Rect / Ellipse / Line / FreeLine)、Roundedチェック(Rect / Ellipseのみ)、Fillカラー + Noneトグル(Line / FreeLineでは非表示)、Strokeカラー + 幅 + Noneトグル(Line / FreeLineのNone非表示)、Opacityスライダー、↩ Undoボタン;ドラッグで形状プレビュー(青い破線)、離すと確定",
|
||||
helpImageEditLayerTitle: "レイヤーパネル",
|
||||
helpImageEdit8: "レイヤーは前面(上)から背面(下)の順に表示;行をクリックでアクティブ化",
|
||||
helpImageEdit9: "👁 / 🚫 ボタン:レイヤーの表示/非表示を切り替え",
|
||||
helpImageEdit10: "🔒 / 🔓 ボタン:レイヤーロックの切り替え — ロック中は移動・リサイズ・回転不可(オレンジのバウンディングボックスで表示);最初の画像読み込み時にLayer 1が自動ロックされ誤操作を防止",
|
||||
helpImageEdit11: "下部の不透明度スライダーでアクティブレイヤーの透明度を調整",
|
||||
helpImageEdit12: "タイプアイコン:🖼 = 画像レイヤー、T = テキストレイヤー、✏ = 描画レイヤー",
|
||||
helpImageEdit13: "Deleteキー:選択レイヤーを削除(2枚以上のレイヤーがある場合のみ)",
|
||||
helpImageEditTextTitle: "テキストの品質",
|
||||
helpImageEdit14: "テキストレイヤーはテキストのバウンディングボックスに合わせて正確なサイズに設定 — 余白なし",
|
||||
helpImageEdit15: "Selectツールでテキストレイヤーをリサイズすると、新しい表示サイズでキャンバスを再生成してテキストの鮮明さを維持(ぼけなし)",
|
||||
helpImageEdit16: "テキストレイヤーの再編集(ダブルクリック)でネイティブサイズにリセット;必要に応じて再スケールを行う",
|
||||
helpImageEditExportTitle: "エクスポートとナビゲーション",
|
||||
helpImageEdit17: "Save PNG:全可視レイヤーを合成してPNGファイルとしてダウンロード",
|
||||
helpImageEdit18: "Save to Gallery:ファイル名を入力(デフォルト: wfs-image-YYYYMMDDHHmmss)してギャラリーのルートフォルダに合成PNGを保存(設定 > Gallery Output Folderで設定);Galleryタブを一度開いてルートフォルダを設定する必要あり",
|
||||
helpImageEdit19: "Send to ComfyUI:合成PNGをComfyUIのinputフォルダに /upload/image でアップロードし、Load Imageノードで選択可能にする",
|
||||
helpImageEdit20: "キャンバスナビゲーション:スクロールホイールでズーム、Space + ドラッグでパン",
|
||||
helpImageEdit21: "Undo / Redo:Ctrl+Z / Ctrl+Y(またはツールバーの ↩ ↪ ボタン)",
|
||||
helpImageEditKbdTitle: "Image Edit キーボードショートカット",
|
||||
helpImageEdit22: "V:Selectツール",
|
||||
helpImageEdit23: "B:Drawツール",
|
||||
helpImageEdit24: "T:Textツール",
|
||||
helpImageEdit25: "S:Shapeツール",
|
||||
helpImageEdit26: "Delete:選択レイヤーを削除(2枚以上のレイヤーがある場合)",
|
||||
helpImageEdit27: "Ctrl+Z / Ctrl+Y:Undo / Redo",
|
||||
helpImageEdit28: "Space + ドラッグ:キャンバスをパン",
|
||||
helpImageEdit29: "マウスホイール:ズームイン / アウト",
|
||||
helpImageEdit30: "ダブルクリック(Selectツールでテキストレイヤー):テキストを再編集",
|
||||
helpImageEditTabKbdTitle: "Image Edit タブのショートカット",
|
||||
helpShortcutsTitle: "キーボード操作",
|
||||
helpShortcuts1: "Escape:モーダル・パネルを閉じる",
|
||||
helpShortcuts2: "Enter:名前変更の確定、チャット送信",
|
||||
@@ -1968,6 +2044,7 @@ const LANGUAGES = {
|
||||
batchNoneSelected: (what) => `未选择${what}`,
|
||||
batchItemFailed: (i, total, msg) => `[${i}/${total}] 失败: ${msg}`,
|
||||
batchStopped: (completed, failed) => `批处理已停止 — 完成${completed}个,失败${failed}个`,
|
||||
batchComplete: (completed, total, failed) => failed > 0 ? `批处理完成: ${completed}/${total}个 (${failed}个失败)` : `批处理完成: ${completed}/${total}个`,
|
||||
connectedToComfyUI: "已连接到ComfyUI",
|
||||
failedToConnect: "连接失败",
|
||||
modelListsRefreshed: "模型列表已刷新",
|
||||
@@ -2490,6 +2567,43 @@ const LANGUAGES = {
|
||||
helpAi4: "TOOLS 面板 — VLM:拖放图像(PNG/JPG/WebP)并选择任务(图像描述 / 提示词生成 / 标签生成),点击 Run;或选择「Create wildcards」,输入类别名称和数量生成纯文本通配符条目(每行一条)",
|
||||
helpAi5: "设置面板:选择后端(Ollama / LM Studio)、设置 API URL、测试连接、选择模型、配置 Free 语言名称",
|
||||
helpAi6: "设置保存至 localStorage,并与 Library 面板的 A 标签共享",
|
||||
helpImageEditTitle: "图像编辑选项卡",
|
||||
helpImageEdit1: "基于图层的图像编辑器 — 通过多个图层(图像、文字、绘制类型)合成图像并导出",
|
||||
helpImageEdit2: "加载图像:拖放到画布、点击Upload按钮、或通过Gallery标签工具栏的Image Edit按钮发送;第一张图像成为图层1(自动锁定);后续图像缩放至画布大小作为新图层添加",
|
||||
helpImageEdit3: "New按钮:创建空白画布 — 输入宽高(如512x768);清除所有现有图层",
|
||||
helpImageEditToolsTitle: "工具",
|
||||
helpImageEdit4: "Select (V):点击选择图层;拖动移动;拖动角点手柄调整大小;拖动顶边圆形手柄旋转;双击文字图层可重新编辑;工具选项栏显示翻转H / 翻转V / 旋转角度",
|
||||
helpImageEdit5: "Draw (B):在当前绘制图层上自由绘画;工具选项:颜色、笔刷大小、混合模式",
|
||||
helpImageEdit6: "Text (T):点击画布放置文字输入框;在工具选项栏设置字体、大小、粗体/斜体、对齐方式、颜色;点击OK后以精确文字边界框大小创建文字图层;用Select工具双击现有文字图层可重新编辑",
|
||||
helpImageEdit7: "Shape (S):在画布上绘制几何图形;每个确认的图形成为独立的绘制图层;工具选项:图形类型(Rect / Ellipse / Line / FreeLine)、圆角复选框(仅Rect/Ellipse)、填充颜色+None切换(Line/FreeLine隐藏)、描边颜色+宽度+None切换(Line/FreeLine的None隐藏,始终有描边)、不透明度滑块、↩撤销按钮;拖动预览(蓝色虚线),释放确认",
|
||||
helpImageEditLayerTitle: "图层面板",
|
||||
helpImageEdit8: "图层从前景(顶)到背景(底)列出;点击图层行将其激活",
|
||||
helpImageEdit9: "👁 / 🚫 按钮:切换图层可见性",
|
||||
helpImageEdit10: "🔒 / 🔓 按钮:切换图层锁定 — 锁定图层无法移动、缩放或旋转(显示橙色边框);加载第一张图像时图层1自动锁定以防止误操作",
|
||||
helpImageEdit11: "底部的不透明度滑块调整当前图层的透明度",
|
||||
helpImageEdit12: "类型图标:🖼 = 图像图层,T = 文字图层,✏ = 绘制图层",
|
||||
helpImageEdit13: "Delete键:删除选中图层(需要2个及以上图层)",
|
||||
helpImageEditTextTitle: "文字质量",
|
||||
helpImageEdit14: "文字图层按测量的文字边界框精确调整大小 — 无多余空白",
|
||||
helpImageEdit15: "用Select工具调整文字图层大小时,以新的显示尺寸重新生成画布,保持文字清晰(无模糊)",
|
||||
helpImageEdit16: "重新编辑文字图层(双击)会重置为原始大小;如需调整请之后重新缩放",
|
||||
helpImageEditExportTitle: "导出与导航",
|
||||
helpImageEdit17: "Save PNG:合并所有可见图层并下载为PNG文件",
|
||||
helpImageEdit18: "Save to Gallery:输入文件名(默认:wfs-image-YYYYMMDDHHmmss)将合成PNG保存到Gallery根文件夹(在设置 > Gallery Output Folder中配置);需要至少打开过一次Gallery标签以设置根目录",
|
||||
helpImageEdit19: "Send to ComfyUI:通过/upload/image将合成PNG上传到ComfyUI的输入文件夹,使其可在Load Image节点中选择",
|
||||
helpImageEdit20: "画布导航:滚轮缩放,Space+拖动平移",
|
||||
helpImageEdit21: "撤销/重做:Ctrl+Z / Ctrl+Y(或工具栏的 ↩ ↪ 按钮)",
|
||||
helpImageEditKbdTitle: "图像编辑键盘快捷键",
|
||||
helpImageEdit22: "V:选择工具",
|
||||
helpImageEdit23: "B:绘制工具",
|
||||
helpImageEdit24: "T:文字工具",
|
||||
helpImageEdit25: "S:图形工具",
|
||||
helpImageEdit26: "Delete:删除选中图层(需要2个及以上图层)",
|
||||
helpImageEdit27: "Ctrl+Z / Ctrl+Y:撤销/重做",
|
||||
helpImageEdit28: "Space+拖动:平移画布",
|
||||
helpImageEdit29: "鼠标滚轮:放大/缩小",
|
||||
helpImageEdit30: "双击(Select工具点击文字图层):重新编辑文字",
|
||||
helpImageEditTabKbdTitle: "图像编辑选项卡快捷键",
|
||||
helpShortcutsTitle: "键盘操作",
|
||||
helpShortcuts1: "Escape:关闭弹窗/面板",
|
||||
helpShortcuts2: "Enter:确认重命名、发送聊天",
|
||||
|
||||
@@ -8,12 +8,14 @@ import { LayerManager, Layer } from "./image-edit/LayerManager.js";
|
||||
import { DrawTool } from "./image-edit/DrawTool.js";
|
||||
import { TextTool, TEXT_FONTS } from "./image-edit/TextTool.js";
|
||||
import { SelectTool } from "./image-edit/SelectTool.js";
|
||||
import { ShapeTool } from "./image-edit/ShapeTool.js";
|
||||
import { showToast } from "./app.js";
|
||||
|
||||
const TOOL_DEFS = [
|
||||
{ id: "select", icon: "▲", label: "Select", ready: true },
|
||||
{ id: "draw", icon: "✏", label: "Draw", ready: true },
|
||||
{ id: "text", icon: "T", label: "Text", ready: true },
|
||||
{ id: "shape", icon: "□", label: "Shape", ready: true },
|
||||
{ id: "mask", icon: "🎭", label: "Mask", ready: false },
|
||||
{ id: "blur", icon: "≈", label: "Blur", ready: false },
|
||||
{ id: "filter", icon: "★", label: "Filter", ready: false },
|
||||
@@ -47,6 +49,7 @@ class ImageEditTab {
|
||||
this._compositeMode = false;
|
||||
this._editingTextLayer = null; // テキスト再編集中のレイヤー参照
|
||||
this._initialized = false;
|
||||
this._shapeTool = null;
|
||||
}
|
||||
|
||||
// ── 初期化 ────────────────────────────────────
|
||||
@@ -77,6 +80,7 @@ class ImageEditTab {
|
||||
if (this._activeTool === "draw") this._drawTool?.deactivate();
|
||||
if (this._activeTool === "text") this._textTool?.deactivate();
|
||||
if (this._activeTool === "select") this._selectTool?.deactivate();
|
||||
if (this._activeTool === "shape") this._shapeTool?.deactivate();
|
||||
|
||||
this._activeTool = toolId;
|
||||
|
||||
@@ -101,6 +105,10 @@ class ImageEditTab {
|
||||
} else if (this._activeTool === "select" && this._selectTool) {
|
||||
this._selectTool.setCanvas(overlayCanvas);
|
||||
this._selectTool.activate();
|
||||
} else if (this._activeTool === "shape" && this._shapeTool) {
|
||||
this._shapeTool.setCanvas(overlayCanvas);
|
||||
this._shapeTool.activate();
|
||||
if (overlayCanvas) overlayCanvas.style.cursor = "crosshair";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -243,6 +251,105 @@ class ImageEditTab {
|
||||
this._textTool.italic = !this._textTool.italic; this._renderToolOptions("text");
|
||||
});
|
||||
document.getElementById("ie-text-align")?.addEventListener("change", e => { this._textTool.align = e.target.value; });
|
||||
} else if (toolId === "shape" && this._shapeTool) {
|
||||
const t = this._shapeTool;
|
||||
const isLineKind = ["line", "freeline"].includes(t.shape);
|
||||
const showRounded = ["rect", "ellipse"].includes(t.shape);
|
||||
el.innerHTML = `
|
||||
<div class="ie-opt-group">
|
||||
<label>Shape</label>
|
||||
<select id="ie-shape-kind" class="ie-opt-select">
|
||||
<option value="rect" ${t.shape==="rect" ?"selected":""}>Rect</option>
|
||||
<option value="ellipse" ${t.shape==="ellipse" ?"selected":""}>Ellipse</option>
|
||||
<option value="line" ${t.shape==="line" ?"selected":""}>Line</option>
|
||||
<option value="freeline" ${t.shape==="freeline" ?"selected":""}>FreeLine</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="ie-opt-group" id="ie-shape-rounded-wrap" style="display:${showRounded?"":"none"};">
|
||||
<label><input type="checkbox" id="ie-shape-rounded" ${t.rounded?"checked":""}> Rounded</label>
|
||||
</div>
|
||||
<div class="ie-opt-group" id="ie-shape-fill-wrap" style="display:${isLineKind?"none":""};">
|
||||
<label>Fill</label>
|
||||
<input type="checkbox" id="ie-shape-fill-none" ${t.fillNone?"checked":""}> <span style="font-size:11px;color:var(--wfm-text-secondary);">None</span>
|
||||
<input type="color" id="ie-shape-fill" value="${t.fillColor}" ${t.fillNone?"disabled":""}
|
||||
style="width:28px;height:24px;padding:0;border:1px solid var(--wfm-border);cursor:pointer;border-radius:3px;margin-left:2px;">
|
||||
</div>
|
||||
<div class="ie-opt-group">
|
||||
<label>Stroke</label>
|
||||
<div id="ie-shape-stroke-none-wrap" style="display:${isLineKind?"none":""};">
|
||||
<input type="checkbox" id="ie-shape-stroke-none" ${t.strokeNone?"checked":""}> <span style="font-size:11px;color:var(--wfm-text-secondary);">None</span>
|
||||
</div>
|
||||
<input type="color" id="ie-shape-stroke" value="${t.strokeColor}" ${(!isLineKind && t.strokeNone)?"disabled":""}
|
||||
style="width:28px;height:24px;padding:0;border:1px solid var(--wfm-border);cursor:pointer;border-radius:3px;margin-left:2px;">
|
||||
<input type="number" id="ie-shape-stroke-width" value="${t.strokeWidth}" min="1" max="200" ${(!isLineKind && t.strokeNone)?"disabled":""}
|
||||
style="width:44px;margin-left:2px;" class="ie-opt-input">
|
||||
</div>
|
||||
<div class="ie-opt-group">
|
||||
<label>Opacity</label>
|
||||
<input type="range" id="ie-shape-opacity" min="1" max="100" value="${Math.round(t.opacity*100)}" style="width:70px;">
|
||||
<span id="ie-shape-opacity-lbl">${Math.round(t.opacity*100)}%</span>
|
||||
</div>
|
||||
<div class="ie-opt-group" style="margin-left:8px;">
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-shape-undo-btn">↩ Undo</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const _updateShapeVisibility = () => {
|
||||
const kind = document.getElementById("ie-shape-kind").value;
|
||||
const lineKind = ["line", "freeline"].includes(kind);
|
||||
const rw = document.getElementById("ie-shape-rounded-wrap");
|
||||
const fw = document.getElementById("ie-shape-fill-wrap");
|
||||
const snw = document.getElementById("ie-shape-stroke-none-wrap");
|
||||
if (rw) rw.style.display = ["rect", "ellipse"].includes(kind) ? "" : "none";
|
||||
if (fw) fw.style.display = lineKind ? "none" : "";
|
||||
if (snw) snw.style.display = lineKind ? "none" : "";
|
||||
if (lineKind) {
|
||||
// fill は不要
|
||||
document.getElementById("ie-shape-fill-none").checked = true;
|
||||
document.getElementById("ie-shape-fill").disabled = true;
|
||||
t.fillNone = true;
|
||||
// stroke は常に有効
|
||||
document.getElementById("ie-shape-stroke").disabled = false;
|
||||
document.getElementById("ie-shape-stroke-width").disabled = false;
|
||||
} else {
|
||||
// rect / ellipse: strokeNone に従って再適用
|
||||
const sn = document.getElementById("ie-shape-stroke-none").checked;
|
||||
document.getElementById("ie-shape-stroke").disabled = sn;
|
||||
document.getElementById("ie-shape-stroke-width").disabled = sn;
|
||||
}
|
||||
};
|
||||
|
||||
document.getElementById("ie-shape-kind")?.addEventListener("change", e => {
|
||||
t.shape = e.target.value;
|
||||
_updateShapeVisibility();
|
||||
});
|
||||
document.getElementById("ie-shape-rounded")?.addEventListener("change", e => {
|
||||
t.rounded = e.target.checked;
|
||||
});
|
||||
document.getElementById("ie-shape-fill-none")?.addEventListener("change", e => {
|
||||
t.fillNone = e.target.checked;
|
||||
document.getElementById("ie-shape-fill").disabled = e.target.checked;
|
||||
});
|
||||
document.getElementById("ie-shape-fill")?.addEventListener("input", e => {
|
||||
t.fillColor = e.target.value;
|
||||
});
|
||||
document.getElementById("ie-shape-stroke-none")?.addEventListener("change", e => {
|
||||
t.strokeNone = e.target.checked;
|
||||
document.getElementById("ie-shape-stroke").disabled = e.target.checked;
|
||||
document.getElementById("ie-shape-stroke-width").disabled = e.target.checked;
|
||||
});
|
||||
document.getElementById("ie-shape-stroke")?.addEventListener("input", e => {
|
||||
t.strokeColor = e.target.value;
|
||||
});
|
||||
document.getElementById("ie-shape-stroke-width")?.addEventListener("input", e => {
|
||||
t.strokeWidth = parseFloat(e.target.value) || 1;
|
||||
});
|
||||
document.getElementById("ie-shape-opacity")?.addEventListener("input", e => {
|
||||
t.opacity = parseInt(e.target.value) / 100;
|
||||
document.getElementById("ie-shape-opacity-lbl").textContent = e.target.value + "%";
|
||||
});
|
||||
document.getElementById("ie-shape-undo-btn")?.addEventListener("click", () => this._undo());
|
||||
|
||||
} else {
|
||||
const def = TOOL_DEFS.find(d => d.id === toolId);
|
||||
el.innerHTML = `<span style="font-size:12px;color:var(--wfm-text-secondary);">${def?.label ?? toolId}: coming soon</span>`;
|
||||
@@ -342,6 +449,9 @@ class ImageEditTab {
|
||||
this._loadActiveLayerToCanvas();
|
||||
this._drawTool.onMouseDown(pos.x, pos.y);
|
||||
|
||||
} else if (this._activeTool === "shape" && this._shapeTool) {
|
||||
this._shapeTool.onMouseDown(pos.x, pos.y);
|
||||
|
||||
} else if (this._activeTool === "text" && this._textTool) {
|
||||
// undo・drawCanvasリセットはテキスト確定時(onChange)で行う
|
||||
this._textTool.onMouseDown(pos.x, pos.y);
|
||||
@@ -362,17 +472,20 @@ class ImageEditTab {
|
||||
if (!this._layerMgr) return;
|
||||
const pos = DrawTool.getCanvasPos(refCanvas, e);
|
||||
if (this._activeTool === "draw") this._drawTool?.onMouseMove(pos.x, pos.y);
|
||||
if (this._activeTool === "shape") this._shapeTool?.onMouseMove(pos.x, pos.y);
|
||||
if (this._activeTool === "select") this._selectTool?.onMouseMove(pos.x, pos.y);
|
||||
}
|
||||
|
||||
_onToolMouseUp(e) {
|
||||
if (!this._layerMgr || e.button !== 0) return;
|
||||
if (this._activeTool === "draw") this._drawTool?.onMouseUp();
|
||||
if (this._activeTool === "shape") this._shapeTool?.onMouseUp();
|
||||
if (this._activeTool === "select") this._selectTool?.onMouseUp();
|
||||
}
|
||||
|
||||
_onToolMouseLeave() {
|
||||
if (this._activeTool === "draw") this._drawTool?.onMouseLeave();
|
||||
if (this._activeTool === "shape") this._shapeTool?.onMouseLeave();
|
||||
if (this._activeTool === "select") this._selectTool?.onMouseLeave();
|
||||
}
|
||||
|
||||
@@ -547,6 +660,21 @@ class ImageEditTab {
|
||||
this._refreshLayerList();
|
||||
});
|
||||
|
||||
this._shapeTool = new ShapeTool();
|
||||
this._shapeTool.onChange(shapeObj => {
|
||||
this._saveUndo();
|
||||
const layerName = `Shape ${this._layerMgr.layers.length + 1}`;
|
||||
const layer = this._layerMgr.addLayer("draw", layerName, {
|
||||
contentW: this._canvasW, contentH: this._canvasH,
|
||||
displayW: this._canvasW, displayH: this._canvasH,
|
||||
x: 0, y: 0,
|
||||
});
|
||||
ShapeTool.drawShape(layer.ctx, shapeObj);
|
||||
this._layerMgr.setActive(layer.id);
|
||||
this._updateCompositeView();
|
||||
this._refreshLayerList();
|
||||
});
|
||||
|
||||
this._selectTool = new SelectTool();
|
||||
this._selectTool.setCanvas(overlayCanvas);
|
||||
this._selectTool.onChange(eventType => {
|
||||
@@ -885,6 +1013,7 @@ class ImageEditTab {
|
||||
if (e.key === "v") this._setActiveTool("select");
|
||||
if (e.key === "b") this._setActiveTool("draw");
|
||||
if (e.key === "t") this._setActiveTool("text");
|
||||
if (e.key === "s") this._setActiveTool("shape");
|
||||
// Delete/Backspaceで選択オブジェクト削除
|
||||
if ((e.key === "Delete" || e.key === "Backspace") && this._activeTool === "select") {
|
||||
const layer = this._selectTool?.getSelectedLayer();
|
||||
|
||||
@@ -0,0 +1,229 @@
|
||||
/**
|
||||
* ShapeTool — rect / ellipse / line / freeline drawing tool for Image Edit tab.
|
||||
* Preview is drawn on the overlay canvas; committed shapes become new draw layers.
|
||||
*/
|
||||
export class ShapeTool {
|
||||
constructor() {
|
||||
// shape settings
|
||||
this.shape = "rect";
|
||||
this.rounded = false;
|
||||
this.fillColor = "#ff0000";
|
||||
this.fillNone = false;
|
||||
this.strokeColor = "#000000";
|
||||
this.strokeNone = true;
|
||||
this.strokeWidth = 5;
|
||||
this.opacity = 1.0;
|
||||
|
||||
// internal state
|
||||
this._active = false;
|
||||
this._canvas = null; // overlay canvas (preview)
|
||||
this._ctx = null;
|
||||
this._dragging = false;
|
||||
this._dragStart = null;
|
||||
this._curPt = null;
|
||||
this._points = []; // freeline points
|
||||
|
||||
this._onChange = null;
|
||||
}
|
||||
|
||||
// overlay canvas used for live preview
|
||||
setCanvas(canvas) {
|
||||
this._canvas = canvas;
|
||||
this._ctx = canvas ? canvas.getContext("2d") : null;
|
||||
}
|
||||
|
||||
onChange(cb) { this._onChange = cb; }
|
||||
|
||||
activate() {
|
||||
this._active = true;
|
||||
}
|
||||
|
||||
deactivate() {
|
||||
this._active = false;
|
||||
this._dragging = false;
|
||||
this._clearOverlay();
|
||||
if (this._canvas) this._canvas.style.cursor = "";
|
||||
}
|
||||
|
||||
onMouseDown(x, y) {
|
||||
if (!this._active) return;
|
||||
this._dragging = true;
|
||||
this._dragStart = { x, y };
|
||||
this._curPt = { x, y };
|
||||
this._points = this.shape === "freeline" ? [{ x, y }] : [];
|
||||
}
|
||||
|
||||
onMouseMove(x, y) {
|
||||
if (!this._dragging) return;
|
||||
this._curPt = { x, y };
|
||||
if (this.shape === "freeline") this._points.push({ x, y });
|
||||
this._drawPreview(x, y);
|
||||
}
|
||||
|
||||
onMouseUp() {
|
||||
if (!this._dragging) return;
|
||||
this._dragging = false;
|
||||
this._clearOverlay();
|
||||
this._commit();
|
||||
}
|
||||
|
||||
onMouseLeave() {
|
||||
if (!this._dragging) return;
|
||||
this._dragging = false;
|
||||
this._clearOverlay();
|
||||
this._commit();
|
||||
}
|
||||
|
||||
// ── private ───────────────────────────────────────
|
||||
|
||||
_clearOverlay() {
|
||||
if (this._ctx && this._canvas) {
|
||||
this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);
|
||||
}
|
||||
}
|
||||
|
||||
_drawPreview(curX, curY) {
|
||||
if (!this._ctx || !this._canvas) return;
|
||||
const ctx = this._ctx;
|
||||
ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);
|
||||
|
||||
const s = this._dragStart;
|
||||
ctx.save();
|
||||
ctx.globalAlpha = this.opacity;
|
||||
|
||||
if (this.shape === "freeline") {
|
||||
// freeline: always draw with stroke color (strokeNone has no meaning here)
|
||||
if (this._points.length >= 2) {
|
||||
ctx.strokeStyle = this.strokeColor;
|
||||
ctx.lineWidth = this.strokeWidth;
|
||||
ctx.lineCap = "round";
|
||||
ctx.lineJoin = "round";
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(this._points[0].x, this._points[0].y);
|
||||
for (let i = 1; i < this._points.length; i++) ctx.lineTo(this._points[i].x, this._points[i].y);
|
||||
ctx.stroke();
|
||||
}
|
||||
} else {
|
||||
// dashed blue outline for rect / ellipse / line
|
||||
ctx.strokeStyle = "#0077ff";
|
||||
ctx.lineWidth = Math.max(1, this.strokeWidth || 1);
|
||||
ctx.setLineDash([4, 2]);
|
||||
|
||||
const x1 = Math.min(s.x, curX), y1 = Math.min(s.y, curY);
|
||||
const w = Math.abs(curX - s.x), h = Math.abs(curY - s.y);
|
||||
|
||||
if (this.shape === "ellipse") {
|
||||
ctx.beginPath();
|
||||
ctx.ellipse(x1 + w / 2, y1 + h / 2, w / 2, h / 2, 0, 0, Math.PI * 2);
|
||||
ctx.stroke();
|
||||
} else if (this.shape === "line") {
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(s.x, s.y);
|
||||
ctx.lineTo(curX, curY);
|
||||
ctx.stroke();
|
||||
} else {
|
||||
// rect
|
||||
if (this.rounded) {
|
||||
const r = Math.min(w, h) * 0.15;
|
||||
ctx.beginPath();
|
||||
ctx.roundRect(x1, y1, w, h, r);
|
||||
ctx.stroke();
|
||||
} else {
|
||||
ctx.strokeRect(x1, y1, w, h);
|
||||
}
|
||||
}
|
||||
ctx.setLineDash([]);
|
||||
}
|
||||
ctx.restore();
|
||||
}
|
||||
|
||||
_commit() {
|
||||
const s = this._dragStart, c = this._curPt;
|
||||
if (!s || !c) return;
|
||||
|
||||
const isFreehand = this.shape === "freeline";
|
||||
const dx = Math.abs(c.x - s.x), dy = Math.abs(c.y - s.y);
|
||||
if (!isFreehand && dx < 2 && dy < 2) return;
|
||||
if (isFreehand && this._points.length < 2) return;
|
||||
|
||||
const isStrokeMandatory = ["line", "freeline"].includes(this.shape);
|
||||
const shapeObj = {
|
||||
kind: this.shape,
|
||||
s: { ...s },
|
||||
c: { ...c },
|
||||
points: isFreehand ? this._points.map(p => ({ ...p })) : [],
|
||||
fillColor: this.fillNone ? null : this.fillColor,
|
||||
// line / freeline always use stroke; ignore strokeNone
|
||||
strokeColor: (isStrokeMandatory || !this.strokeNone) ? this.strokeColor : null,
|
||||
strokeWidth: (isStrokeMandatory || !this.strokeNone) ? this.strokeWidth : 0,
|
||||
opacity: this.opacity,
|
||||
rounded: this.rounded,
|
||||
};
|
||||
|
||||
this._onChange?.(shapeObj);
|
||||
}
|
||||
|
||||
// ── static renderer (used by onChange callback to bake shape into layer) ──
|
||||
|
||||
static drawShape(ctx, sh) {
|
||||
const { kind, s, c, points, fillColor, strokeColor, strokeWidth, opacity, rounded } = sh;
|
||||
ctx.save();
|
||||
ctx.globalAlpha = opacity ?? 1;
|
||||
|
||||
if (kind === "freeline") {
|
||||
if (strokeColor && strokeWidth > 0 && points.length >= 2) {
|
||||
ctx.strokeStyle = strokeColor;
|
||||
ctx.lineWidth = strokeWidth;
|
||||
ctx.lineCap = "round";
|
||||
ctx.lineJoin = "round";
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(points[0].x, points[0].y);
|
||||
for (let i = 1; i < points.length; i++) ctx.lineTo(points[i].x, points[i].y);
|
||||
ctx.stroke();
|
||||
}
|
||||
} else if (kind === "ellipse") {
|
||||
const x1 = Math.min(s.x, c.x), y1 = Math.min(s.y, c.y);
|
||||
const w = Math.abs(c.x - s.x), h = Math.abs(c.y - s.y);
|
||||
ctx.beginPath();
|
||||
ctx.ellipse(x1 + w / 2, y1 + h / 2, w / 2, h / 2, 0, 0, Math.PI * 2);
|
||||
if (fillColor) { ctx.fillStyle = fillColor; ctx.fill(); }
|
||||
if (strokeColor && strokeWidth > 0) { ctx.strokeStyle = strokeColor; ctx.lineWidth = strokeWidth; ctx.stroke(); }
|
||||
} else if (kind === "line") {
|
||||
if (strokeColor && strokeWidth > 0) {
|
||||
ctx.strokeStyle = strokeColor;
|
||||
ctx.lineWidth = strokeWidth;
|
||||
ctx.lineCap = "round";
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(s.x, s.y);
|
||||
ctx.lineTo(c.x, c.y);
|
||||
ctx.stroke();
|
||||
}
|
||||
} else {
|
||||
// rect
|
||||
const x1 = Math.min(s.x, c.x), y1 = Math.min(s.y, c.y);
|
||||
const w = Math.abs(c.x - s.x), h = Math.abs(c.y - s.y);
|
||||
if (rounded) {
|
||||
const r = Math.min(w, h) * 0.15;
|
||||
ctx.beginPath();
|
||||
ctx.roundRect(x1, y1, w, h, r);
|
||||
} else {
|
||||
ctx.beginPath();
|
||||
ctx.rect(x1, y1, w, h);
|
||||
}
|
||||
if (fillColor) { ctx.fillStyle = fillColor; ctx.fill(); }
|
||||
if (strokeColor && strokeWidth > 0) { ctx.strokeStyle = strokeColor; ctx.lineWidth = strokeWidth; ctx.stroke(); }
|
||||
}
|
||||
ctx.restore();
|
||||
}
|
||||
|
||||
// coordinate helper (same signature as DrawTool.getCanvasPos)
|
||||
static getCanvasPos(canvas, event) {
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
const scaleX = canvas.width / rect.width;
|
||||
const scaleY = canvas.height / rect.height;
|
||||
return {
|
||||
x: (event.clientX - rect.left) * scaleX,
|
||||
y: (event.clientY - rect.top) * scaleY,
|
||||
};
|
||||
}
|
||||
}
|
||||
+14
-5
@@ -451,7 +451,8 @@ async function bulkRemoveFromGroup(groupName) {
|
||||
const before = groups[groupName].length;
|
||||
groups[groupName] = groups[groupName].filter((m) => !state.selectedModels.has(m));
|
||||
const removed = before - groups[groupName].length;
|
||||
if (groups[groupName].length === 0) delete groups[groupName];
|
||||
// RESERVED_GROUPS (Batch / Stack) は空になってもキーを保持する
|
||||
if (groups[groupName].length === 0 && !RESERVED_GROUPS.includes(groupName)) delete groups[groupName];
|
||||
await saveModelGroups(groups);
|
||||
showToast(`${removed} ${t("modelBulkRemoveDone")}`, "success");
|
||||
renderModelGrid();
|
||||
@@ -651,9 +652,10 @@ async function toggleGroupEnable(groupName, enable) {
|
||||
throw new Error(err.error || "group toggle failed");
|
||||
}
|
||||
const data = await res.json();
|
||||
const members = state.modelGroups[groupName] || [];
|
||||
const okSet = new Set(data.ok || []);
|
||||
const s = state.disabledModels[state.activeModelType] || new Set();
|
||||
members.forEach((m) => { if (enable) s.delete(m); else s.add(m); });
|
||||
// 成功したメンバーのみ更新(部分失敗時のサーバー/クライアント乖離を防ぐ)
|
||||
for (const m of okSet) { if (enable) s.delete(m); else s.add(m); }
|
||||
state.disabledModels[state.activeModelType] = s;
|
||||
const errCount = data.errors?.length || 0;
|
||||
if (errCount > 0) showToast(`${errCount} ${t("modelToggleError")}`, "warning");
|
||||
@@ -947,6 +949,11 @@ function renderGroupFilter() {
|
||||
const groups = state.allModelGroups[state.activeModelType] || {};
|
||||
const names = Object.keys(groups).sort();
|
||||
|
||||
// 選択中のグループが削除された場合はフィルターをリセット
|
||||
if (state.groupFilter && !groups[state.groupFilter]) {
|
||||
state.groupFilter = "";
|
||||
}
|
||||
|
||||
const currentValue = state.groupFilter
|
||||
? `${state.activeModelType}::${state.groupFilter}`
|
||||
: "";
|
||||
@@ -1075,17 +1082,19 @@ function renderThumbView(grid, models) {
|
||||
|
||||
card.querySelector(".wfm-batch-btn")?.addEventListener("click", async (e) => {
|
||||
e.stopPropagation();
|
||||
const btn = e.currentTarget;
|
||||
await toggleBatch(modelName);
|
||||
if (state.showBatchOnly) {
|
||||
renderModelGrid();
|
||||
} else {
|
||||
e.currentTarget.classList.toggle("active", isInBatch(modelName));
|
||||
btn.classList.toggle("active", isInBatch(modelName));
|
||||
}
|
||||
});
|
||||
card.querySelector(".wfm-stack-btn")?.addEventListener("click", async (e) => {
|
||||
e.stopPropagation();
|
||||
const btn = e.currentTarget;
|
||||
await toggleStack(modelName);
|
||||
e.currentTarget.classList.toggle("active", isInStack(modelName));
|
||||
btn.classList.toggle("active", isInStack(modelName));
|
||||
});
|
||||
card.querySelector(".wfm-fav-btn").addEventListener("click", (e) => {
|
||||
e.stopPropagation();
|
||||
|
||||
@@ -93,15 +93,11 @@ async function migrateLocalStoragePresets() {
|
||||
await apiCreatePreset({
|
||||
name: p.name || "Untitled",
|
||||
text: p.posText || p.text || "",
|
||||
negText: p.negText || "",
|
||||
category: "",
|
||||
tags: [],
|
||||
favorite: false,
|
||||
});
|
||||
// Note: negText is stored separately - we combine it
|
||||
if (p.negText) {
|
||||
// Create a separate entry for negative prompt reference
|
||||
// or store in the text field with marker
|
||||
}
|
||||
}
|
||||
localStorage.removeItem(PRESETS_KEY);
|
||||
} catch { /* ignore migration errors */ }
|
||||
@@ -364,7 +360,8 @@ function renderPmGroups(container) {
|
||||
removeBtn.addEventListener("click", (e) => {
|
||||
e.stopPropagation();
|
||||
pmGroups[groupName] = pmGroups[groupName].filter(id => id !== p.id);
|
||||
if (pmGroups[groupName].length === 0) delete pmGroups[groupName];
|
||||
// 予約グループ (Batch) は空になってもキーを保持する
|
||||
if (pmGroups[groupName].length === 0 && !PROMPT_RESERVED_GROUPS.includes(groupName)) delete pmGroups[groupName];
|
||||
saveGroups();
|
||||
renderPresetManager();
|
||||
});
|
||||
|
||||
+71
-45
@@ -260,6 +260,11 @@
|
||||
<button id="wfm-gen-connect-btn" class="wfm-btn wfm-btn-sm">Connect</button>
|
||||
<button id="wfm-gen-model-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh Models</button>
|
||||
<button id="wfm-gen-reset-workflow-btn" class="wfm-btn wfm-btn-sm">Reset Workflow</button>
|
||||
<label id="wfm-style-label" style="display:flex;align-items:center;gap:4px;font-size:12px;cursor:pointer;white-space:nowrap;">
|
||||
<input type="checkbox" id="wfm-style-enabled" style="cursor:pointer;">
|
||||
Style
|
||||
</label>
|
||||
<select id="wfm-style-select" class="wfm-input" style="font-size:12px;padding:2px 6px;height:26px;min-width:120px;max-width:220px;"></select>
|
||||
</div>
|
||||
<div class="wfm-toolbar-right" style="display:flex;align-items:center;gap:8px;">
|
||||
<span id="wfm-gen-wf-name" style="color:var(--wfm-text-secondary);font-size:13px;">No workflow loaded</span>
|
||||
@@ -344,6 +349,7 @@
|
||||
<button class="wfm-batch-left-tab active" data-left-tab="checkpoint">Checkpoints</button>
|
||||
<button class="wfm-batch-left-tab" data-left-tab="sampler">Sampler</button>
|
||||
<button class="wfm-batch-left-tab" data-left-tab="scheduler">Scheduler</button>
|
||||
<button class="wfm-batch-left-tab" data-left-tab="style">Style</button>
|
||||
</div>
|
||||
<div id="wfm-batch-left-checkpoint" class="wfm-batch-left-content active">
|
||||
<div class="wfm-batch-toolbar">
|
||||
@@ -367,6 +373,13 @@
|
||||
</div>
|
||||
<div id="wfm-scheduler-list" class="wfm-batch-list"></div>
|
||||
</div>
|
||||
<div id="wfm-batch-left-style" class="wfm-batch-left-content">
|
||||
<div class="wfm-batch-toolbar">
|
||||
<button type="button" id="wfm-style-batch-select-all" class="wfm-btn wfm-btn-sm">All</button>
|
||||
<button type="button" id="wfm-style-batch-deselect-all" class="wfm-btn wfm-btn-sm">None</button>
|
||||
</div>
|
||||
<div id="wfm-batch-style-list" class="wfm-batch-list"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Center pane: group-based selection with inner tabs -->
|
||||
@@ -447,6 +460,14 @@
|
||||
<div id="wfm-batch-scheduler-count" class="wfm-batch-count"></div>
|
||||
<div id="wfm-batch-scheduler-list" class="wfm-batch-preview-list"></div>
|
||||
</div>
|
||||
<div class="wfm-batch-queue-col">
|
||||
<div class="wfm-batch-queue-col-header">
|
||||
<span>Style</span>
|
||||
<input type="checkbox" class="wfm-batch-type-cb" data-batch-type="style" title="Style batch を有効にする">
|
||||
</div>
|
||||
<div id="wfm-batch-style-count" class="wfm-batch-count"></div>
|
||||
<div id="wfm-batch-style-preview-list" class="wfm-batch-preview-list"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1037,7 +1058,7 @@
|
||||
<h3>GenerateUI Tab</h3>
|
||||
<ul>
|
||||
<li id="wfm-help-gen-1">Connect/disconnect ComfyUI and check connection status</li>
|
||||
<li id="wfm-help-gen-2">Load workflows from Workflow tab (App format .app.json not supported); Reset Workflow button re-reads the current workflow file from disk and reloads the editor; <b>Save</b> button (right end of the tab bar) saves the current workflow — including any edits made in the editor — as a new .json file to the Workflow tab; a filename dialog appears with the current workflow name as the default</li>
|
||||
<li id="wfm-help-gen-2">Load workflows from Workflow tab (App format .app.json not supported); Reset Workflow button re-reads the current workflow file from disk and reloads the editor; <b>Save</b> button (right end of the tab bar) saves the current workflow — including any edits made in the editor — as a new .json file to the Workflow tab; a filename dialog appears with the current workflow name as the default; <b>Style</b> checkbox and dropdown (next to Reset Workflow): enable to apply a Fooocus-style JSON style to the positive and negative prompts at generation time — style files are loaded from <code>user/default/Workflow-Studio/style/*.json</code>; the style's <code>{prompt}</code> placeholder is replaced with the original prompt, or the style text is appended if no placeholder exists</li>
|
||||
<li id="wfm-help-gen-3">5-tab layout — Input (Prompt + Image), Model, Settings, Feeder, Batch — Input/Model/Settings each include a Raw JSON column for instant preview and direct editing</li>
|
||||
<li id="wfm-help-gen-4">Input tab: inner tabs — <b>Prompt</b> and <b>Image</b> (drag-and-drop upload); Prompt tab has Positive Prompt, Negative Prompt, and an <b>Embeddings</b> selector at the bottom — select a model, set Weight (default 1.0), then click <b>Paste</b> to insert <code>(embedding:Name:weight)</code> at the cursor position of the last focused textarea (defaults to Positive if neither is focused)</li>
|
||||
<li id="wfm-help-gen-5">Model tab: Checkpoint, VAE, LoRA, ControlNet, UNET, TextEncoder, <b>Hypernetwork</b> (with Strength field) selectors with filter; LoRA Stack — Apply writes all active LoRAs to the target node and simultaneously inserts LoRA syntax and CivitAI trigger words into the Positive prompt; re-applying updates the prompt by removing inactive LoRAs and re-adding active ones</li>
|
||||
@@ -1047,10 +1068,11 @@
|
||||
<li id="wfm-help-gen-9">Generate, progress display, stop, and view results</li>
|
||||
<li id="wfm-help-gen-10">Eagle integration: auto-save generated images to Eagle</li>
|
||||
<li id="wfm-help-gen-11">Batch tab — enable one batch type at a time by checking the checkbox in the Batch Queue column header; Generate then runs through all queued items sequentially with Pause/Resume and Stop controls</li>
|
||||
<li id="wfm-help-gen-12">Batch tab — Left pane has 3 tabs: <b>Checkpoints</b> (folder tree with Filter/All/None; (root) header checkbox selects all), <b>Sampler</b> (KSampler sampler_name list with (root) checkbox), <b>Scheduler</b> (KSampler scheduler list with (root) checkbox); All/None toolbar buttons also available for each tab</li>
|
||||
<li id="wfm-help-gen-12">Batch tab — Left pane has 4 tabs: <b>Checkpoints</b> (folder tree with Filter/All/None; (root) header checkbox selects all), <b>Sampler</b> (KSampler sampler_name list with (root) checkbox), <b>Scheduler</b> (KSampler scheduler list with (root) checkbox), <b>Style</b> (flat list of all styles loaded from <code>Workflow-Studio/style/</code> with All/None buttons); All/None toolbar buttons available for each tab</li>
|
||||
<li id="wfm-help-gen-13">Batch tab — Center pane: group-based selection with inner tabs (Checkpoint | Lora | Prompt | Workflow); Checkpoint tab shows groups defined in the Models tab — check a group header to select all its members, or expand ▶ to check individual models; group membership always reflects the current Models tab state</li>
|
||||
<li id="wfm-help-gen-14">Batch tab — Right pane (Batch Queue): 6 columns — Checkpoint, Lora, Prompt, Workflow, Sampler, Scheduler; each column has an enable checkbox; only one type active at a time; count shown per column</li>
|
||||
<li id="wfm-help-gen-14">Batch tab — Right pane (Batch Queue): 7 columns — Checkpoint, Lora, Prompt, Workflow, Sampler, Scheduler, <b>Style</b>; each column has an enable checkbox; only one type active at a time; count shown per column</li>
|
||||
<li id="wfm-help-gen-15">Sampler/Scheduler batch: select one or more samplers or schedulers from the left pane, enable the column in Batch Queue, then Generate to run each value through the KSampler node sequentially; sampler/scheduler lists are fetched from ComfyUI (requires connection)</li>
|
||||
<li id="wfm-help-gen-17">Style batch: select styles in the left pane Style tab, enable the Style column in Batch Queue, then Generate — each selected style is applied in sequence to the positive and negative prompts; styles are applied to workflow copies so the loaded workflow is not modified; style files are re-read each time the page loads from <code>user/default/Workflow-Studio/style/*.json</code></li>
|
||||
<li id="wfm-help-gen-16">SPA-side wildcard expansion (A1111-style): when prompt text in non-ImpactWildcard nodes (e.g. CLIPTextEncode) contains __name__ syntax, the SPA expands it at generation time by randomly picking a line from the matching file in the WFS wildcard folder; nested wildcards are re-expanded up to 5 passes; unresolved wildcards are passed through unchanged; ImpactWildcardEncode/Processor nodes are skipped (handled server-side by Impact Pack); works in both single and batch generation</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -1256,61 +1278,63 @@
|
||||
|
||||
<div class="wfm-help-page" id="wfm-help-page-imageedit">
|
||||
<div class="wfm-help-card">
|
||||
<h3>Image Edit Tab</h3>
|
||||
<h3 id="wfm-help-imageedit-title">Image Edit Tab</h3>
|
||||
<ul>
|
||||
<li>Layer-based image editor — compose images with multiple layers (Image, Text, Draw types) and export the composite</li>
|
||||
<li><b>Loading images:</b> drag & drop onto the canvas, Upload button, or send from the Gallery tab via the <b>Image Edit</b> button in the Gallery toolbar; the first image becomes Layer 1 (auto-locked); subsequent images are added as new layers scaled to fit the canvas</li>
|
||||
<li><b>New</b> button: create a blank canvas — prompts for WxH size (e.g. 512x768); clears all existing layers</li>
|
||||
<li id="wfm-help-imageedit-1">Layer-based image editor — compose images with multiple layers (Image, Text, Draw types) and export the composite</li>
|
||||
<li id="wfm-help-imageedit-2">Loading images: drag & drop onto the canvas, Upload button, or send from the Gallery tab via the Image Edit button in the Gallery toolbar; the first image becomes Layer 1 (auto-locked); subsequent images are added as new layers scaled to fit the canvas</li>
|
||||
<li id="wfm-help-imageedit-3">New button: create a blank canvas — prompts for WxH size (e.g. 512x768); clears all existing layers</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3>Tools</h3>
|
||||
<h3 id="wfm-help-imageedit-tools-title">Tools</h3>
|
||||
<ul>
|
||||
<li><b>Select (V):</b> click to select a layer; drag to move; drag corner handles to resize; drag the circle above the top edge to rotate; double-click a text layer to re-edit its content; Tool Options bar shows Flip H / Flip V / Rotate field</li>
|
||||
<li><b>Draw (B):</b> freehand brush drawing onto the active draw layer; Tool Options: color, brush size, blend mode</li>
|
||||
<li><b>Text (T):</b> click on the canvas to place a text input overlay; configure font family, size, bold/italic, align, color in the Tool Options bar; click OK to place the text as an exact-size Text layer; double-click an existing text layer with the Select tool to re-edit</li>
|
||||
<li id="wfm-help-imageedit-4">Select (V): click to select a layer; drag to move; drag corner handles to resize; drag the circle above the top edge to rotate; double-click a text layer to re-edit its content; Tool Options bar shows Flip H / Flip V / Rotate field</li>
|
||||
<li id="wfm-help-imageedit-5">Draw (B): freehand brush drawing onto the active draw layer; Tool Options: color, brush size, blend mode</li>
|
||||
<li id="wfm-help-imageedit-6">Text (T): click on the canvas to place a text input overlay; configure font family, size, bold/italic, align, color in the Tool Options bar; click OK to place the text as an exact-size Text layer; double-click an existing text layer with the Select tool to re-edit</li>
|
||||
<li id="wfm-help-imageedit-7">Shape (S): draw geometric shapes onto the canvas; each committed shape becomes an independent draw layer; Tool Options: Shape type (Rect / Ellipse / Line / FreeLine), Rounded checkbox (Rect / Ellipse only), Fill color + None toggle (hidden for Line / FreeLine), Stroke color + width + None toggle (None hidden for Line / FreeLine where stroke is always active), Opacity slider, ↩ Undo button; drag to draw — a blue dashed outline previews the shape; release to commit</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3>Layer Panel</h3>
|
||||
<h3 id="wfm-help-imageedit-layer-title">Layer Panel</h3>
|
||||
<ul>
|
||||
<li>Layers are listed from front (top) to back (bottom); click a layer row to make it active</li>
|
||||
<li><b>👁 / 🚫</b> button: toggle layer visibility</li>
|
||||
<li><b>🔒 / 🔓</b> button: toggle layer lock — a locked layer cannot be moved, resized, or rotated (orange bounding box is shown); Layer 1 is locked automatically when the first image is loaded to prevent accidental moves</li>
|
||||
<li>Opacity slider at the bottom adjusts the active layer's transparency</li>
|
||||
<li>Type icons: 🖼 = image layer, T = text layer, ✏ = draw layer</li>
|
||||
<li>Delete key: removes the selected layer (only when 2+ layers exist)</li>
|
||||
<li id="wfm-help-imageedit-8">Layers are listed from front (top) to back (bottom); click a layer row to make it active</li>
|
||||
<li id="wfm-help-imageedit-9">👁 / 🚫 button: toggle layer visibility</li>
|
||||
<li id="wfm-help-imageedit-10">🔒 / 🔓 button: toggle layer lock — a locked layer cannot be moved, resized, or rotated (orange bounding box is shown); Layer 1 is locked automatically when the first image is loaded to prevent accidental moves</li>
|
||||
<li id="wfm-help-imageedit-11">Opacity slider at the bottom adjusts the active layer's transparency</li>
|
||||
<li id="wfm-help-imageedit-12">Type icons: 🖼 = image layer, T = text layer, ✏ = draw layer</li>
|
||||
<li id="wfm-help-imageedit-13">Delete key: removes the selected layer (only when 2+ layers exist)</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3>Text Object Quality</h3>
|
||||
<h3 id="wfm-help-imageedit-text-title">Text Object Quality</h3>
|
||||
<ul>
|
||||
<li>Text layers are sized exactly to the measured text bounding box — no extra whitespace</li>
|
||||
<li>When a text layer is resized with the Select tool, the canvas is regenerated at the new display size so the text remains sharp (no blurring)</li>
|
||||
<li>Re-editing a text layer (double-click) resets it to native size; re-scale afterward if needed</li>
|
||||
<li id="wfm-help-imageedit-14">Text layers are sized exactly to the measured text bounding box — no extra whitespace</li>
|
||||
<li id="wfm-help-imageedit-15">When a text layer is resized with the Select tool, the canvas is regenerated at the new display size so the text remains sharp (no blurring)</li>
|
||||
<li id="wfm-help-imageedit-16">Re-editing a text layer (double-click) resets it to native size; re-scale afterward if needed</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3>Export & Navigation</h3>
|
||||
<h3 id="wfm-help-imageedit-export-title">Export & Navigation</h3>
|
||||
<ul>
|
||||
<li><b>Save PNG:</b> composites all visible layers and downloads the result as a PNG file</li>
|
||||
<li><b>Save to Gallery:</b> prompts for a filename (default: <code>wfs-image-YYYYMMDDHHmmss</code>) and saves the composite PNG directly to the Gallery root folder (configured in Settings > Gallery Output Folder); requires the Gallery tab to have been opened at least once to set the root</li>
|
||||
<li><b>Send to ComfyUI:</b> uploads the composite PNG to ComfyUI's input folder via <code>/upload/image</code>, making it selectable in Load Image nodes</li>
|
||||
<li><b>Canvas navigation:</b> scroll wheel to zoom, Space + drag to pan</li>
|
||||
<li><b>Undo / Redo:</b> Ctrl+Z / Ctrl+Y (or toolbar buttons ↩ ↪)</li>
|
||||
<li id="wfm-help-imageedit-17">Save PNG: composites all visible layers and downloads the result as a PNG file</li>
|
||||
<li id="wfm-help-imageedit-18">Save to Gallery: prompts for a filename (default: wfs-image-YYYYMMDDHHmmss) and saves the composite PNG directly to the Gallery root folder (configured in Settings > Gallery Output Folder); requires the Gallery tab to have been opened at least once to set the root</li>
|
||||
<li id="wfm-help-imageedit-19">Send to ComfyUI: uploads the composite PNG to ComfyUI's input folder via /upload/image, making it selectable in Load Image nodes</li>
|
||||
<li id="wfm-help-imageedit-20">Canvas navigation: scroll wheel to zoom, Space + drag to pan</li>
|
||||
<li id="wfm-help-imageedit-21">Undo / Redo: Ctrl+Z / Ctrl+Y (or toolbar buttons ↩ ↪)</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3>Image Edit Keyboard Shortcuts</h3>
|
||||
<h3 id="wfm-help-imageedit-kbd-title">Image Edit Keyboard Shortcuts</h3>
|
||||
<ul>
|
||||
<li><b>V</b>: Select tool</li>
|
||||
<li><b>B</b>: Draw tool</li>
|
||||
<li><b>T</b>: Text tool</li>
|
||||
<li><b>Delete</b>: Delete selected layer (requires 2+ layers)</li>
|
||||
<li><b>Ctrl+Z / Ctrl+Y</b>: Undo / Redo</li>
|
||||
<li><b>Space + drag</b>: Pan canvas</li>
|
||||
<li><b>Mouse wheel</b>: Zoom in / out</li>
|
||||
<li><b>Double-click</b> (Select tool on text layer): Re-edit text</li>
|
||||
<li id="wfm-help-imageedit-22">V: Select tool</li>
|
||||
<li id="wfm-help-imageedit-23">B: Draw tool</li>
|
||||
<li id="wfm-help-imageedit-24">T: Text tool</li>
|
||||
<li id="wfm-help-imageedit-25">S: Shape tool</li>
|
||||
<li id="wfm-help-imageedit-26">Delete: Delete selected layer (requires 2+ layers)</li>
|
||||
<li id="wfm-help-imageedit-27">Ctrl+Z / Ctrl+Y: Undo / Redo</li>
|
||||
<li id="wfm-help-imageedit-28">Space + drag: Pan canvas</li>
|
||||
<li id="wfm-help-imageedit-29">Mouse wheel: Zoom in / out</li>
|
||||
<li id="wfm-help-imageedit-30">Double-click (Select tool on text layer): Re-edit text</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1326,15 +1350,16 @@
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3>Image Edit Tab Shortcuts</h3>
|
||||
<h3 id="wfm-help-imageedit-tabkbd-title">Image Edit Tab Shortcuts</h3>
|
||||
<ul>
|
||||
<li>V: Select tool</li>
|
||||
<li>B: Draw tool</li>
|
||||
<li>T: Text tool</li>
|
||||
<li>Delete: Delete selected layer (requires 2+ layers)</li>
|
||||
<li>Ctrl+Z / Ctrl+Y: Undo / Redo</li>
|
||||
<li>Space + drag: Pan canvas</li>
|
||||
<li>Mouse wheel: Zoom in / out</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-1">V: Select tool</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-2">B: Draw tool</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-3">T: Text tool</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-4">S: Shape tool</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-5">Delete: Delete selected layer (requires 2+ layers)</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-6">Ctrl+Z / Ctrl+Y: Undo / Redo</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-7">Space + drag: Pan canvas</li>
|
||||
<li id="wfm-help-imageedit-tabkbd-8">Mouse wheel: Zoom in / out</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1528,6 +1553,7 @@
|
||||
<button class="ie-tool-btn active" data-tool="select" title="Select (V)">▲</button>
|
||||
<button class="ie-tool-btn" data-tool="draw" title="Draw (B)">✏</button>
|
||||
<button class="ie-tool-btn" data-tool="text" title="Text (T)">T</button>
|
||||
<button class="ie-tool-btn" data-tool="shape" title="Shape (S)">□</button>
|
||||
<button class="ie-tool-btn ie-tool-placeholder" data-tool="mask" title="Mask">🎭</button>
|
||||
<button class="ie-tool-btn ie-tool-placeholder" data-tool="blur" title="Blur">≈</button>
|
||||
<button class="ie-tool-btn ie-tool-placeholder" data-tool="filter" title="Filter">★</button>
|
||||
|
||||
Reference in New Issue
Block a user