Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ede39ec715 | ||
|
|
ad3b380929 | ||
|
|
c589e562e4 |
@@ -2,6 +2,8 @@
|
||||
|
||||
Condensed version-by-version index of DEVLOG.md (each line: version + one-line summary of what changed and why). Full rationale, code details, and "How to apply" lessons live in the excluded DEVLOG.md itself; this index exists so graphify can extract a queryable semantic node per release without feeding the full log to the local Ollama model. Regenerate with `python tools/generate_doc_index.py devlog` whenever DEVLOG.md changes.
|
||||
|
||||
- **v0.5.0** — 機能追加: mp4動画Gallery対応 + Videoタブ新設(MiniMax H3専用) + バグ修正: Galleryのタグ/メモが再起動後に消える
|
||||
- **v0.4.8** — 機能追加: LabタブにPromptグループ一括適用+キーフレーム並べ替え + バグ修正: デフォルトワークフローの上書き保存が反映されない + Styleテーブルの「このファイルへ追加」対応
|
||||
- **v0.4.7** — 機能追加: Prompt Tab内部リファクタ + Gallery Promptタブ新設 + Send to Canvas改善 + Presetsソート
|
||||
- **v0.4.6** — 機能追加: MetadataタブをGalleryタブへ統合 + Promptタブに一覧編集可能なTable表示を新設
|
||||
- **v0.4.5** — 調査: トップバー保存ワークフローのRMBG不具合報告(原因なし) + バグ修正: LabタブModel列の無意味な空キーフレーム表示を解消
|
||||
|
||||
@@ -2,6 +2,57 @@
|
||||
|
||||
---
|
||||
|
||||
## v0.5.0
|
||||
|
||||
### 機能追加: mp4動画Gallery対応 + Videoタブ新設(MiniMax H3専用) + バグ修正: Galleryのタグ/メモが再起動後に消える
|
||||
|
||||
動画生成ワークフロー対応の第一弾。「1. 動画ファイルmp4対応 2. 動画生成に対応していきたい。まずはminimax_H3動画生成ワークフローに対応させたい」との要望を起点に、実機フィードバックを重ねながら仕上げた一連の作業。ブランチ`feature/mp4-video-gallery-and-video-tab`で実施。
|
||||
|
||||
**1. Galleryタブのmp4動画対応**: `.mp4`を`IMAGE_EXTENSIONS`に追加し、一覧・お気に入り・タグ・グループ・移動・削除・エクスポートなど既存の画像操作全てにmp4も対象として乗るようにした。サムネイルはPillowで開けないため、PyAV (`av`) で先頭フレームを抽出しJPEGとしてディスクキャッシュする専用ロジックを追加(ComfyUI本体が既に`av>=17.0.0`を要求しており追加インストール不要。未導入環境ではサムネイル生成のみ失敗しプレースホルダー表示にフォールバックする設計)。フロントエンドは詳細パネル・lightbox・Compareビューで拡張子に応じて`<img>`/`<video controls>`を出し分け、サムネイルグリッドには▶バッジを重ねて動画であることを示す。
|
||||
|
||||
**2. 新規Videoタブ(MiniMax H3専用、GenerateUIタブとは完全に独立)**: `C:\Users\...\ComfyUI_5\user\default\workflows\minimax_test.json`をリファレンスに、first_frame/last_frame/prompt/aspect_ratio/megapixels/multiple/duration/noise_seedのフォームを持つ新規タブ`video-tab.js`を作成。モデル選択(UNet/CLIP/VAE/Audio VAE)はワークフローの既定値に固定し編集不可とした(ユーザー確認済み)。`comfyWorkflow.convertUiToApi()`が既にサブグラフのflatten処理を内蔵していたため、Videoタブ独自のグラフ→プロンプト変換は不要で、生成そのものは既存の`comfyUI.generate()`をそのまま再利用できた(ComfyUI本体の`SaveVideo`/`PreviewVideo`が`{"images":[...], "animated":true}`という画像と同じレスポンス形式で動画を返すため)。
|
||||
|
||||
**3. 実機フィードバックへの追随(ボタン配置・色・レイアウト)**: 一連の実機確認を経て、(a) Galleryの詳細パネルのダウンロードオーバーレイが動画の再生コントロール操作をブロックするため廃止し、Taggerボタン右隣に常時表示の「Download」ボタン(識別しやすいようオレンジ色)を新設、「Load GenUI」ボタンは「GenUI」に短縮、(b) Workflowタブのモーダルにあった「生成UIに読み込み」「Videoに読み込み」「キャンバスへ送る」の3ボタンを廃止し、一覧選択時のサイドパネルツールバー(生成UIに読み込みの右隣に新規追加した「Videoに読み込み」)へ統合、(c) Videoタブの結果パネルの位置・サイズを繰り返し調整 — 最終的に**3ペイン構成**(左:フォーム/中央:プレビュー+将来の編集機能用プレースホルダー/右:将来のプロパティ機能用プレースホルダー)に落ち着いた。各ペインを独立したflexカラムにしたことで、中央の生成結果の高さがどれだけ変わっても左右のペインの位置が動かなくなる(`max-height`だけで高さを抑えていた前段の実装では、動画のコントロールバー分だけ実高さが伸び、下のフォームパネルを押し下げてしまっていた)。Kapture経由で実際のブラウザDOM(`getBoundingClientRect()`)とスクリーンショットを直接確認しながら調整した。
|
||||
|
||||
**4. First Frame/Last Frameを両方optionalに、LoadImageノードが無いワークフローにも対応**: 「First Frameなしでも動作させたい(ノードをバイパスで処理)。またノードのないワークフローにも対応させたい」との要望。`minimax_test1.json`(first_frame/last_frame双方とも未接続、対応するLoadImageノードがトップレベルに存在しない構成)を新たに確認し、`locateMiniMaxNodes()`のLoadImageノード必須チェックを撤廃。first_frame未指定時はリンクなしのまま実行(バイパス)し、画像が指定された場合のみその場でLoadImageノードを動的に注入する設計に変更(ノードID/リンクIDはclone内の実際の最大値+1で採番するため重複の心配がない)。first_frameスロットにもlast_frameと同様のClearボタンを追加した。
|
||||
|
||||
**5. バグ修正: mp4のタグ/メモがComfyUI再起動後に消える**: 「タグ、メモadd、保存操作はできるが記録されていない。画像ファイルもできていない。エラー表示はなし、ブラウザもなし」との報告を受け、`comfyui_8189.log`を直接確認したところ`Cleaned up 189 stale metadata entries from ...\Text2Img`という決定的なログを発見。**根本原因**: `cleanup_stale_images()`は「現在表示中のフォルダ配下」のメタデータキーを全階層(サブフォルダ含む)対象にstale判定するが、Galleryがルートフォルダを非再帰スキャンした場合、`existing_paths`(現在のファイル一覧)にはルート直下のファイルしか含まれない。Videoタブで生成した動画は`SaveVideo`の`filename_prefix`設定で`video/MiniMax_H3/`というサブフォルダに保存されるため、ルートフォルダを開くたびに「サブフォルダ内ファイルは非再帰スキャンには映らない→存在しないと誤判定→メタデータ削除」が発生し、189件ものタグ/メモ/お気に入り情報が消えていた。`cleanup_stale_images()`に`recursive`引数を追加し、非再帰スキャン時はfolder_path直下のみを対象にするよう修正(`gallery_service.py`の`list_images()`から`recursive`をそのまま伝播)。既に削除済みのデータはバックアップが無く復元不可能だった旨をユーザーに伝えた。
|
||||
- 副次的に発見したフロントエンドのバグも合わせて修正: `saveMetaField()`がサーバーのレスポンス(`{"ok": bool}`)を一切チェックせず常に成功したかのようにローカル状態を楽観的更新していたため、サーバー側で保存が拒否されてもUI上はエラーなく成功したように見えてしまう作りになっていた。レスポンスの`ok`フィールドを検証し失敗時は例外を投げるよう変更、`addTag`/`removeTag`/メモ保存ハンドラは戻り値を見て成功時のみローカル状態を更新するよう修正した。保険的措置として`save_image_meta`(バックエンド)の保存キーも`get_image_metadata`と同じ`resolve()`後のパスに統一した。
|
||||
|
||||
**ヘルプ・README更新**: `project_v0336_conventions`の慣習(index.html + i18n.js 3言語 + app.jsのhelpIdMapの3点セット)に従い、新規Video Tabヘルプページを追加。README.mdはバージョンバッジ更新、Workflow Tab(サイドパネルツールバーの3ボタン構成)、Gallery Tab(Downloadボタンの新配置・mp4対応・GenUIボタンへの改名)、新規Video Tabセクション(3ペイン構成・optional First/Last Frame・ノードなしワークフロー対応)を追加した。
|
||||
|
||||
**検証**: 全JS/Pythonファイルを`node --check`/`ast.parse()`で構文確認。開発元gitリポジトリと実行時`custom_nodes`フォルダは別実体のため([[project_dev_deploy_sync]]参照)、変更した全11ファイルを都度同期しmd5ハッシュ比較で完全一致を確認、Pythonファイル変更時は`__pycache__`を全クリア。Kapture(ブラウザDevTools連携)で実際のブラウザに接続し、DOM要素の`getComputedStyle()`/`getBoundingClientRect()`とスクリーンショットで3ペインレイアウトの実測検証、生成後状態はダミー画像をDOMに直接注入して左右ペインが動かないことを確認。mp4のGallery表示・再生、タグ/メモ保存とComfyUI再起動後の永続性、Workflowタブの新規ボタン導線はユーザー自身の実機で確認済み。
|
||||
|
||||
**How to apply**: サーバーAPIが常にHTTP 200を返し成否をレスポンスボディの`ok`フィールドで表す設計(このプロジェクト全体で頻出するパターン)では、呼び出し側で必ずそのフィールドをチェックする — でないと「操作はできるがエラーも出ず、実は保存されていない」というサイレント障害が発生し得る。複数のパネルを横並びに配置するレイアウトで「あるパネルの内容量に応じて他のパネルの位置がずれる」不具合が出た場合、`max-height`のような上限指定では実コンテンツが小さいときに縮んでしまい根本解決にならない — 各パネルを独立したflexカラムに分離し、パネル間で高さを共有させない構造にするのが確実。「フォルダ配下」を対象にした一括処理(今回のstale cleanup)を書く際は、その処理が使う「現在のファイル一覧」がフォルダの全階層をカバーしているか(非再帰スキャンならサブフォルダは含まれない)を必ず確認し、範囲の不一致がないか意識する。ブラウザで実際に何が起きているか切り分けが必要な場面では、コードを読むだけでなくKapture等でDOMの実測値を直接取得するのが最も確実。
|
||||
|
||||
関連: [[project_dev_deploy_sync]], [[project_v0336_conventions]]
|
||||
|
||||
---
|
||||
|
||||
## v0.4.8
|
||||
|
||||
### 機能追加: LabタブにPromptグループ一括適用+キーフレーム並べ替え + バグ修正: デフォルトワークフローの上書き保存が反映されない + Styleテーブルの「このファイルへ追加」対応
|
||||
|
||||
ユーザーからの複数の要望・不具合報告を1セッションで順に実装した一連の作業。
|
||||
|
||||
**1. LabタブPrompt列に「PG」ボタン — Promptタブのグループをキーフレームへ一括変換**: 「生成UIタブのLabのプロンプトにプロンプトタブのグループを使用できるようにしたい。'PG'ボタンを配置、モーダルでプロンプトのグループを選択、決定するとプロンプトのキーフレームが#1から自動で作成されます(#1は上書き)」との要望。`prompt-presets.js`の`pmGroups`(グループ名→プリセットID配列)を参照する`getPresetsInGroup()`を新設してexportし、`lab-tab.js`側にPresetManagerの一覧UI(`.wfm-pm-item`)を再利用したグループ選択モーダルを実装。選択→適用で`_lab.columns.prompt`をグループ内プリセット順に#1から全置換(#1は上書き、以降は#2,#3...)する。グループのプリセット数がBatch数を超える場合はBatch数を自動引き上げ(Batch入力欄自体の上限50でキャップ)、それでも収まらない分は既存の「Batchを超えたキーフレーム」警告トースト(`_warnIfKeyframesExceedBatch`)をそのまま再利用して通知する形にした。
|
||||
|
||||
**2. Lab: Model/Prompt/KSampler キーフレームの並べ替え**: 続けて「モデル、プロンプト、Ksamplerそれぞれでキーフレームの順変更を可能にしたい。キーフレームのモーダル展開をWクリックに変更しシングルクリックでキーフレームを選択、PGボタン左隣に上下ボタンを設置し操作可能にしたい」との要望。キーフレームセルのクリック挙動を分離し、シングルクリックは選択状態(列ごとに`_selectedIdx[col]`で管理、青枠でハイライト)、ダブルクリックで従来の編集モーダルを開くように変更。各列ヘッダーに▲/▼ボタンを追加し(Promptは要望通りPGボタンの左隣)、選択中のキーフレームと隣接するキーフレームの`atIteration`を入れ替えることで並び順を変更する実装にした。キーフレーム#1(ベースライン — GenerateUIのライブ値を表示する特別な行)は移動不可、かつ他のキーフレームが#1の位置に入れ替わることもないよう制約した。Prompt Group適用・Plan読込・Plan Clearなど列を丸ごと置き換える操作では選択状態を自動リセットするようにし、配列外を指す不整合を防いだ。
|
||||
|
||||
**3. バグ修正: デフォルトワークフローに設定した状態で同名上書き保存すると変更が反映されない**: 「生成UIタブで読み込んだデフォルトワークフローのモデルを変更しワークフローを同名で上書き保存した。ワークフロータブでJSONでモデルが変更していることを確認。ブラウザハード再読み込みを行うと以前のモデルが表示される」との不具合報告(スクリーンショット添付、旧モデル名がインストール済みモデルの一覧に無く「見つかりません」警告が出ている状態)。調査の結果、「デフォルトワークフローに設定」機能(`workflow-tab.js`)は設定した時点のワークフローJSON全体を`localStorage`(`wfm_settings.defaultWorkflowData`)へスナップショットとして保存し、起動時の自動読込(`generate-tab.js`)はこのスナップショットを読む仕様であることが判明。GenerateUIタブでの同名上書き保存はファイル自体は更新するが、このスナップショットまでは更新していなかったため、リロードのたびに保存前の古い内容が復活していた。`saveCurrentWorkflow()`の保存成功後処理に、保存したファイル名が現在の`defaultWorkflow`と一致する場合は`defaultWorkflowData`も同時に更新する処理を追加して修正した。
|
||||
|
||||
**4. Prompt Tab Tableビュー Styleタブに「+ Add to this file」対応**: 「プロンプトタブ、テーブルのスタイルにForm同様に既存のjsonファイルに追加する方法が欲しい(custom.json以外の場合)。該当jsonのスタイルを選択状態で+ Add to this fileボタンで追加できるようにしたい」との要望。Formタブのスタイルマネージャー(`prompt-styles.js`)には既にこの機能があったが、Tableビュー(`prompt-table.js`)の新規スタイル作成は常に`custom.json`固定(`styleApiCreate(..., null)`)だった。行選択が1件かつそのスタイルの`file`が`custom.json`以外の場合のみ有効化される「+ Add to this file」ボタンをツールバーに追加し、クリックすると保存先ファイルを保持したまま空の新規行を追加(File列に保存前からバッジ表示)、保存時に`styleApiCreate(name, pos, neg, pendingNewStyleFile)`で対象ファイルへ追記する実装にした。バックエンド(`settings_routes.py`)は元々`file`パラメータでの追記に対応済みだったため、フロントエンドの導線を追加するだけで実現できた。
|
||||
|
||||
**ヘルプ・README更新**: `project_v0336_conventions`の慣習(index.html + i18n.js 3言語 + app.jsのhelpIdMapの3点セット)に従い、Lab subtab(Setting/Columnsカードへ選択・並べ替えとPGボタンの説明2項目)とPrompt Tab(Table Viewカードへ「+ Add to this file」の説明1項目)を追加。README.mdはGenerateUI Tab(Saveボタン説明にデフォルトワークフロースナップショット修正の注記)、Lab subtab(見出しのバージョン範囲をv0.4.8へ更新、選択/並べ替えとPGボタンの新規項目)、Prompt Tab(Styleテーブルの項目に「+ Add to this file」のTableビュー対応を追記)を更新した。
|
||||
|
||||
**検証**: 全JSファイルを`node --check`で構文確認。開発元gitリポジトリと実行時`custom_nodes`フォルダは別実体のため([[project_dev_deploy_sync]]参照)、変更ファイルごとに改行コード(CRLF/LF)の一致を確認してから同期し、都度`diff`で完全一致を検証した。デフォルトワークフローのバグ修正はユーザー自身の実機(GenerateUIでの上書き保存→ハード再読み込み)で確認済み。PGボタン・キーフレーム並べ替え・Styleの「+ Add to this file」もユーザー自身の実機確認で動作を確認済み。
|
||||
|
||||
**How to apply**: 開発元リポジトリと実行時`custom_nodes`フォルダへの同期前には必ず`file`コマンドで両ファイルの改行コードが一致しているか確認する(過去に一部ファイルだけLF化していた事例があるため — [[project_dev_deploy_sync]]参照)。一致していれば単純な`cp`で安全にデプロイでき、`diff`で完全一致を最終確認する。キーフレームや行の「並べ替え」機能を実装する際、内部的にソート順を保持する配列(今回は`atIteration`昇順)に対しては、配列そのものの並べ替えではなく「隣接要素同士でソートキーの値を交換する」実装にすると、他のロジック(`_resolveKeyframe`等)が前提とする「配列は常にソート済み」という不変条件を崩さずに済む。
|
||||
|
||||
関連: [[project_dev_deploy_sync]], [[project_v0336_conventions]]
|
||||
|
||||
---
|
||||
|
||||
## v0.4.7
|
||||
|
||||
### 機能追加: Prompt Tab内部リファクタ + Gallery Promptタブ新設 + Send to Canvas改善 + Presetsソート
|
||||
|
||||
+8
-5
@@ -26,12 +26,12 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- Built-in AI tools (translation and more)
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## Features (tab -> feature names)
|
||||
|
||||
### Workflow Tab
|
||||
Thumbnail / Table views, Thumbnail side panel, Badge filtering, Search, Side panel tabs, Badge management, AI summary, Import / Export, Default view setting, Search clear (✕), Clear all filters (✕ Clear)
|
||||
Thumbnail / Table views, Thumbnail side panel, Badge filtering, Search, Side panel tabs, Badge management, AI summary, Import / Export, Side panel toolbar buttons, Default view setting, Search clear (✕), Clear all filters (✕ Clear)
|
||||
|
||||
### Canvas Snapshot (v0.1.2)
|
||||
One-click capture, Auto-save as thumbnail, Embedded workflow metadata, Auto-import
|
||||
@@ -42,8 +42,8 @@ One-click capture, Auto-save as thumbnail, Embedded workflow metadata, Auto-impo
|
||||
### Feeder subtab (v0.3.5 / v0.3.42)
|
||||
ImageFeeder node control, Image library, Selection management, Presets, Continuous Run loop, Index sync, Seed, WFS_GalleryFeeder node, Node & group selector, Image grid, After Gen modes, Run / Stop controls
|
||||
|
||||
### Lab subtab (v0.3.87 – v0.4.5)
|
||||
Setting / Results / Plan JSON sub-panels, Per-column keyframes, Model column — Checkpoint / LoRA Single / VAE, Empty state when no matching node exists, Wildcards, Prompt cell extras, Keyframe #1 live-reflect, Bypass checkbox, LoRA node bypass & prompt injection, T2I workflow support, Use generated image for next, Workflow recall, Plan files, Plan Load, Plan JSON tab, Save index image to Output on Run, Index images are self-contained plan files, Eagle integration
|
||||
### Lab subtab (v0.3.87 – v0.4.8)
|
||||
Setting / Results / Plan JSON sub-panels, Per-column keyframes, Model column — Checkpoint / LoRA Single / VAE, Empty state when no matching node exists, Wildcards, Prompt cell extras, Keyframe #1 live-reflect, Bypass checkbox, LoRA node bypass & prompt injection, T2I workflow support, Use generated image for next, Workflow recall, Plan files, Plan Load, Plan JSON tab, Save index image to Output on Run, Index images are self-contained plan files, Eagle integration, Select vs. edit, and keyframe reordering, PG — apply a Prompt tab preset group
|
||||
|
||||
### Prompt Tab
|
||||
3-column layout, AI chat assistant, Image attachment, Translation, Prompt presets, Preset Manager, Group management, Clipboard copy, GenUI Set, Wildcard/Style tab bar, Wildcard input toolbar, Wildcard file manager, Style manager, Form / Table toggle, Table view — Presets / Presets Group / Wildcards / Style
|
||||
@@ -52,7 +52,7 @@ Setting / Results / Plan JSON sub-panels, Per-column keyframes, Model column —
|
||||
2-column layout, Collapsible sections, Theme selection, Theme customization, Workflows directory, Gallery output directory, Eagle connection, Ollama connection, CivitAI Host, CivitAI API Key, Default workflow, Default Checkpoint, Data Management, Text Size, RAW JSON Colors, GenerateUI Model Tab Highlight, Wildcard Integration, G'MIC-Qt Integration, Language
|
||||
|
||||
### Gallery Tab (v0.3.44)
|
||||
Output / ImagePrompt / Style_Catalog / Metadata sub-tabs, Image browser, Folder tree root label, Thumbnail / Table views, Folder management, File operations, Download, Multi-select, Image Compare, Prompt search, Server-side filtering, Group management, Thumbnail F button, Favorites, Detail panel, Prompt tab, Workflow viewer, Load GenUI button, Image Edit button, Send GenUI Image button, Send CC button, Search clear (✕), Clear all filters (✕ Clear), Workflow auto-save, Output folder configurable, SVG file support, Performance
|
||||
Output / ImagePrompt / Style_Catalog / Metadata sub-tabs, Image browser, Folder tree root label, Thumbnail / Table views, Folder management, File operations, Download, MP4 video support, Multi-select, Image Compare, Prompt search, Server-side filtering, Group management, Thumbnail F button, Favorites, Detail panel, Prompt tab, Workflow viewer, GenUI button, Image Edit button, Send GenUI Image button, Send CC button, Search clear (✕), Clear all filters (✕ Clear), Workflow auto-save, Output folder configurable, SVG file support, Performance
|
||||
|
||||
### ImagePrompt Gallery subtab (v0.3.94, renamed from Style/Prompt in v0.3.95)
|
||||
Visual prompt library, 3-column layout, Prompt builder (right pane), Plain-text prompt storage, ponyxlWildcardsVault format support, Seed data importer
|
||||
@@ -75,6 +75,9 @@ Model Browser, Thumbnail / Table views, Table column sort, Search & Filter, User
|
||||
### Image Edit Tab (v0.3.65)
|
||||
Layer-based image editor, Loading images, New button, Tools, Layer panel, Layer lock, Text quality, Export, Canvas navigation, Undo / Redo
|
||||
|
||||
### Video Tab (v0.5.0)
|
||||
Dedicated MiniMax H3 video generation UI, independent of GenerateUI, 3-pane layout, First Frame / Last Frame are both optional, Node lookup instead of hardcoded IDs, Load in Video, Result panel
|
||||
|
||||
### AI TOOL Tab (v0.3.14)
|
||||
4-pane layout, Translation pane, Chat pane, Chat pane — image generation via Tool Calling, Chat pane — generate_image extra parameters, TOOLS pane (VLM), TOOLS pane — shared Chat attachment, TOOLS pane (Wildcards), Chat pane — image-to-image (I2I), Chat pane — SVG generation, no ComfyUI workflow involved, Chat pane — Skills, Settings pane, Unsloth backend, Settings pane — Chat Image Generation, Settings pane — Chat I2I Generation, Settings pane — Generation, Settings shared, Backend support, URL security, Lemonade's other endpoints (not integrated)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- Built-in AI tools (translation and more)
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## Screenshots
|
||||
|
||||
@@ -69,6 +69,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- **Badge management** — add, rename, delete badges with custom colors shared with the Models tab (⚙ Badge button)
|
||||
- **AI summary** — generate workflow descriptions using Ollama
|
||||
- **Import / Export** — import workflows from files or clipboard; **Send to Canvas** button sends the selected workflow directly to the ComfyUI canvas (UI and API formats both supported)
|
||||
- **Side panel toolbar buttons** (v0.5.0) — selecting a card shows three buttons in the top toolbar: **Load in GenerateUI**, **Load in Video** (new — loads a MiniMax H3 Image-to-Video workflow into the Video tab; shows an error toast for workflows that don't contain that node), and **Send to Canvas**; the detail modal's duplicate copies of these three buttons were removed in favor of this single toolbar location
|
||||
- **Default view setting** — persist your preferred view mode (Thumbnail / Table)
|
||||
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
|
||||
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, group filter, and badge filter (ALL) in one click
|
||||
@@ -90,6 +91,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
|
||||
- **6-tab layout** — Input / Model / Settings / Feeder / Batch / **Lab** tabs; Input, Model, and Settings each include a Raw JSON column on the right for instant preview and direct editing
|
||||
- **Save button** — located at the right end of the subtab row; opens a filename dialog (default: current workflow name) and saves the current workflow as a `.json` file to the Workflow tab via the import API; hidden while the Batch or Lab subtab is active (v0.4.6), since those work on workflow copies / their own Plan files rather than the currently loaded workflow
|
||||
- **Default-workflow snapshot fix** (v0.4.8) — overwriting the loaded workflow under a filename that's currently set as the auto-load **Default workflow** (Settings tab, see below) now also refreshes that cached snapshot; previously only the file on disk was updated, so the old (pre-edit) version — including any checkpoint no longer installed — kept reappearing after every page reload until the default was re-set by hand
|
||||
- **Input tab** — Prompt and Image inner tabs (drag-and-drop upload); Prompt tab shows Positive Prompt and Negative Prompt textareas, plus an **Embeddings selector** at the bottom (Filter + Select + Weight input + Paste button); Paste inserts `(embedding:Name:weight)` at the cursor position of the last focused textarea (defaults to Positive when neither is focused); Raw JSON (540px) in the right column
|
||||
- **Revert button** (v0.3.70) — a ↺ button next to each Apply button reverts the textarea to the node's currently applied value (the reverse of Apply)
|
||||
- **Emphasis weight editing** (v0.3.70) — select text (or just place the cursor on a word/parenthesis block) and press Ctrl+↑/↓ to adjust `(text:weight)` by ±0.05, A1111/native-ComfyUI style; parentheses are removed automatically when the weight returns to 1.0
|
||||
@@ -148,7 +150,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Lab subtab (v0.3.87 – v0.4.5)</h3></summary>
|
||||
<summary><h3>Lab subtab (v0.3.87 – v0.4.8)</h3></summary>
|
||||
|
||||
An experimental batch generator: runs the workflow currently loaded in GenerateUI N times, letting Model (Checkpoint/LoRA Single/VAE) / Prompt / KSampler each change independently starting at a chosen iteration — unlike the Batch tab's single-axis queue, every column keeps its own list of change points. Never mutates the loaded workflow; every iteration runs on a fresh clone. Works with both I2I and T2I workflows (v0.3.90).
|
||||
|
||||
@@ -170,6 +172,8 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Save index image to Output on Run** (v0.3.90, on by default since v0.3.93) — checkbox in the run controls; when checked, every completed Run also builds the same contact-sheet index image used for Plan files and saves it directly into ComfyUI's own Output folder as `Lab_index_<counter>_.png` (auto-numbered like a normal generated image, right alongside the images that Run just generated); independent of Plan Save, which always writes its own copy next to the plan file regardless of this checkbox; saved with the plan as `save_index_on_run`
|
||||
- **Index images are self-contained plan files** (v0.3.91) — every index-image PNG, whether from Plan Save/Save As or from Save index image to Output on Run, carries the entire plan embedded directly in the file as a PNG `wfm_lab_plan` chunk; this is what lets the Output-folder copy above work as a Plan Load source even though it has no matching `.json` anywhere
|
||||
- **Eagle integration** — every image Lab generates is auto-saved to Eagle the same way as GenerateUI's own Generate button, if enabled in the Settings tab; the Output-folder index image above is included too (v0.3.90) once saved
|
||||
- **Select vs. edit, and keyframe reordering** (v0.4.8) — a single click on a keyframe cell now only selects it (blue outline); double-click to open its edit modal as before. Each column's header (Model / Prompt / KSampler) also gets **▲ / ▼** buttons that swap the selected keyframe with its immediate neighbor, reordering keyframes without retyping them; keyframe #1 (the live-reflecting baseline) can never move, and nothing can be swapped into its slot
|
||||
- **PG — apply a Prompt tab preset group** (v0.4.8) — a **PG** button on the Prompt column header opens a picker for the Prompt tab's Table-view preset groups (the same groups the Batch tab's checklist uses); choosing one replaces the entire Prompt column with one keyframe per preset in that group's order, starting at #1 (#1 is overwritten, not appended after). If the group has more presets than the current Batch count, Batch count is raised automatically to fit (capped at 50, the Batch input's own limit); anything still beyond that shows the existing "keyframes beyond Batch count" warning instead of being dropped
|
||||
|
||||
</details>
|
||||
|
||||
@@ -204,6 +208,7 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Presets Group table** — create, rename, and delete groups, with each group's members shown as removable badges; the reserved **Batch** group is not listed here — it's managed entirely through the Presets table's B column and BC button instead
|
||||
- **Wildcards table** — same files as the Form tab's Wildcard file manager above; editing the File path or the Ext dropdown renames the file (saves the content under the new name, then removes the old file)
|
||||
- **Style table** — same styles as the Form tab's Style manager above, editable inline the same way as Presets
|
||||
- **+ Add to this file** (v0.4.8) — select exactly one row whose File badge isn't `custom.json` to enable this toolbar button, bringing the Form tab's same-file-add capability (above) to the Table view too; it adds a blank row targeting that same file (shown as a badge in the File column even before saving); custom.json entries and multi-row selections leave it disabled — use the regular + New Style button for those instead
|
||||
|
||||
</details>
|
||||
|
||||
@@ -241,7 +246,8 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Thumbnail / Table views** — switch view modes; Favorites column shown leftmost in Table view
|
||||
- **Folder management** — create subfolders ("+ New") or delete the selected folder with all contents ("Del") from the folder tree header
|
||||
- **File operations** — move or delete individual images from the detail panel's Info tab; bulk Move To..., Export, and Delete File from the multi-select bar
|
||||
- **Download** — hover over the image preview in the detail panel to reveal a download icon (⬇); click to download the single image
|
||||
- **Download** (v0.5.0) — a dedicated orange **Download** button in the detail panel's action-button row (next to Tagger); replaces the old preview-image hover overlay, which blocked video playback controls
|
||||
- **MP4 video support** (v0.5.0) — `.mp4` files are browsable, previewable (detail panel with native `<video controls>`, lightbox, and Compare), and included in favorites/tags/groups/move/delete/export alongside images; server-side thumbnails are generated from the first video frame via PyAV (falls back to a placeholder if PyAV/ffmpeg decoding isn't available); a small ▶ badge overlays video thumbnails in the grid
|
||||
- **Multi-select** — Ctrl+click to select multiple images; Bulk Bar appears for batch operations: select group → "Add to Group" / "Remove from Group"; Favorite All / Unfavorite All; Compare (2–4 images); Move To...; **Export** (downloads all selected images as a ZIP file); Delete File
|
||||
- **Image Compare** — select 2–4 images with Ctrl+click, then click "Compare" in the Bulk Bar to open a side-by-side lightbox; grid adapts to the number of selected images
|
||||
- **Prompt search** — text search covers filename, tags, memo, and prompt text (A1111 `parameters` field cached on first detail panel open)
|
||||
@@ -252,7 +258,7 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Detail panel** — view filename, path, tags, groups, and metadata in a slide-out panel; four tabs — **Info** / **JSON** / **Groups** / **Prompt**
|
||||
- **Prompt tab** (v0.4.7) — selected by default (the most frequently checked piece of info shouldn't need an extra click); lists every positive/negative prompt candidate found in the embedded workflow with POS/NEG badges, reusing the exact same list→click→full-text UI as the Metadata tab; extracts from the API-format embedding when available rather than the UI-format one, since a workflow with independent top-level and subgraph sampling chains (e.g. Krea-2) can otherwise have some of its prompts missed
|
||||
- **Workflow viewer** — Metadata tab displays workflow JSON from PNG embedded data (`prompt` / `workflow` keys) or from workflow saved by the Generate UI tab; **Copy & Send Canvas** button copies the JSON to the clipboard and sends the workflow directly to the ComfyUI canvas (UI and API formats both supported)
|
||||
- **Load GenUI button** — loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; shows a warning toast if no workflow is embedded or the format is unsupported; Metadata button is styled green, Load GenUI button uses the primary accent color
|
||||
- **GenUI button** (renamed from "Load GenUI" in v0.5.0 for readability) — loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; shows a warning toast if no workflow is embedded or the format is unsupported; Metadata button is styled green, GenUI button uses the primary accent color
|
||||
- **Image Edit button** — toolbar button; sends the selected image directly to the Image Edit tab as the base layer
|
||||
- **Send GenUI Image button** — toolbar button (next to Image Edit); uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded
|
||||
- **Send CC button** (v0.3.69) — toolbar button, shown only when this Gallery tab is embedded as an iframe inside ComfyUI Comic Creator (a separate custom node); sends the selected image directly into Comic Creator's currently selected panel/overlay
|
||||
@@ -382,12 +388,24 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Layer panel** — layer list with visibility (👁/🚫), lock (🔒/🔓), and clipping-mask (✂) toggles; opacity slider; type icons (🖼 image / T text / ✏ draw / ⬚ mask); 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`); **Save to Input** (uploads to ComfyUI input folder for use in Load Image nodes); **Send to Workflow** (v0.4.0) — uploads the same way, then writes the resulting filename directly into the `image` widget of the node currently selected on the ComfyUI canvas (falls back to the first LoadImage-type node found); requires Workflow Studio to have been launched from ComfyUI's top-menu button so the ComfyUI tab is reachable
|
||||
- **Export** — Save PNG (download composite locally); **Save to Gallery** (saves to Gallery root folder with a timestamped default name `wfs-image-YYYYMMDDHHmmss`); **Send to Workflow** — uploads to ComfyUI's input folder via `/upload/image`, then writes the resulting filename directly into the `image` widget of the node currently selected on the ComfyUI canvas (falls back to the first LoadImage-type node found); requires Workflow Studio to have been launched from ComfyUI's top-menu button so the ComfyUI tab is reachable
|
||||
- **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), S (Shape), Delete (remove selected layer when 2+ exist)
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Video Tab (v0.5.0)</h3></summary>
|
||||
|
||||
- **Dedicated MiniMax H3 video generation UI, independent of GenerateUI** — a purpose-built tab for the MiniMax H3 (Image to Video) workflow; does not share state with the GenerateUI tab, and model selection (UNet/CLIP/VAE/Audio VAE) is fixed to the loaded workflow's own defaults rather than editable here
|
||||
- **3-pane layout** — left: form (First Frame / Last Frame / Prompt / Aspect Ratio / Megapixels / Multiple / Duration / Noise Seed / Generate); center: generation result preview, plus an Editing pane reserved for future video-editing tools; right: Properties pane reserved for future use — the two placeholder panes keep room for upcoming features without disturbing the layout as the result grows
|
||||
- **First Frame / Last Frame are both optional** — leaving First Frame empty runs the workflow text-only (the node is simply left unconnected — a "bypass"); workflows that don't even include a LoadImage node for First Frame are supported out of the box, and a LoadImage node is only injected into the graph on the fly if an image is actually supplied
|
||||
- **Node lookup instead of hardcoded IDs** — locates the MiniMax H3 subgraph instance, its linked Resolution Selector, and (if present) its linked LoadImage node by walking the workflow's subgraph definitions and links, so a workflow doesn't need to match the reference `minimax_test.json`'s exact node IDs
|
||||
- **Load in Video** (Workflow tab) — load any workflow containing a MiniMax H3 Image-to-Video node straight into this tab from the Workflow tab's side-panel toolbar (next to Load in GenerateUI); unsupported workflows show an error toast instead of loading
|
||||
- **Result panel** — generated mp4s play inline with native video controls; results are also saved to Gallery metadata (embedded workflow JSON) automatically, so the Gallery tab's Workflow/Prompt panels work on generated videos the same way they do for images
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>AI TOOL Tab (v0.3.14)</h3></summary>
|
||||
|
||||
|
||||
@@ -191,17 +191,33 @@ class GalleryMetadataStore:
|
||||
return self._save_to_disk()
|
||||
return True
|
||||
|
||||
def cleanup_stale_images(self, folder_path: str, existing_paths: set) -> int:
|
||||
def cleanup_stale_images(self, folder_path: str, existing_paths: set, recursive: bool = True) -> int:
|
||||
"""folder_path 配下の存在しないファイルのメタデータを削除する。
|
||||
existing_paths: そのフォルダの現在のファイルパス集合(_normalize_path 済み)
|
||||
recursive: False の場合、folder_path 直下のファイルのみを対象にする。
|
||||
呼び出し元(list_images)が非recursiveスキャン(フォルダ直下のみ列挙)の
|
||||
結果を existing_paths として渡してくる場合、サブフォルダ内のファイルは
|
||||
existing_paths に含まれない。それにもかかわらず対象範囲を「folder_path配下
|
||||
全階層」のままにすると、サブフォルダ内画像のメタデータ(tags/memo等)を
|
||||
"存在しない"と誤判定して全削除してしまう(実際に発生した不具合: サブフォルダ
|
||||
に動画を保存する運用で、ルートフォルダを非recursiveで開くたびに
|
||||
サブフォルダ内の全メタデータが失われていた)。
|
||||
"""
|
||||
folder_key = self._normalize_path(folder_path)
|
||||
if not folder_key.endswith("/"):
|
||||
folder_key += "/"
|
||||
|
||||
def _in_scope(key: str) -> bool:
|
||||
if not key.startswith(folder_key):
|
||||
return False
|
||||
if recursive:
|
||||
return True
|
||||
return "/" not in key[len(folder_key):]
|
||||
|
||||
with self._lock:
|
||||
stale = [
|
||||
key for key in self._data["images"]
|
||||
if key.startswith(folder_key) and key not in existing_paths
|
||||
if _in_scope(key) and key not in existing_paths
|
||||
]
|
||||
if not stale:
|
||||
return 0
|
||||
|
||||
@@ -16,8 +16,8 @@ from typing import Any
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# サポートする画像拡張子
|
||||
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg"}
|
||||
# サポートする画像拡張子(.mp4は動画だがGalleryでは静止画と同じ一覧・配信経路を共有する)
|
||||
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg", ".mp4"}
|
||||
|
||||
# data URL の MIME タイプ -> 拡張子(save_image_to_gallery / save_image_to_folder共用)
|
||||
_SAVE_EXT_BY_MIME = {
|
||||
@@ -385,9 +385,12 @@ class GalleryService:
|
||||
# os.scandir() でファイル情報を一括取得(stat()の個別呼び出しを排除)
|
||||
raw_entries = self._scan_folder_recursive(folder) if recursive else self._scan_folder(folder)
|
||||
|
||||
# 孤立メタデータを自動クリーンアップ(移動・削除されたファイルの残骸を除去)
|
||||
# 孤立メタデータを自動クリーンアップ(移動・削除されたファイルの残骸を除去)。
|
||||
# recursive=False(非再帰スキャン)の場合、existing_pathsにはfolder直下の
|
||||
# ファイルしか含まれないため、cleanup側にもrecursive=Falseを伝えて対象範囲を
|
||||
# 直下のみに限定する(でないとサブフォルダ内ファイルのメタデータを誤削除する)。
|
||||
existing_paths = {abs_path for _, abs_path, _, _ in raw_entries}
|
||||
self.metadata_store.cleanup_stale_images(str(folder), existing_paths)
|
||||
self.metadata_store.cleanup_stale_images(str(folder), existing_paths, recursive=recursive)
|
||||
|
||||
results = []
|
||||
for name, abs_path, size, mtime in raw_entries:
|
||||
@@ -729,9 +732,14 @@ class GalleryService:
|
||||
# ──────────────────────────────────────────────────────────────
|
||||
|
||||
def save_image_meta(self, image_path: str, data: dict) -> bool:
|
||||
if not self._check_path_allowed(Path(image_path).resolve()):
|
||||
resolved = Path(image_path).resolve()
|
||||
if not self._check_path_allowed(resolved):
|
||||
logger.warning("save_image_meta: path not allowed: %s", resolved)
|
||||
return False
|
||||
return self.metadata_store.save(image_path, data)
|
||||
# get_image_metadata() 側は resolve() 済みパスをキーにして取得するため、
|
||||
# ここでも resolve() 後の文字列で統一して保存する(キー不一致による
|
||||
# 「保存はできるが表示されない」というサイレントな食い違いを防ぐ)。
|
||||
return self.metadata_store.save(str(resolved), data)
|
||||
|
||||
def toggle_favorite(self, image_path: str) -> bool:
|
||||
if not self._check_path_allowed(Path(image_path).resolve()):
|
||||
@@ -934,6 +942,8 @@ class GalleryService:
|
||||
ディスクキャッシュがあればそれを返し、なければPillowで生成して保存する。
|
||||
GIFはアニメーション保持のため元ファイルをそのまま返す。
|
||||
Pillowが使えない場合は元ファイルにフォールバック。
|
||||
MP4はPillowで開けないためPyAVで先頭フレームを抽出しJPEGとしてキャッシュする
|
||||
(元ファイルへのフォールバックはできないため、失敗時はNoneを返す)。
|
||||
"""
|
||||
p = Path(image_path).resolve()
|
||||
if not p.is_file():
|
||||
@@ -966,6 +976,24 @@ class GalleryService:
|
||||
if thumb_path.exists():
|
||||
return thumb_path
|
||||
|
||||
# MP4は動画のためPillowで開けない。PyAV(av)で先頭フレームを抽出しJPEGとしてキャッシュする。
|
||||
# avが未導入/デコード失敗の場合、元mp4ファイルは<img>的な経路に渡せないため
|
||||
# (GIF/SVGと違い元ファイルへフォールバックできない) Noneを返しプレースホルダー表示に委ねる。
|
||||
if p.suffix.lower() == ".mp4":
|
||||
try:
|
||||
import av
|
||||
from PIL import Image
|
||||
with av.open(str(p)) as container:
|
||||
stream = container.streams.video[0]
|
||||
frame = next(container.decode(stream))
|
||||
img = frame.to_image().convert("RGB")
|
||||
img.thumbnail((width, width), Image.LANCZOS)
|
||||
img.save(thumb_path, "JPEG", quality=85, optimize=True)
|
||||
return thumb_path
|
||||
except Exception as e:
|
||||
logger.warning("serve_thumbnail: mp4 frame extraction failed for %s: %s", p, e)
|
||||
return None
|
||||
|
||||
try:
|
||||
from PIL import Image
|
||||
with Image.open(p) as img:
|
||||
|
||||
+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.4.7"
|
||||
version = "0.5.0"
|
||||
license = "MIT"
|
||||
requires-python = ">= 3.10"
|
||||
dependencies = ["jinja2"]
|
||||
|
||||
@@ -22,3 +22,10 @@ piexif>=1.1.3
|
||||
|
||||
# -- Required to load UNSLOTH_API_KEY from a local .env file (Unsloth backend, AI TOOL tab) --
|
||||
python-dotenv>=1.0,<2.0
|
||||
|
||||
# -- MP4 thumbnail generation (Gallery tab) --
|
||||
# Uses PyAV (av) to decode the first frame. ComfyUI core already requires av>=17.0.0,
|
||||
# so it is normally pre-installed in python_embeded and no action is needed here.
|
||||
# If missing, mp4 thumbnail generation simply fails and falls back to a placeholder
|
||||
# (Gallery itself keeps working). Not pinned here on purpose — see torch note above.
|
||||
# av>=17.0.0
|
||||
|
||||
+28
-37
@@ -290,6 +290,24 @@
|
||||
color: #38bdf8;
|
||||
}
|
||||
|
||||
/* 動画ファイル(mp4)の再生アイコンバッジ(サムネイル中央) */
|
||||
.wfm-gallery-thumb-video-badge {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
border-radius: 50%;
|
||||
background: rgba(0,0,0,0.55);
|
||||
color: #fff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 14px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
/* テーブルビューのお気に入りボタン */
|
||||
.wfm-gallery-table-fav-btn {
|
||||
background: none;
|
||||
@@ -465,43 +483,6 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.wfm-gallery-preview-overlay {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: rgba(0,0,0,0.5);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
opacity: 0;
|
||||
transition: opacity 0.2s;
|
||||
}
|
||||
|
||||
.wfm-gallery-preview-wrapper:hover .wfm-gallery-preview-overlay {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.wfm-gallery-download-btn {
|
||||
background: var(--wfm-accent, #4f8ef7);
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
font-size: 20px;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.wfm-gallery-download-btn:hover {
|
||||
background: var(--wfm-accent-hover, #3f7fe7);
|
||||
}
|
||||
|
||||
/* タブコンテンツ */
|
||||
.wfm-gallery-detail-tab-content {
|
||||
flex: 1;
|
||||
@@ -836,6 +817,16 @@
|
||||
border-color: #6a4de0;
|
||||
}
|
||||
|
||||
.wfm-gallery-action-btn-orange {
|
||||
background: #f59e0b;
|
||||
border-color: #f59e0b;
|
||||
color: #1a1a2e;
|
||||
}
|
||||
.wfm-gallery-action-btn-orange:hover {
|
||||
background: #d97f06;
|
||||
border-color: #d97f06;
|
||||
}
|
||||
|
||||
/* ── ファイル操作ボタン (詳細パネル) ─────────────────────────── */
|
||||
|
||||
.wfm-gallery-file-actions {
|
||||
|
||||
@@ -280,6 +280,13 @@
|
||||
color: var(--wfm-danger);
|
||||
}
|
||||
|
||||
/* Single-click selection target for the column header's up/down reorder buttons —
|
||||
layered as a box-shadow (not border-color) so it never conflicts with the
|
||||
revert/live/bypassed/node-bypassed border-color signaling above. */
|
||||
.wfm-lab-cell.wfm-lab-cell-selected {
|
||||
box-shadow: 0 0 0 2px var(--wfm-primary);
|
||||
}
|
||||
|
||||
.wfm-lab-cell-applied {
|
||||
margin-top: 3px;
|
||||
padding-top: 3px;
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
/* =============================================
|
||||
Video Tab (MiniMax H3専用・GenerateUIタブとは独立)
|
||||
3ペイン構成: 左=フォーム / 中央=プレビュー+編集 / 右=プロパティ
|
||||
各ペインは独立したカラムとして高さ100%を占め、内部でスクロールする。
|
||||
中央ペインのコンテンツ量(生成結果の有無・動画の縦横比)が変わっても
|
||||
左右のペインの位置が動かないよう、意図的に高さを共有させない構造にしている。
|
||||
============================================= */
|
||||
|
||||
#wfm-tab-video {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.wfm-video-layout {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* ── 左ペイン: フォーム ── */
|
||||
.wfm-video-form-panel {
|
||||
width: 380px;
|
||||
flex: none;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 16px;
|
||||
overflow-y: auto;
|
||||
border-right: 1px solid var(--wfm-border);
|
||||
}
|
||||
|
||||
.wfm-video-form-panel label {
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
color: var(--wfm-text-secondary);
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.wfm-video-header {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.wfm-video-header h3 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.wfm-video-wf-name {
|
||||
color: var(--wfm-text-secondary);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.wfm-video-frame-slots {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.wfm-video-frame-slot {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.wfm-video-resolution-row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr 1fr;
|
||||
gap: 10px;
|
||||
align-items: end;
|
||||
}
|
||||
|
||||
.wfm-video-seed-randomize-wrap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
||||
/* ── 中央ペイン: プレビュー + 編集 ── */
|
||||
.wfm-video-center-panel {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: auto;
|
||||
padding: 16px;
|
||||
gap: 16px;
|
||||
border-right: 1px solid var(--wfm-border);
|
||||
}
|
||||
|
||||
.wfm-video-result-panel {
|
||||
flex: none;
|
||||
}
|
||||
|
||||
.wfm-video-result-panel h4 {
|
||||
margin: 0 0 10px 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#wfm-video-result {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.wfm-video-result-item {
|
||||
max-width: 100%;
|
||||
max-height: 60vh;
|
||||
border-radius: 6px;
|
||||
background: var(--wfm-bg-hover, #111);
|
||||
}
|
||||
|
||||
/* 将来の動画編集機能(トリミング等)用のプレースホルダー領域 */
|
||||
.wfm-video-edit-panel {
|
||||
flex: 1;
|
||||
min-height: 160px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px dashed var(--wfm-border);
|
||||
border-radius: 6px;
|
||||
color: var(--wfm-text-secondary);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
/* ── 右ペイン: プロパティ ── */
|
||||
.wfm-video-properties-panel {
|
||||
width: 240px;
|
||||
flex: none;
|
||||
padding: 16px;
|
||||
overflow-y: auto;
|
||||
color: var(--wfm-text-secondary);
|
||||
}
|
||||
|
||||
.wfm-video-properties-panel h4 {
|
||||
margin: 0 0 10px 0;
|
||||
}
|
||||
+16
-2
@@ -112,7 +112,7 @@ function initTabs() {
|
||||
|
||||
function applyI18nToHtml() {
|
||||
// Tab labels
|
||||
const tabMap = { workflow: "tabWorkflow", nodes: "tabNodes", models: "tabModels", generate: "tabGenerate", prompt: "tabPrompt", gallery: "tabGallery", "image-edit": "tabImageEdit", settings: "tabSettings", help: "tabHelp", ai: "tabAi", tagger: "tabTagger" };
|
||||
const tabMap = { workflow: "tabWorkflow", nodes: "tabNodes", models: "tabModels", generate: "tabGenerate", prompt: "tabPrompt", gallery: "tabGallery", "image-edit": "tabImageEdit", video: "tabVideo", settings: "tabSettings", help: "tabHelp", ai: "tabAi", tagger: "tabTagger" };
|
||||
document.querySelectorAll(".wfm-tab").forEach((tab) => {
|
||||
const key = tabMap[tab.dataset.tab];
|
||||
if (key) tab.textContent = t(key);
|
||||
@@ -134,6 +134,12 @@ function applyI18nToHtml() {
|
||||
if (listLoadBtn.disabled) listLoadBtn.title = t("selectCardFirst");
|
||||
}
|
||||
|
||||
const listLoadVideoBtn = document.getElementById("wfm-list-load-video-btn");
|
||||
if (listLoadVideoBtn) {
|
||||
listLoadVideoBtn.textContent = t("loadInVideo");
|
||||
if (listLoadVideoBtn.disabled) listLoadVideoBtn.title = t("selectCardFirst");
|
||||
}
|
||||
|
||||
const listOpenComfyBtn = document.getElementById("wfm-list-open-comfyui-btn");
|
||||
if (listOpenComfyBtn) {
|
||||
listOpenComfyBtn.textContent = t("sendToCanvas");
|
||||
@@ -507,6 +513,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-lab-13": "helpLab13", "wfm-help-lab-14": "helpLab14",
|
||||
"wfm-help-lab-15": "helpLab15",
|
||||
"wfm-help-lab-16": "helpLab16", "wfm-help-lab-17": "helpLab17",
|
||||
"wfm-help-lab-18": "helpLab18", "wfm-help-lab-19": "helpLab19",
|
||||
"wfm-help-lab-card-plan-title": "helpLabCardPlanTitle",
|
||||
"wfm-help-lab-plan-1": "helpLabPlan1", "wfm-help-lab-plan-2": "helpLabPlan2",
|
||||
"wfm-help-lab-plan-3": "helpLabPlan3", "wfm-help-lab-plan-4": "helpLabPlan4",
|
||||
@@ -534,6 +541,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-prompt-20": "helpPrompt20", "wfm-help-prompt-21": "helpPrompt21",
|
||||
"wfm-help-prompt-22": "helpPrompt22", "wfm-help-prompt-23": "helpPrompt23",
|
||||
"wfm-help-prompt-24": "helpPrompt24", "wfm-help-prompt-25": "helpPrompt25",
|
||||
"wfm-help-prompt-26": "helpPrompt26",
|
||||
"wfm-help-settings-1": "helpSettings1", "wfm-help-settings-2": "helpSettings2",
|
||||
"wfm-help-settings-3": "helpSettings3", "wfm-help-settings-4": "helpSettings4",
|
||||
"wfm-help-settings-5": "helpSettings5", "wfm-help-settings-6": "helpSettings6",
|
||||
@@ -613,7 +621,7 @@ function applyI18nToHtml() {
|
||||
"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-18": "helpImageEdit18",
|
||||
"wfm-help-imageedit-19b": "helpImageEdit19b",
|
||||
"wfm-help-imageedit-20": "helpImageEdit20", "wfm-help-imageedit-21": "helpImageEdit21",
|
||||
"wfm-help-imageedit-22": "helpImageEdit22", "wfm-help-imageedit-23": "helpImageEdit23",
|
||||
@@ -722,6 +730,10 @@ function applyI18nToHtml() {
|
||||
"wfm-help-trouble-card-connection-title": "helpTroubleCardConnection",
|
||||
"wfm-help-trouble-card-workflow-title": "helpTroubleCardWorkflow",
|
||||
"wfm-help-trouble-card-tagger-title": "helpTroubleCardTagger",
|
||||
"wfm-help-video-title": "helpVideoTitle",
|
||||
"wfm-help-video-desc": "helpVideoDesc",
|
||||
"wfm-help-video-1": "helpVideo1", "wfm-help-video-2": "helpVideo2",
|
||||
"wfm-help-video-3": "helpVideo3", "wfm-help-video-4": "helpVideo4",
|
||||
};
|
||||
for (const [id, key] of Object.entries(helpIdMap)) {
|
||||
const el = document.getElementById(id);
|
||||
@@ -812,6 +824,7 @@ import { initMetadataTab } from "./metadata-tab.js";
|
||||
import { initAiTab } from "./ai-tab.js";
|
||||
import { initTaggerTab } from "./tagger-tab.js";
|
||||
import { imageEditTab } from "./image-edit-tab.js";
|
||||
import { initVideoTab } from "./video-tab.js";
|
||||
|
||||
// Apply saved theme immediately to prevent flash of default theme
|
||||
applyTheme(getSavedTheme());
|
||||
@@ -863,6 +876,7 @@ document.addEventListener("DOMContentLoaded", () => {
|
||||
initAiTab();
|
||||
initTaggerTab();
|
||||
imageEditTab.init();
|
||||
initVideoTab();
|
||||
|
||||
console.log("Workflow Studio: App initialized");
|
||||
});
|
||||
|
||||
+64
-16
@@ -46,6 +46,13 @@ const API = {
|
||||
|
||||
export const FEEDER_GROUP = "__Feeder__";
|
||||
|
||||
// 拡張子から動画ファイル(mp4)かどうかを判定する。
|
||||
// 一覧アイテムは path/filename、詳細メタ(get_image_metadata)は ext フィールドを持つため両対応。
|
||||
function isVideoFile(img) {
|
||||
const source = img?.ext || img?.filename || img?.path || "";
|
||||
return source.toLowerCase().endsWith(".mp4");
|
||||
}
|
||||
|
||||
// ComfyUI Comic Creater からiframe越しに画像を受け取り、Generate UIのImage入力スロットへ直接セットする(I2I連携)。
|
||||
// Comic Creater側の「I2Iへ送る」ボタンから
|
||||
// iframe.contentWindow._wfmReceiveImageForI2I(blob, name, workflowData?, workflowFilename?) として呼ばれる。
|
||||
@@ -578,6 +585,14 @@ function createThumbCard(img) {
|
||||
};
|
||||
card.appendChild(imgEl);
|
||||
|
||||
// 動画ファイルは再生アイコンバッジを重ねて表示(サムネイル自体は先頭フレームのJPEG)
|
||||
if (isVideoFile(img)) {
|
||||
const playBadge = document.createElement("div");
|
||||
playBadge.className = "wfm-gallery-thumb-video-badge";
|
||||
playBadge.textContent = "▶";
|
||||
card.appendChild(playBadge);
|
||||
}
|
||||
|
||||
// お気に入りトグルボタン(カード右上)
|
||||
const favBtn = document.createElement("button");
|
||||
favBtn.className = `wfm-gallery-thumb-fav-btn${img.favorite ? " active" : ""}`;
|
||||
@@ -877,18 +892,18 @@ async function loadImageDetail(img) {
|
||||
if (moveBtn) moveBtn.disabled = false;
|
||||
if (delBtn) delBtn.disabled = false;
|
||||
|
||||
// プレビュー
|
||||
// プレビュー(mp4は<video controls>、それ以外は<img>)
|
||||
const preview = document.getElementById("wfm-gallery-detail-preview");
|
||||
const isVideo = isVideoFile(img);
|
||||
const mediaHtml = isVideo
|
||||
? `<video src="${API.serveImage(img.path)}" class="wfm-gallery-detail-img" controls title="Double-click to enlarge"></video>`
|
||||
: `<img src="${API.serveImage(img.path)}" class="wfm-gallery-detail-img" alt="${escapeHtml(img.filename)}" title="Double-click to enlarge">`;
|
||||
preview.innerHTML = `
|
||||
<div class="wfm-gallery-preview-wrapper">
|
||||
<img src="${API.serveImage(img.path)}" class="wfm-gallery-detail-img" alt="${escapeHtml(img.filename)}" title="Double-click to enlarge">
|
||||
<div class="wfm-gallery-preview-overlay">
|
||||
<button class="wfm-gallery-download-btn" title="Download image">⬇</button>
|
||||
</div>
|
||||
${mediaHtml}
|
||||
</div>
|
||||
`;
|
||||
preview.querySelector("img").addEventListener("dblclick", () => openLightbox(img));
|
||||
preview.querySelector(".wfm-gallery-download-btn").addEventListener("click", () => downloadImage(img));
|
||||
preview.querySelector(isVideo ? "video" : "img").addEventListener("dblclick", () => openLightbox(img));
|
||||
|
||||
// ファイル名
|
||||
document.getElementById("wfm-gallery-detail-filename").textContent = img.filename;
|
||||
@@ -1014,7 +1029,8 @@ async function addTag(tag) {
|
||||
const tags = [...(state.selectedImage.tags || [])];
|
||||
if (tags.includes(tag.trim())) return;
|
||||
tags.push(tag.trim());
|
||||
await saveMetaField({ tags });
|
||||
const ok = await saveMetaField({ tags });
|
||||
if (!ok) return;
|
||||
state.selectedImage.tags = tags;
|
||||
renderTagsDisplay(tags);
|
||||
updateTagFilter(state.images);
|
||||
@@ -1023,24 +1039,38 @@ async function addTag(tag) {
|
||||
async function removeTag(tag) {
|
||||
if (!state.selectedImage) return;
|
||||
const tags = (state.selectedImage.tags || []).filter(t => t !== tag);
|
||||
await saveMetaField({ tags });
|
||||
const ok = await saveMetaField({ tags });
|
||||
if (!ok) return;
|
||||
state.selectedImage.tags = tags;
|
||||
renderTagsDisplay(tags);
|
||||
updateTagFilter(state.images);
|
||||
}
|
||||
|
||||
// 戻り値: 保存が実際にサーバーへ永続化されたか(true/false)。呼び出し元はこれを見て
|
||||
// ローカル状態(state.selectedImage等)の更新可否を判断すること — でないと、サーバーが
|
||||
// 保存を拒否した場合にもUI上は成功したように見えてしまう(リロードすると消える不具合の原因)。
|
||||
async function saveMetaField(fields) {
|
||||
if (!state.selectedImage) return;
|
||||
if (!state.selectedImage) return false;
|
||||
try {
|
||||
await fetch(API.saveImageMeta, {
|
||||
const res = await fetch(API.saveImageMeta, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ path: state.selectedImage.path, ...fields }),
|
||||
});
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const json = await res.json();
|
||||
// サーバー側は常にHTTP 200を返し、成否は body.ok (bool) で表す設計
|
||||
// (gallery_routes.py save_image_meta)。ここをチェックしないと、
|
||||
// 許可パス外などでサーバーが保存を拒否してもUI上は成功したように見えてしまう。
|
||||
if (json.error || json.ok === false) {
|
||||
throw new Error(json.error || "Save rejected by server");
|
||||
}
|
||||
const idx = state.images.findIndex(i => i.path === state.selectedImage.path);
|
||||
if (idx >= 0) Object.assign(state.images[idx], fields);
|
||||
return true;
|
||||
} catch (e) {
|
||||
showToast(t("saveFailed", e.message), "error");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1583,9 +1613,12 @@ async function bulkSetFavorite(favoriteValue) {
|
||||
function openLightbox(img) {
|
||||
const overlay = document.createElement("div");
|
||||
overlay.className = "wfm-gallery-lightbox";
|
||||
const mediaHtml = isVideoFile(img)
|
||||
? `<video src="${API.serveImage(img.path)}" class="wfm-gallery-lightbox-img" controls autoplay></video>`
|
||||
: `<img src="${API.serveImage(img.path)}" class="wfm-gallery-lightbox-img" alt="${escapeHtml(img.filename)}">`;
|
||||
overlay.innerHTML = `
|
||||
<div class="wfm-gallery-lightbox-inner">
|
||||
<img src="${API.serveImage(img.path)}" class="wfm-gallery-lightbox-img" alt="${escapeHtml(img.filename)}">
|
||||
${mediaHtml}
|
||||
<div class="wfm-gallery-lightbox-footer">${escapeHtml(img.filename)}</div>
|
||||
<button class="wfm-gallery-lightbox-close">×</button>
|
||||
</div>
|
||||
@@ -1607,12 +1640,17 @@ function openCompare(paths) {
|
||||
const overlay = document.createElement("div");
|
||||
overlay.className = "wfm-gallery-lightbox wfm-lightbox-compare";
|
||||
|
||||
const itemsHtml = imgs.map(img => `
|
||||
const itemsHtml = imgs.map(img => {
|
||||
const mediaHtml = isVideoFile(img)
|
||||
? `<video src="${API.serveImage(img.path)}" class="wfm-lightbox-compare-img" controls></video>`
|
||||
: `<img src="${API.serveImage(img.path)}" class="wfm-lightbox-compare-img" alt="${escapeHtml(img.filename)}" loading="lazy">`;
|
||||
return `
|
||||
<div class="wfm-lightbox-compare-item">
|
||||
<img src="${API.serveImage(img.path)}" class="wfm-lightbox-compare-img" alt="${escapeHtml(img.filename)}" loading="lazy">
|
||||
${mediaHtml}
|
||||
<div class="wfm-lightbox-compare-label">${escapeHtml(img.filename)}</div>
|
||||
</div>
|
||||
`).join("");
|
||||
`;
|
||||
}).join("");
|
||||
|
||||
overlay.innerHTML = `
|
||||
<div class="wfm-lightbox-compare-inner">
|
||||
@@ -1884,7 +1922,7 @@ function bindEvents() {
|
||||
// メモ保存
|
||||
document.getElementById("wfm-gallery-memo-save-btn")?.addEventListener("click", () => {
|
||||
const memo = document.getElementById("wfm-gallery-memo").value;
|
||||
saveMetaField({ memo }).then(() => showToast(t("memoSaved"), "success"));
|
||||
saveMetaField({ memo }).then((ok) => { if (ok) showToast(t("memoSaved"), "success"); });
|
||||
});
|
||||
|
||||
// ワークフローコピー&キャンバスへ送る
|
||||
@@ -2017,6 +2055,16 @@ function bindEvents() {
|
||||
openImageInTaggerTab(state.selectedImage);
|
||||
});
|
||||
|
||||
// Downloadボタン: プレビューのオーバーレイだと動画の再生コントロール操作を妨げるため、
|
||||
// アクションボタン行に常時表示のボタンとして配置している
|
||||
document.getElementById("wfm-gallery-download-btn")?.addEventListener("click", () => {
|
||||
if (!state.selectedImage) {
|
||||
showToast(t("gallerySelectImageFirst"), "error");
|
||||
return;
|
||||
}
|
||||
downloadImage(state.selectedImage);
|
||||
});
|
||||
|
||||
// Load in GenerateUI ボタン: 埋め込みワークフローをGenerateUIタブに読み込む
|
||||
document.getElementById("wfm-gallery-load-genui-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedImage) {
|
||||
|
||||
@@ -164,6 +164,17 @@ async function saveCurrentWorkflow() {
|
||||
nameEl.dataset.filename = filename;
|
||||
}
|
||||
}
|
||||
|
||||
// このファイル名が「デフォルトワークフロー」(workflow-tab.jsの「デフォルトに設定」で
|
||||
// localStorageにスナップショットされたAPI形式JSON、ページ起動時に自動読込される)に
|
||||
// 一致する場合、保存内容と食い違ったまま残らないようスナップショットも更新する。
|
||||
// 更新しないと、ここで上書き保存しても次回リロード時に古いモデル等が復活する。
|
||||
const settings = getSettings();
|
||||
if (settings.defaultWorkflow === filename) {
|
||||
settings.defaultWorkflowData = workflow;
|
||||
localStorage.setItem("wfm_settings", JSON.stringify(settings));
|
||||
}
|
||||
|
||||
showToast(t("savedAs", filename), "success");
|
||||
} catch (err) {
|
||||
showToast(t("saveFailed", err.message), "error");
|
||||
|
||||
+135
-6
@@ -287,6 +287,15 @@ const LANGUAGES = {
|
||||
labT2IImageIgnored: "T2I mode is on — image upload is not needed and was skipped",
|
||||
labIndexImageSaved: (filename) => `Index image saved to Output: ${filename}`,
|
||||
labIndexImageSaveFailed: "Failed to save the index image to Output",
|
||||
labPromptGroupBtnTitle: "Apply a Prompt Group",
|
||||
labPromptGroupModalTitle: "Prompt Group",
|
||||
labPromptGroupEmpty: "No groups yet. Create groups in the Prompt tab's group panel.",
|
||||
labPromptGroupCount: (n) => `${n} preset(s)`,
|
||||
labPromptGroupSelectFirst: "Select a group first",
|
||||
labPromptGroupNoPresets: "This group has no presets",
|
||||
labPromptGroupApplied: (name, n) => `Applied "${name}" (${n} keyframes) to Prompt`,
|
||||
labPromptGroupBatchRaised: (n) => `Batch count raised to ${n} to fit the group`,
|
||||
labSelectKeyframeFirst: "Select a keyframe first",
|
||||
|
||||
// -- GenerateUI Input tab: Image sub-panel placeholder --
|
||||
i2iPlaceholderTitle: "Placeholder Image",
|
||||
@@ -835,6 +844,8 @@ const LANGUAGES = {
|
||||
helpLab15: "Checkpoint / LoRA / VAE each carry forward independently, the same effective-value rule as every other column (see above): a keyframe in one never resets the other two to the workflow default. A field left blank in the edit modal shows \"(inherits: ...)\" as its placeholder instead of \"(workflow default)\" when an earlier keyframe in that same list already set something, so it's clear what actually applies. \"Revert to #1's setting\" and Bypass — like +/- — only ever affect whichever ONE of the three is currently selected by the C/L/V toggle, never the other two",
|
||||
helpLab16: "Bypass LoRA node checkbox (LoRA keyframe's own edit modal only): forces that keyframe's strength_model/strength_clip to 0 at apply-time, standing in for ComfyUI's own node Bypass (mode:4) — the workflow used here is already converted to API format, which has no mode concept, so zeroing strength is the behavioral equivalent. Disables the strength fields while checked; independent of the row-level Bypass checkbox above (see helpLab13), which skips the whole row instead of touching the node",
|
||||
helpLab17: "Apply LoRA syntax + trigger words to Positive prompt checkbox (LoRA column only): when checked, appends <lora:name:strengthModel:strengthClip> plus that LoRA's cached CivitAI trigger words to the Positive prompt, comma-separated, at apply-time — the same format GenerateUI's own Model tab Apply button writes. Switching keyframes (a different LoRA, this checkbox turned off, or the row Bypassed) always strips exactly what the previous iteration injected before adding anything new, so a batch never accumulates every LoRA it has used. Disabled automatically while Bypass LoRA node is checked",
|
||||
helpLab18: "A single click on a keyframe cell selects it (blue outline) instead of opening it — double-click to open the edit modal as before. Each column's header (Model / Prompt / Ksampler) also has ▲ / ▼ buttons that swap the selected keyframe with its immediate neighbor to reorder them without retyping anything; keyframe #1 (the baseline) can never move, and nothing can be swapped into its slot",
|
||||
helpLab19: "Prompt column header's PG button: pick one of the Prompt tab's preset groups (Table view's Presets Group, the same groups used by the Batch tab's checklist) and replace the entire Prompt column with one keyframe per preset in that group's order, starting at #1 (#1 is overwritten, not appended after). If the group has more presets than the current Batch count, Batch count is raised automatically to fit (capped at 50, the Batch input's own limit); anything still beyond that shows the usual \"keyframes beyond Batch count\" warning instead of being silently dropped",
|
||||
helpLabCardPlanTitle: "Setting subtab — Run & Plan files",
|
||||
helpLabPlan1: "Right pane — Batch: number of iterations to run; Note: free-text memo saved together with the plan",
|
||||
helpLabPlan2: "Run / Pause / Cancel: Run starts the batch loop; Pause/Resume freezes it between iterations; Cancel interrupts the current generation and stops the loop",
|
||||
@@ -878,6 +889,7 @@ const LANGUAGES = {
|
||||
helpPrompt23: "Wildcards table — same files as the Form tab's Wildcard file manager; editing the File path or the Ext dropdown renames the file (saves the content under the new name, then removes the old file)",
|
||||
helpPrompt24: "Style table — same styles as the Form tab's Style manager, editable inline the same way as Presets",
|
||||
helpPrompt25: "Presets table toolbar — the ★ and B sort buttons (next to the search box) bring favorited / batch-selected presets to the top of the list; both can be enabled together (★ takes priority, B breaks ties), and everything else keeps its original relative order",
|
||||
helpPrompt26: "Style table toolbar — select exactly one row whose File badge isn't custom.json to enable + Add to this file: it adds a blank row targeting that same file (shown as a badge in the File column even before saving) — the same capability as the Form tab's Style manager (see above); custom.json entries and multi-row selections leave the button disabled, use the regular + New Style button for those instead",
|
||||
helpSettings1: "UI language and summary language",
|
||||
helpSettings2: "Theme selection (13 presets) with customization: color overrides, background patterns (stripes, polka dot, checkerboard, SVG tiling), and font selection (16 Google Fonts including Japanese display fonts)",
|
||||
helpSettings3: "Workflow data folder path",
|
||||
@@ -1069,8 +1081,7 @@ const LANGUAGES = {
|
||||
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: "Save to Input: uploads the composite PNG to ComfyUI's input folder via /upload/image, making it selectable in Load Image nodes",
|
||||
helpImageEdit19b: "Send to Workflow: uploads the composite PNG (same as Save to Input) and additionally writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable",
|
||||
helpImageEdit19b: "Send to Workflow: uploads the composite PNG to ComfyUI's input folder via /upload/image and writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable",
|
||||
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",
|
||||
@@ -1290,6 +1301,38 @@ const LANGUAGES = {
|
||||
helpMetadata4: "Prompt actions — Copy: copy to clipboard; GenUI:P/N: set GenerateUI positive/negative prompt; Prompt:P/N: set Prompt tab preset positive/negative",
|
||||
helpMetadata5: "Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image subgraph workflows), SD WebUI, SD Forge, Fooocus.",
|
||||
helpMetadata6: "This is now a sub-tab inside the Gallery tab (to the right of Style_Catalog), rather than its own top-level tab — everything else about it works exactly the same",
|
||||
|
||||
// -- Video Tab (MiniMax H3, independent of GenerateUI) --
|
||||
tabVideo: "Video",
|
||||
loadInVideo: "Load in Video",
|
||||
videoTitle: "Video (MiniMax H3)",
|
||||
videoFirstFrame: "First Frame (optional)",
|
||||
videoLastFrame: "Last Frame (optional)",
|
||||
videoDropOrClick: "Drop image or click to select",
|
||||
videoPrompt: "Prompt",
|
||||
videoAspectRatio: "Aspect Ratio",
|
||||
videoMegapixels: "Megapixels",
|
||||
videoMultiple: "Multiple",
|
||||
videoDuration: "Duration (seconds)",
|
||||
videoNoiseSeed: "Noise Seed",
|
||||
videoRandomizeSeed: "Randomize",
|
||||
videoGenerate: "Generate",
|
||||
videoResult: "Result",
|
||||
videoNoResult: "No result yet",
|
||||
videoEditPlaceholder: "Editing tools coming soon",
|
||||
videoProperties: "Properties",
|
||||
videoPropertiesPlaceholder: "Coming soon",
|
||||
videoNoWorkflowLoaded: "No workflow loaded",
|
||||
videoUnsupportedWorkflow: "This workflow does not contain a MiniMax H3 Image-to-Video node",
|
||||
videoWorkflowLoaded: (name) => `Workflow loaded: ${name}`,
|
||||
videoGenerateSuccess: "Video generated",
|
||||
videoDoneCount: (n) => `Done (${n} file${n === 1 ? "" : "s"})`,
|
||||
helpVideoTitle: "Video Tab",
|
||||
helpVideoDesc: "A dedicated video generation tab for the MiniMax H3 (Image to Video) workflow, independent of the GenerateUI tab.",
|
||||
helpVideo1: "Set first_frame (optional) / last_frame (optional) images, prompt, aspect_ratio / megapixels / multiple (resolution), duration (seconds), and noise_seed, then click Generate. Leaving first_frame empty runs the workflow text-only (bypassed), and workflows with no LoadImage node at all are also supported.",
|
||||
helpVideo2: "Model selection (UNet / CLIP / VAE / Audio VAE) is fixed to the loaded workflow's defaults and cannot be changed from this tab.",
|
||||
helpVideo3: "Use the \"Load in Video\" button in the Workflow tab's detail modal to load a workflow containing a MiniMax H3 Image-to-Video node. Unsupported workflows show an error instead.",
|
||||
helpVideo4: "Generated videos (mp4) can also be browsed and played back in the Gallery tab.",
|
||||
},
|
||||
|
||||
ja: {
|
||||
@@ -1573,6 +1616,15 @@ const LANGUAGES = {
|
||||
labT2IImageIgnored: "T2Iモードが有効なため、画像のアップロードは不要としてスキップしました",
|
||||
labIndexImageSaved: (filename) => `インデックス画像をOutputへ保存しました: ${filename}`,
|
||||
labIndexImageSaveFailed: "インデックス画像のOutputへの保存に失敗しました",
|
||||
labPromptGroupBtnTitle: "プロンプトグループを適用",
|
||||
labPromptGroupModalTitle: "プロンプトグループ",
|
||||
labPromptGroupEmpty: "グループがまだありません。Promptタブのグループパネルで作成してください。",
|
||||
labPromptGroupCount: (n) => `プリセット${n}件`,
|
||||
labPromptGroupSelectFirst: "先にグループを選択してください",
|
||||
labPromptGroupNoPresets: "このグループにはプリセットがありません",
|
||||
labPromptGroupApplied: (name, n) => `「${name}」(${n}件のキーフレーム)をPromptに適用しました`,
|
||||
labPromptGroupBatchRaised: (n) => `グループに合わせてBatch数を${n}に増やしました`,
|
||||
labSelectKeyframeFirst: "先にキーフレームを選択してください",
|
||||
|
||||
// -- GenerateUIタブ Inputサブタブ: Image内プレースホルダ --
|
||||
i2iPlaceholderTitle: "プレースホルダ画像",
|
||||
@@ -2121,6 +2173,8 @@ const LANGUAGES = {
|
||||
helpLab15: "Checkpoint/LoRA/VAEは、他の列と全く同じ実効値ルール(上記参照)でそれぞれ独立して引き継がれます:いずれか1つのキーフレームが、残り2つをワークフロー本来の設定に戻すことはありません。編集モーダルで未設定のままの項目は、同じリスト内の以前のキーフレームで何か設定済みの場合、プレースホルダが「(ワークフローの設定のまま)」ではなく「(引き継ぎ: ...)」と表示され、実際に適用される値が分かるようになっています。「1回目の設定に戻す」やBypassも+/-と同様、現在C/L/Vトグルで選択中の1項目だけに作用し、残り2つには影響しません",
|
||||
helpLab16: "LoRAノードをバイパスチェックボックス(LoRAキーフレーム自身の編集モーダルのみ):ComfyUI本来のノードBypass(mode:4)の代わりに、そのキーフレームのstrength_model/strength_clipを適用時に強制的に0にします — ここで使われるワークフローは既にAPI形式に変換済みでmodeの概念が無いため、強度をゼロにすることが実質的に同等の効果になります。チェック中は強度の入力欄が無効化されます。上記の行単位のBypassチェックボックス(helpLab13参照)とは独立しており、そちらは行全体をスキップするだけでノードには一切触れません",
|
||||
helpLab17: "LoRA構文とトリガーワードをポジティブプロンプトに適用チェックボックス(LoRA列のみ):チェックすると、適用時に <lora:name:strengthModel:strengthClip> とそのLoRAのキャッシュ済みCivitAIトリガーワードを、カンマ区切りでポジティブプロンプトへ追加します — GenerateUIのModelタブのApplyボタンが書き込むのと同じ書式です。キーフレームを切り替えた場合(別のLoRAへの変更、このチェックボックスをオフにした場合、または行自体をBypassした場合)は、新しい内容を追加する前に必ず直前のイテレーションが注入した分だけを正確に取り除くため、バッチ内で使われた全LoRAが蓄積されることはありません。「LoRAノードをバイパス」がチェックされている間は自動的に無効化されます",
|
||||
helpLab18: "キーフレームセルはシングルクリックで選択(青い枠線)に変わり、開くにはダブルクリックが必要になりました。各カラムのヘッダー(Model/Prompt/Ksampler)には▲/▼ボタンもあり、選択中のキーフレームを隣接するものと入れ替えて、入力し直すことなく並び順を変更できます。キーフレーム#1(ベースライン)は移動できず、他のキーフレームが#1の位置に入れ替わることもありません",
|
||||
helpLab19: "Promptカラムヘッダーの PG ボタン:Promptタブのプリセットグループ(Tableビューの Presets Group、Batchタブのチェックリストと同じグループ)を1つ選ぶと、Prompt列全体をそのグループの並び順で1プリセットにつき1キーフレームへ置き換えます(#1から開始、#1は上書きで追加ではありません)。グループのプリセット数が現在のBatch数を超える場合はBatch数を自動的に引き上げます(上限50、Batch入力欄自体の上限と同じ)。それでも収まらない分は静かに削除されず、通常の「Batch数を超えたキーフレーム」警告が表示されます",
|
||||
helpLabCardPlanTitle: "Settingサブタブ — 実行とプランファイル",
|
||||
helpLabPlan1: "右ペイン — Batch:実行する回数。Note:プランと一緒に保存される自由記述のメモ",
|
||||
helpLabPlan2: "Run/Pause/Cancel:Runでバッチループを開始、Pause/Resumeで回と回の間を一時停止・再開、Cancelで現在の生成を中断してループを止めます",
|
||||
@@ -2164,6 +2218,7 @@ const LANGUAGES = {
|
||||
helpPrompt23: "Wildcardsテーブル — Formタブのワイルドカードファイルマネージャーと同じファイル一覧です。File列のパスやExtドロップダウンを編集するとファイル名が変更されます(新しい名前で内容を保存してから、古いファイルを削除します)",
|
||||
helpPrompt24: "Styleテーブル — Formタブのスタイル管理と同じスタイル一覧で、Presetsと同様にインライン編集できます",
|
||||
helpPrompt25: "Presetsテーブルのツールバー — 検索ボックス横の★とBソートボタンで、お気に入り/Batch登録済みのプリセットを一覧の先頭に並べ替えます。両方同時にONにでき、その場合は★が優先、Bが次点の基準になり、それ以外は元の相対順序を維持します",
|
||||
helpPrompt26: "Styleテーブルのツールバー — Fileバッジがcustom.jsonではない行を1件だけ選択すると「+ Add to this file」が有効になります。同じファイルを追加先とする空の行を追加します(保存前からFile列にバッジで表示されます)— Formタブのスタイルマネージャーと同じ機能です(上記参照)。custom.jsonのスタイルや複数選択時はボタンが無効のままです。その場合は通常の「+ New Style」を使ってください",
|
||||
helpSettings1: "UI言語と要約言語の設定",
|
||||
helpSettings2: "テーマ選択(13種プリセット)+カスタマイズ:カラー調整、背景パターン(ストライプ、ポルカドット、チェック、SVGタイリング)、フォント選択(日本語デザインフォント含む16種のGoogle Fonts)",
|
||||
helpSettings3: "ワークフローデータフォルダのパス変更・リセット",
|
||||
@@ -2354,8 +2409,7 @@ const LANGUAGES = {
|
||||
helpImageEditExportTitle: "エクスポートとナビゲーション",
|
||||
helpImageEdit17: "Save PNG:全可視レイヤーを合成してPNGファイルとしてダウンロード",
|
||||
helpImageEdit18: "Save to Gallery:ファイル名を入力(デフォルト: wfs-image-YYYYMMDDHHmmss)してギャラリーのルートフォルダに合成PNGを保存(設定 > Gallery Output Folderで設定);Galleryタブを一度開いてルートフォルダを設定する必要あり",
|
||||
helpImageEdit19: "Save to Input:合成PNGをComfyUIのinputフォルダに /upload/image でアップロードし、Load Imageノードで選択可能にする",
|
||||
helpImageEdit19b: "Send to Workflow:合成PNGをアップロードする点はSave to Inputと同じだが、さらにアップロード結果のファイル名をComfyUIグラフ内で選択中のノード(無ければ最初に見つかったLoadImage系ノード)のimageウィジェットへ書き込む;ComfyUIのトップメニューボタンからWorkflow Studioを起動している必要がある",
|
||||
helpImageEdit19b: "Send to Workflow:合成PNGをComfyUIのinputフォルダに /upload/image でアップロードし、さらにそのファイル名をComfyUIグラフ内で選択中のノード(無ければ最初に見つかったLoadImage系ノード)のimageウィジェットへ書き込む;ComfyUIのトップメニューボタンからWorkflow Studioを起動している必要がある",
|
||||
helpImageEdit20: "キャンバスナビゲーション:スクロールホイールでズーム、Space + ドラッグでパン",
|
||||
helpImageEdit21: "Undo / Redo:Ctrl+Z / Ctrl+Y(またはツールバーの ↩ ↪ ボタン)",
|
||||
helpImageEditKbdTitle: "Image Edit キーボードショートカット",
|
||||
@@ -2574,6 +2628,38 @@ const LANGUAGES = {
|
||||
helpMetadata4: "プロンプトアクション — Copy: クリップボードにコピー; GenUI:P/N: GenerateUI のポジティブ/ネガティブプロンプトにセット; Prompt:P/N: Prompt タブ Presets のポジティブ/ネガティブにセット",
|
||||
helpMetadata5: "対応フォーマット: ComfyUI PNG/WebP/JSON(標準形式 + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image サブグラフ形式)・SD WebUI・SD Forge・Fooocus。",
|
||||
helpMetadata6: "現在は Gallery タブ内のサブタブ(Style_Catalog の右隣)になっており、独立したトップレベルタブではありません — それ以外の動作は全く同じです",
|
||||
|
||||
// -- Video タブ(MiniMax H3専用、GenerateUIタブとは独立) --
|
||||
tabVideo: "Video",
|
||||
loadInVideo: "Videoに読み込み",
|
||||
videoTitle: "Video (MiniMax H3)",
|
||||
videoFirstFrame: "First Frame(任意)",
|
||||
videoLastFrame: "Last Frame(任意)",
|
||||
videoDropOrClick: "画像をドロップまたはクリックして選択",
|
||||
videoPrompt: "Prompt",
|
||||
videoAspectRatio: "Aspect Ratio",
|
||||
videoMegapixels: "Megapixels",
|
||||
videoMultiple: "Multiple",
|
||||
videoDuration: "Duration(秒)",
|
||||
videoNoiseSeed: "Noise Seed",
|
||||
videoRandomizeSeed: "ランダム化",
|
||||
videoGenerate: "Generate",
|
||||
videoResult: "結果",
|
||||
videoNoResult: "まだ結果はありません",
|
||||
videoEditPlaceholder: "編集機能は今後追加予定",
|
||||
videoProperties: "プロパティ",
|
||||
videoPropertiesPlaceholder: "今後追加予定",
|
||||
videoNoWorkflowLoaded: "ワークフローが読み込まれていません",
|
||||
videoUnsupportedWorkflow: "このワークフローにはMiniMax H3のImage to Videoノードが含まれていません",
|
||||
videoWorkflowLoaded: (name) => `ワークフローを読み込みました: ${name}`,
|
||||
videoGenerateSuccess: "動画を生成しました",
|
||||
videoDoneCount: (n) => `完了(${n}件)`,
|
||||
helpVideoTitle: "Video タブ",
|
||||
helpVideoDesc: "MiniMax H3 (Image to Video) ワークフロー専用の動画生成タブ。GenerateUIタブとは独立して動作します。",
|
||||
helpVideo1: "first_frame(任意)/last_frame(任意)の画像、prompt、aspect_ratio/megapixels/multiple(解像度)、duration(秒)、noise_seedを指定してGenerateをクリックします。first_frameを未指定にするとテキストのみでバイパス実行され、LoadImageノード自体が無いワークフローにも対応しています。",
|
||||
helpVideo2: "モデル選択(UNet/CLIP/VAE/Audio VAE)は読み込んだワークフローの既定値に固定され、このタブでは変更できません。",
|
||||
helpVideo3: "Workflowタブの詳細モーダルにある「Videoに読み込み」ボタンから、MiniMax H3のImage to Videoノードを含むワークフローを読み込めます。対応していないワークフローはエラー表示になります。",
|
||||
helpVideo4: "生成した動画(mp4)はGalleryタブでも閲覧・再生できます。",
|
||||
},
|
||||
|
||||
zh: {
|
||||
@@ -2857,6 +2943,15 @@ const LANGUAGES = {
|
||||
labT2IImageIgnored: "T2I模式已开启,无需上传图片,已跳过",
|
||||
labIndexImageSaved: (filename) => `索引图片已保存到Output:${filename}`,
|
||||
labIndexImageSaveFailed: "索引图片保存到Output失败",
|
||||
labPromptGroupBtnTitle: "应用提示词组",
|
||||
labPromptGroupModalTitle: "提示词组",
|
||||
labPromptGroupEmpty: "尚无分组。请在Prompt标签的分组面板中创建。",
|
||||
labPromptGroupCount: (n) => `${n} 个预设`,
|
||||
labPromptGroupSelectFirst: "请先选择一个分组",
|
||||
labPromptGroupNoPresets: "该分组没有预设",
|
||||
labPromptGroupApplied: (name, n) => `已将"${name}"(${n}个关键帧)应用到Prompt`,
|
||||
labPromptGroupBatchRaised: (n) => `已将Batch数量提高到${n}以适应该分组`,
|
||||
labSelectKeyframeFirst: "请先选择一个关键帧",
|
||||
|
||||
// -- GenerateUI标签页 Input子标签: Image内占位图 --
|
||||
i2iPlaceholderTitle: "占位图片",
|
||||
@@ -3405,6 +3500,8 @@ const LANGUAGES = {
|
||||
helpLab15: "Checkpoint/LoRA/VAE与其他列采用完全相同的实际生效值规则(见上文),各自独立向后延续:其中一项的关键帧不会使另外两项恢复为工作流原始设置。在编辑弹窗中,若某字段留空,且同一列表中更早的关键帧已设置过值,其占位符会显示「(继承: ...)」而不是「(保持工作流原设置)」,方便确认实际会应用的值。「恢复第1次的设置」和Bypass与+/-一样,只会作用于当前C/L/V切换选中的那一项,不会影响另外两项",
|
||||
helpLab16: "绕过LoRA节点复选框(仅LoRA关键帧自己的编辑弹窗中):在应用时强制将该关键帧的strength_model/strength_clip设为0,替代ComfyUI原生的节点Bypass(mode:4)——这里使用的工作流已转换为API格式,不带mode概念,因此将强度归零在效果上是等价的。勾选后会禁用强度输入框;与上方行级别的Bypass复选框(见helpLab13)相互独立,后者只是跳过整行而不会改动节点本身",
|
||||
helpLab17: "将LoRA语法和触发词应用到正面提示词复选框(仅LoRA列):勾选后,会在应用时以逗号分隔的形式,将<lora:name:strengthModel:strengthClip>及该LoRA缓存的CivitAI触发词追加到正面提示词——格式与GenerateUI的Model标签页Apply按钮写入的完全一致。切换关键帧时(更换为另一个LoRA、取消勾选此复选框,或该行被Bypass)总会先精确移除上一次迭代注入的内容,再添加新内容,因此批次不会累积用过的所有LoRA。勾选「绕过LoRA节点」时会自动禁用",
|
||||
helpLab18: "单击关键帧单元格现在只是选中它(蓝色描边),不再直接打开编辑弹窗——需要双击才能打开编辑弹窗。每列的表头(Model/Prompt/Ksampler)新增了▲/▼按钮,可将选中的关键帧与相邻的关键帧互换位置,从而在不重新输入内容的情况下调整顺序;关键帧#1(基准行)无法移动,也不会有其他关键帧被换到#1的位置",
|
||||
helpLab19: "Prompt列表头的PG按钮:选择Prompt标签中的一个预设分组(Table视图中的Presets Group,与Batch标签复选列表使用的是同一批分组),即可将整个Prompt列替换为该分组内每个预设对应一个关键帧、按分组顺序排列(从#1开始,#1会被覆盖而不是在其后追加)。如果分组中的预设数量超过当前Batch数量,会自动提高Batch数量以容纳(上限为50,与Batch输入框本身的上限一致);仍然超出的部分不会被静默丢弃,而是照常显示「关键帧超出Batch数量」的提示",
|
||||
helpLabCardPlanTitle: "Setting子标签 — 运行与方案文件",
|
||||
helpLabPlan1: "右侧面板 — Batch:要运行的迭代次数;Note:与方案一起保存的自由备注",
|
||||
helpLabPlan2: "Run/Pause/Cancel:Run开始批量循环;Pause/Resume在各次迭代之间暂停/继续;Cancel会中断当前生成并停止循环",
|
||||
@@ -3448,6 +3545,7 @@ const LANGUAGES = {
|
||||
helpPrompt23: "Wildcards表格 — 与Form标签的通配符文件管理器使用相同的文件列表;编辑File列的路径或Ext下拉框会重命名文件(先以新名称保存内容,再删除旧文件)",
|
||||
helpPrompt24: "Style表格 — 与Form标签的Style管理器使用相同的Style列表,可像Presets一样进行内联编辑",
|
||||
helpPrompt25: "Presets表格工具栏 — 搜索框旁边的★和B排序按钮,可将收藏/已加入Batch的预设排到列表顶部;两者可同时启用(★优先,B为次要条件),其余项保持原有的相对顺序",
|
||||
helpPrompt26: "Style表格工具栏——只选中一行且其File徽标不是custom.json时,「+ Add to this file」按钮才会启用:会添加一个以该文件为目标的空白行(保存前File列就会显示该文件的徽标)——与Form标签中Style管理器的同一功能(见上文)。custom.json条目或多选时按钮保持禁用,此时请改用常规的「+ New Style」按钮",
|
||||
helpSettings1: "UI语言和摘要语言设置",
|
||||
helpSettings2: "主题选择(13种预设)+ 自定义:颜色调整、背景图案(条纹、波点、棋盘格、SVG平铺)、字体选择(含日文显示字体在内的16种Google Fonts)",
|
||||
helpSettings3: "工作流数据文件夹路径更改/重置",
|
||||
@@ -3639,8 +3737,7 @@ const LANGUAGES = {
|
||||
helpImageEditExportTitle: "导出与导航",
|
||||
helpImageEdit17: "Save PNG:合并所有可见图层并下载为PNG文件",
|
||||
helpImageEdit18: "Save to Gallery:输入文件名(默认:wfs-image-YYYYMMDDHHmmss)将合成PNG保存到Gallery根文件夹(在设置 > Gallery Output Folder中配置);需要至少打开过一次Gallery标签以设置根目录",
|
||||
helpImageEdit19: "Save to Input:通过/upload/image将合成PNG上传到ComfyUI的输入文件夹,使其可在Load Image节点中选择",
|
||||
helpImageEdit19b: "Send to Workflow:与 Save to Input 一样会上传合成PNG,但还会将上传结果的文件名写入 ComfyUI 图中当前选中节点(若无选中节点则回退到找到的第一个 LoadImage 类节点)的 image 部件;需要通过 ComfyUI 顶部菜单按钮打开 Workflow Studio",
|
||||
helpImageEdit19b: "Send to Workflow:通过 /upload/image 将合成PNG上传到ComfyUI的输入文件夹,并将上传结果的文件名写入 ComfyUI 图中当前选中节点(若无选中节点则回退到找到的第一个 LoadImage 类节点)的 image 部件;需要通过 ComfyUI 顶部菜单按钮打开 Workflow Studio",
|
||||
helpImageEdit20: "画布导航:滚轮缩放,Space+拖动平移",
|
||||
helpImageEdit21: "撤销/重做:Ctrl+Z / Ctrl+Y(或工具栏的 ↩ ↪ 按钮)",
|
||||
helpImageEditKbdTitle: "图像编辑键盘快捷键",
|
||||
@@ -3859,6 +3956,38 @@ const LANGUAGES = {
|
||||
helpMetadata4: "提示词操作 — Copy:复制到剪贴板;GenUI:P/N:设置 GenerateUI 正/负向提示;Prompt:P/N:设置 Prompt 标签页预设正/负向提示",
|
||||
helpMetadata5: "支持格式:ComfyUI PNG/WebP/JSON(标准格式 + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image 子图工作流)、SD WebUI、SD Forge、Fooocus。",
|
||||
helpMetadata6: "现在它是 Gallery 标签页内的一个子标签(位于 Style_Catalog 右侧),不再是独立的顶层标签页 — 其余操作方式完全相同",
|
||||
|
||||
// -- Video 标签页(MiniMax H3 专用,独立于 GenerateUI) --
|
||||
tabVideo: "Video",
|
||||
loadInVideo: "加载到Video",
|
||||
videoTitle: "Video (MiniMax H3)",
|
||||
videoFirstFrame: "First Frame(可选)",
|
||||
videoLastFrame: "Last Frame(可选)",
|
||||
videoDropOrClick: "拖放图片或点击选择",
|
||||
videoPrompt: "Prompt",
|
||||
videoAspectRatio: "Aspect Ratio",
|
||||
videoMegapixels: "Megapixels",
|
||||
videoMultiple: "Multiple",
|
||||
videoDuration: "Duration(秒)",
|
||||
videoNoiseSeed: "Noise Seed",
|
||||
videoRandomizeSeed: "随机化",
|
||||
videoGenerate: "Generate",
|
||||
videoResult: "结果",
|
||||
videoNoResult: "暂无结果",
|
||||
videoEditPlaceholder: "编辑功能即将推出",
|
||||
videoProperties: "属性",
|
||||
videoPropertiesPlaceholder: "即将推出",
|
||||
videoNoWorkflowLoaded: "尚未加载工作流",
|
||||
videoUnsupportedWorkflow: "该工作流不包含 MiniMax H3 的 Image to Video 节点",
|
||||
videoWorkflowLoaded: (name) => `已加载工作流: ${name}`,
|
||||
videoGenerateSuccess: "视频已生成",
|
||||
videoDoneCount: (n) => `完成(${n} 个文件)`,
|
||||
helpVideoTitle: "Video 标签页",
|
||||
helpVideoDesc: "MiniMax H3(Image to Video)工作流专用的视频生成标签页,独立于 GenerateUI 标签页运行。",
|
||||
helpVideo1: "设置 first_frame(可选)/last_frame(可选)图片、prompt、aspect_ratio/megapixels/multiple(分辨率)、duration(秒)和 noise_seed,然后点击 Generate。不指定 first_frame 时将以纯文本方式绕过执行,也支持完全没有 LoadImage 节点的工作流。",
|
||||
helpVideo2: "模型选择(UNet/CLIP/VAE/Audio VAE)固定为所加载工作流的默认值,无法在此标签页中修改。",
|
||||
helpVideo3: "可通过 Workflow 标签页详情弹窗中的「加载到Video」按钮,加载包含 MiniMax H3 Image to Video 节点的工作流。不支持的工作流会显示错误。",
|
||||
helpVideo4: "生成的视频(mp4)也可以在 Gallery 标签页中浏览和播放。",
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -1112,7 +1112,6 @@ class ImageEditTab {
|
||||
document.getElementById("ie-redo-btn")?.addEventListener("click", () => this._redo());
|
||||
document.getElementById("ie-save-btn")?.addEventListener("click", () => this._fileExport.savePng());
|
||||
document.getElementById("ie-save-gallery-btn")?.addEventListener("click", () => this._fileExport.saveToGallery());
|
||||
document.getElementById("ie-upload-comfy-btn")?.addEventListener("click", () => this._fileExport.uploadToComfyUI());
|
||||
document.getElementById("ie-send-workflow-btn")?.addEventListener("click", () => this._fileExport.sendToWorkflow());
|
||||
document.getElementById("ie-zoom-fit")?.addEventListener("click", () => this._fitToView());
|
||||
document.getElementById("ie-zoom-100")?.addEventListener("click", () => {
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
* Image Edit Tab - File Export
|
||||
* Composites the visible layers (respecting mask-apply clipping) into a
|
||||
* flat canvas and offers three destinations: local PNG download, WFS
|
||||
* Gallery, and ComfyUI's own /upload/image endpoint.
|
||||
* Gallery, and the selected node's image widget on the ComfyUI canvas
|
||||
* (Send to Workflow).
|
||||
*/
|
||||
|
||||
import { showToast } from "../app.js";
|
||||
@@ -104,24 +105,7 @@ export class FileExport {
|
||||
}
|
||||
}
|
||||
|
||||
async uploadToComfyUI() {
|
||||
if (!this._cb.getLayerManager()) { showToast("No image loaded", "error"); return; }
|
||||
const canvas = this._buildCompositeCanvas();
|
||||
const blob = await new Promise(resolve => canvas.toBlob(resolve, "image/png"));
|
||||
const file = new File([blob], (this._cb.getBaseName() || "wfs-edit") + "-output.png", { type: "image/png" });
|
||||
const form = new FormData();
|
||||
form.append("image", file);
|
||||
form.append("overwrite", "true");
|
||||
try {
|
||||
const r = await fetch("/upload/image", { method: "POST", body: form });
|
||||
const data = await r.json();
|
||||
showToast(`Uploaded: ${data.name}`, "success");
|
||||
} catch {
|
||||
showToast("Upload failed", "error");
|
||||
}
|
||||
}
|
||||
|
||||
// Uploads the composite like uploadToComfyUI(), then (via window.opener,
|
||||
// Uploads the composite via /upload/image, then (via window.opener,
|
||||
// since WFS runs in its own window — same cross-window pattern as
|
||||
// wfmReceiveWorkflow/wfmOpenMaskEditorForNode) writes the resulting
|
||||
// filename into the "image" widget of the currently selected ComfyUI
|
||||
|
||||
+147
-3
@@ -16,6 +16,7 @@ import { escapeHtml, embedPngTextChunk, getEagleSettings, saveToEagle, setupSear
|
||||
import { extractAllMetadata, readAllPNGTextChunks } from "./metadata-tab.js";
|
||||
import { syncJsonHighlight, syncScroll } from "./json-highlight.js";
|
||||
import { _expandWildcardsInWorkflow } from "./generate-tab.js";
|
||||
import { pmGroups, getPresetsInGroup } from "./prompt-presets.js";
|
||||
|
||||
// Checkpoint/LoRA/VAE are three fully independent keyframe timelines — same as
|
||||
// Prompt/KSampler — each with its own +/-, its own atIteration sequence, its own
|
||||
@@ -128,6 +129,13 @@ let _lastGeneratedImageRef = null; // ComfyUI "name [type]" annotated ref of the
|
||||
// with the plan and simply resets to "checkpoint" on page load.
|
||||
let _modelViewMode = "checkpoint";
|
||||
|
||||
// Single-click-selected keyframe index per real column key (checkpoint/lora/vae/prompt/
|
||||
// ksampler) — used by that column's up/down reorder buttons. A single click selects
|
||||
// (this object); a double click still opens the edit modal directly, bypassing
|
||||
// selection. Not part of the Plan data — resets whenever columns are replaced wholesale
|
||||
// (plan load/clear, Prompt Group apply) so a stale index never points past the new array.
|
||||
let _selectedIdx = {};
|
||||
|
||||
// ============================================
|
||||
// Init
|
||||
// ============================================
|
||||
@@ -137,6 +145,8 @@ export function initLabTab() {
|
||||
_initPlanDropZone();
|
||||
_initSubtabToggle();
|
||||
_initColumnButtons();
|
||||
_initReorderButtons();
|
||||
_initPromptGroupButton();
|
||||
_initModelViewToggle();
|
||||
_initRunControls();
|
||||
_initPlanButtons();
|
||||
@@ -400,6 +410,133 @@ function _initColumnButtons() {
|
||||
});
|
||||
}
|
||||
|
||||
// Single click on a cell selects it (for the up/down reorder buttons below) instead of
|
||||
// opening the edit modal — opening now requires a double click (_renderColumn wires
|
||||
// both listeners on the same cell).
|
||||
function _selectCell(col, idx) {
|
||||
_selectedIdx[col] = idx;
|
||||
_renderColumnForKey(col);
|
||||
}
|
||||
|
||||
// Up/down buttons: swap the selected keyframe with its immediate array neighbor. Row 1
|
||||
// (idx 0, the baseline) can never move and nothing can be swapped into its slot — it has
|
||||
// no atIteration input of its own and drives the "live GenerateUI value" display, so
|
||||
// letting another keyframe take its place would silently change that keyframe's
|
||||
// behavior. Swapping the two keyframes' atIteration values (rather than reordering the
|
||||
// array directly) keeps each object's own value permanently paired with its own
|
||||
// atIteration field; re-deriving the array order from those swapped values below is
|
||||
// then just "swap array position to match", not a re-sort of the whole column.
|
||||
function _initReorderButtons() {
|
||||
document.querySelectorAll(".wfm-lab-col-up").forEach((btn) => {
|
||||
btn.addEventListener("click", () => _moveSelectedKeyframe(_resolveColumnKey(btn.dataset.col), -1));
|
||||
});
|
||||
document.querySelectorAll(".wfm-lab-col-down").forEach((btn) => {
|
||||
btn.addEventListener("click", () => _moveSelectedKeyframe(_resolveColumnKey(btn.dataset.col), 1));
|
||||
});
|
||||
}
|
||||
|
||||
function _moveSelectedKeyframe(col, direction) {
|
||||
const kfs = _lab.columns[col];
|
||||
const idx = _selectedIdx[col];
|
||||
if (idx == null || idx >= kfs.length) { // unselected, or stale after a bulk replace/remove
|
||||
showToast(t("labSelectKeyframeFirst"), "error");
|
||||
return;
|
||||
}
|
||||
const targetIdx = idx + direction;
|
||||
if (idx <= 0 || targetIdx <= 0 || targetIdx >= kfs.length) return; // baseline immovable; can't swap past either end
|
||||
|
||||
const tmpIter = kfs[idx].atIteration;
|
||||
kfs[idx].atIteration = kfs[targetIdx].atIteration;
|
||||
kfs[targetIdx].atIteration = tmpIter;
|
||||
[kfs[idx], kfs[targetIdx]] = [kfs[targetIdx], kfs[idx]];
|
||||
|
||||
_selectedIdx[col] = targetIdx;
|
||||
_renderColumnForKey(col);
|
||||
}
|
||||
|
||||
// "PG" button on the Prompt column header: lets the user pick one of the Prompt tab's
|
||||
// preset groups (pmGroups, defined in prompt-presets.js) and replace the ENTIRE Prompt
|
||||
// column with one keyframe per preset in the group, in group order, starting at
|
||||
// iteration #1 (which is overwritten, not appended to).
|
||||
function _initPromptGroupButton() {
|
||||
const btn = document.getElementById("wfm-lab-prompt-group-btn");
|
||||
if (btn) btn.title = t("labPromptGroupBtnTitle");
|
||||
btn?.addEventListener("click", () => _openPromptGroupModal());
|
||||
}
|
||||
|
||||
function _openPromptGroupModal() {
|
||||
const groupNames = Object.keys(pmGroups).sort();
|
||||
const listHtml = groupNames.length === 0
|
||||
? `<div class="wfm-pm-empty">${t("labPromptGroupEmpty")}</div>`
|
||||
: groupNames.map((g) => {
|
||||
const count = getPresetsInGroup(g).length;
|
||||
return `<div class="wfm-pm-item wfm-lab-pg-item" data-group="${escapeHtml(g)}">
|
||||
<div class="wfm-pm-item-body">
|
||||
<div class="wfm-pm-item-name">${escapeHtml(g)}</div>
|
||||
<div class="wfm-pm-item-sub">${t("labPromptGroupCount", count)}</div>
|
||||
</div>
|
||||
</div>`;
|
||||
}).join("");
|
||||
|
||||
const html = `
|
||||
<div id="wfm-lab-pg-list">${listHtml}</div>
|
||||
<div style="display:flex;gap:8px;margin-top:12px;justify-content:flex-end;">
|
||||
<button id="wfm-lab-pg-apply" class="wfm-btn wfm-btn-primary" disabled>${t("labApply")}</button>
|
||||
</div>`;
|
||||
openModal(t("labPromptGroupModalTitle"), html);
|
||||
|
||||
let selectedGroup = null;
|
||||
const applyBtn = document.getElementById("wfm-lab-pg-apply");
|
||||
document.querySelectorAll(".wfm-lab-pg-item").forEach((el) => {
|
||||
el.addEventListener("click", () => {
|
||||
document.querySelectorAll(".wfm-lab-pg-item").forEach((o) => o.classList.remove("active"));
|
||||
el.classList.add("active");
|
||||
selectedGroup = el.dataset.group;
|
||||
if (applyBtn) applyBtn.disabled = false;
|
||||
});
|
||||
});
|
||||
applyBtn?.addEventListener("click", () => {
|
||||
if (!selectedGroup) { showToast(t("labPromptGroupSelectFirst"), "error"); return; }
|
||||
_applyPromptGroupToLab(selectedGroup);
|
||||
});
|
||||
}
|
||||
|
||||
// Full replacement of _lab.columns.prompt: one keyframe per preset in the group, in
|
||||
// group order, atIteration 1..N — #1 is overwritten (never appended after), matching
|
||||
// how every other "bulk load" action on Lab (e.g. plan load) replaces rather than merges.
|
||||
function _applyPromptGroupToLab(groupName) {
|
||||
const presets = getPresetsInGroup(groupName);
|
||||
if (presets.length === 0) { showToast(t("labPromptGroupNoPresets"), "error"); return; }
|
||||
|
||||
// Batch input caps at 50 (see templates/index.html); raise batchCount to fit the
|
||||
// group up to that cap, same as the existing keyframe-beyond-batch warning handles
|
||||
// anything past it (see _warnIfKeyframesExceedBatch below) rather than silently
|
||||
// dropping presets past #50.
|
||||
if (presets.length > _lab.batchCount) {
|
||||
_lab.batchCount = Math.min(presets.length, 50);
|
||||
const batchEl = document.getElementById("wfm-lab-batch-count");
|
||||
if (batchEl) batchEl.value = _lab.batchCount;
|
||||
showToast(t("labPromptGroupBatchRaised", _lab.batchCount), "info");
|
||||
}
|
||||
|
||||
_lab.columns.prompt = presets.map((p, idx) => ({
|
||||
atIteration: idx + 1,
|
||||
value: {
|
||||
positive: p.text || p.posText || "",
|
||||
negative: p.negText || "",
|
||||
styleApplied: false,
|
||||
styleName: "",
|
||||
},
|
||||
revertToBase: false,
|
||||
bypassed: false,
|
||||
}));
|
||||
delete _selectedIdx.prompt; // stale selection would point past the freshly replaced array
|
||||
_renderColumnForKey("prompt");
|
||||
_warnIfKeyframesExceedBatch();
|
||||
closeModal();
|
||||
showToast(t("labPromptGroupApplied", groupName, presets.length), "success");
|
||||
}
|
||||
|
||||
// Wires the Model column header's C/L/V buttons — switches which independent field
|
||||
// (checkpoint/lora/vae) the shared cell list, +/-, and cell-click modal all operate on.
|
||||
// Purely a display/routing selector: none of the three keyframe arrays are touched by
|
||||
@@ -464,8 +601,12 @@ function _renderColumn(col, containerId = `wfm-lab-col-cells-${col}`) {
|
||||
}
|
||||
const keyframes = _lab.columns[col];
|
||||
container.innerHTML = keyframes.map((kf, idx) => _cellHtml(col, kf, idx)).join("");
|
||||
// Single click selects (for the up/down reorder buttons); double click still opens
|
||||
// the edit modal directly, independent of whatever is currently selected.
|
||||
container.querySelectorAll(".wfm-lab-cell").forEach((el) => {
|
||||
el.addEventListener("click", () => _openCellModal(col, parseInt(el.dataset.idx, 10)));
|
||||
const idx = parseInt(el.dataset.idx, 10);
|
||||
el.addEventListener("click", () => _selectCell(col, idx));
|
||||
el.addEventListener("dblclick", () => _openCellModal(col, idx));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -485,6 +626,7 @@ function _cellHtml(col, kf, idx) {
|
||||
const revertClass = kf.revertToBase ? " wfm-lab-cell-revert" : "";
|
||||
const bypassClass = kf.bypassed ? " wfm-lab-cell-bypassed" : "";
|
||||
const nodeBypassClass = (col === "lora" && kf.value?.nodeBypass) ? " wfm-lab-cell-node-bypassed" : "";
|
||||
const selectedClass = _selectedIdx[col] === idx ? " wfm-lab-cell-selected" : "";
|
||||
if (idx === 0) {
|
||||
// Bypassed takes priority over the live-reflect display — an explicit "skip this
|
||||
// row" toggle shouldn't be masked by Setting 1's usual "show the workflow's
|
||||
@@ -492,13 +634,13 @@ function _cellHtml(col, kf, idx) {
|
||||
const live = !kf.bypassed && _isLiveDisplay(col, idx);
|
||||
const liveClass = live ? " wfm-lab-cell-live" : "";
|
||||
const label = live ? _cellLabel(col, { value: _liveValueFor(col), revertToBase: false, bypassed: false }) : _cellLabel(col, kf);
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}${liveClass}" data-idx="${idx}">
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}${liveClass}${selectedClass}" data-idx="${idx}">
|
||||
<span class="wfm-lab-cell-index">${kf.atIteration}:</span>
|
||||
<span class="wfm-lab-cell-value">${label}</span>
|
||||
</div>`;
|
||||
}
|
||||
// Iteration #2 and beyond: value on its own line, applied-at iteration below it
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}" data-idx="${idx}">
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}${selectedClass}" data-idx="${idx}">
|
||||
<div class="wfm-lab-cell-value">${_cellLabel(col, kf)}</div>
|
||||
<div class="wfm-lab-cell-applied">${t("labAppliedAt", kf.atIteration)}</div>
|
||||
</div>`;
|
||||
@@ -1517,6 +1659,7 @@ function _applyPlanData(filename, data) {
|
||||
_lab.workflowFilename = data.workflow_filename || null;
|
||||
_lab.columns = _migrateLabColumns(data.columns);
|
||||
_lab.results = { images: (data.results?.images || []).slice(0, MAX_RESULTS) };
|
||||
_selectedIdx = {}; // every column's array was just replaced wholesale
|
||||
_updatePlanWorkflowUI();
|
||||
_updateT2IModeUI();
|
||||
|
||||
@@ -1596,6 +1739,7 @@ async function _loadPlanFromServer(filename) {
|
||||
function _clearPlan() {
|
||||
if (!window.confirm(t("labConfirmClear"))) return;
|
||||
_lab = _emptyLabState();
|
||||
_selectedIdx = {};
|
||||
|
||||
const noteEl = document.getElementById("wfm-lab-note");
|
||||
const batchEl = document.getElementById("wfm-lab-batch-count");
|
||||
|
||||
@@ -208,6 +208,13 @@ function matchesSearch(p) {
|
||||
(p.tags || []).some(t => t.toLowerCase().includes(s));
|
||||
}
|
||||
|
||||
// Ordered list of actual preset objects for a group (stale ids already filtered out by
|
||||
// loadAllPresets, but this is defensive for callers that read pmGroups directly too).
|
||||
export function getPresetsInGroup(groupName) {
|
||||
const ids = pmGroups[groupName] || [];
|
||||
return ids.map(id => promptPresets.find(p => p.id === id)).filter(Boolean);
|
||||
}
|
||||
|
||||
export function isInBatchPreset(id) {
|
||||
return (pmGroups["Batch"] || []).includes(id);
|
||||
}
|
||||
|
||||
@@ -768,6 +768,7 @@ function openWildcardPromptModal(file) {
|
||||
let tableStyles = [];
|
||||
let stylesSearch = "";
|
||||
let pendingNewStyle = false;
|
||||
let pendingNewStyleFile = null; // null = default custom.json; set by "+ Add to this file"
|
||||
const selectedStyleNames = new Set();
|
||||
|
||||
function styleMatchesSearch(s) {
|
||||
@@ -781,9 +782,18 @@ function styleMatchesSearch(s) {
|
||||
function updateStylesDeleteBtn() {
|
||||
const btn = document.getElementById("wfm-ptable-style-delete-btn");
|
||||
const deselectBtn = document.getElementById("wfm-ptable-style-deselect-btn");
|
||||
const addFileBtn = document.getElementById("wfm-ptable-style-addfile-btn");
|
||||
const n = selectedStyleNames.size;
|
||||
if (btn) { btn.disabled = n === 0; btn.textContent = n > 0 ? `Delete (${n})` : "Delete"; }
|
||||
if (deselectBtn) deselectBtn.disabled = n === 0;
|
||||
// 「このファイルへ追加」は選択が1件かつcustom.json以外のファイル由来のときだけ有効
|
||||
// (prompt-styles.js の Form 版と同じ制約 — custom.jsonは既に「+ New Style」で追加可能)
|
||||
if (addFileBtn) {
|
||||
const single = n === 1 ? tableStyles.find(s => selectedStyleNames.has(s.name)) : null;
|
||||
const targetFile = (single?.file && single.file !== "custom.json") ? single.file : "";
|
||||
addFileBtn.disabled = !targetFile;
|
||||
addFileBtn.dataset.targetFile = targetFile;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadStylesTable() {
|
||||
@@ -841,11 +851,14 @@ function buildStyleRow(style, index) {
|
||||
tr.appendChild(tdName);
|
||||
|
||||
const tdFile = document.createElement("td");
|
||||
if (style?.file) {
|
||||
// 新規行は保存先未定(=custom.json)なら空欄のまま、「このファイルへ追加」経由なら
|
||||
// pendingNewStyleFile を保存前からバッジ表示して、どこに追加されるか分かるようにする
|
||||
const fileForBadge = style?.file || (isNew ? pendingNewStyleFile : null);
|
||||
if (fileForBadge) {
|
||||
const badge = document.createElement("span");
|
||||
badge.className = "wfm-prompt-edit-file-badge";
|
||||
badge.title = style.file;
|
||||
badge.textContent = style.file;
|
||||
badge.title = fileForBadge;
|
||||
badge.textContent = fileForBadge;
|
||||
tdFile.appendChild(badge);
|
||||
}
|
||||
tr.appendChild(tdFile);
|
||||
@@ -872,9 +885,10 @@ function buildStyleRow(style, index) {
|
||||
addBtn.addEventListener("click", async () => {
|
||||
const name = nameInput.value.trim();
|
||||
if (!name) { showToast(t("pleaseEnterStyleName"), "error"); nameInput.focus(); return; }
|
||||
const result = await styleApiCreate(name, posTA.value, negTA.value, null);
|
||||
const result = await styleApiCreate(name, posTA.value, negTA.value, pendingNewStyleFile);
|
||||
if (result.ok) {
|
||||
pendingNewStyle = false;
|
||||
pendingNewStyleFile = null;
|
||||
await loadStylesTable();
|
||||
await styleRefreshList();
|
||||
await refreshStylesList();
|
||||
@@ -883,7 +897,7 @@ function buildStyleRow(style, index) {
|
||||
showToast(t("errorWithMsg", result.error), "error");
|
||||
}
|
||||
});
|
||||
cancelBtn.addEventListener("click", () => { pendingNewStyle = false; renderStylesTable(); });
|
||||
cancelBtn.addEventListener("click", () => { pendingNewStyle = false; pendingNewStyleFile = null; renderStylesTable(); });
|
||||
} else {
|
||||
const saveStyleRow = async (changedEl) => {
|
||||
const nameNow = nameInput.value.trim();
|
||||
@@ -1073,6 +1087,16 @@ export function initPromptTableTab() {
|
||||
document.getElementById("wfm-ptable-style-add-btn")?.addEventListener("click", () => {
|
||||
if (pendingNewStyle) return;
|
||||
pendingNewStyle = true;
|
||||
pendingNewStyleFile = null;
|
||||
renderStylesTable();
|
||||
document.querySelector("#wfm-ptable-style-tbody input")?.focus();
|
||||
});
|
||||
document.getElementById("wfm-ptable-style-addfile-btn")?.addEventListener("click", (e) => {
|
||||
if (pendingNewStyle) return;
|
||||
const targetFile = e.currentTarget.dataset.targetFile;
|
||||
if (!targetFile) return;
|
||||
pendingNewStyle = true;
|
||||
pendingNewStyleFile = targetFile;
|
||||
renderStylesTable();
|
||||
document.querySelector("#wfm-ptable-style-tbody input")?.focus();
|
||||
});
|
||||
|
||||
@@ -0,0 +1,484 @@
|
||||
/**
|
||||
* Video Tab - MiniMax H3 (Image to Video) 専用の動画生成UI
|
||||
* GenerateUIタブとは完全に独立。UI形式ワークフローJSONを直接編集し、
|
||||
* comfyWorkflow.convertUiToApi() でAPI形式に変換して実行する。
|
||||
* 状態は「テンプレートJSON+フォーム値」のみ保持し、生成の都度
|
||||
* structuredClone() したコピーに書き込む(複数回生成をまたいだID不整合を防ぐ)。
|
||||
*/
|
||||
|
||||
import { showToast } from "./app.js";
|
||||
import { t } from "./i18n.js";
|
||||
import { comfyUI } from "./comfyui-client.js";
|
||||
import { comfyWorkflow } from "./comfyui-workflow.js";
|
||||
import { escapeHtml } from "./util.js";
|
||||
|
||||
const DEFAULT_WORKFLOW_FILENAME = "minimax_test.json";
|
||||
|
||||
const state = {
|
||||
templateWorkflow: null,
|
||||
templateFilename: null,
|
||||
firstFrameFilename: null,
|
||||
lastFrameFilename: null,
|
||||
generating: false,
|
||||
};
|
||||
|
||||
// ============================================
|
||||
// ワークフロー取得
|
||||
// ============================================
|
||||
|
||||
async function getRawWorkflow(filename) {
|
||||
const res = await fetch(`/api/wfm/workflows/raw?filename=${encodeURIComponent(filename)}`);
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
return await res.json();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// MiniMax H3ノードの動的特定(ノードIDをハードコードしない)
|
||||
// ============================================
|
||||
|
||||
// ノードのinputs[]のうちwidgetキーを持つものだけを抽出した並び順で、名前からインデックスを引く。
|
||||
// widgets_values配列はこの並び順と1:1対応する(link接続されていてもwidgetキーを持つ入力は
|
||||
// widgets_valuesにスロットを持つ「legacy full」形式のため)。
|
||||
function _widgetIndex(node, name) {
|
||||
const widgetInputs = (node?.inputs || []).filter((inp) => inp.widget);
|
||||
return widgetInputs.findIndex((inp) => inp.name === name);
|
||||
}
|
||||
|
||||
function locateMiniMaxNodes(workflow) {
|
||||
if (!Array.isArray(workflow?.nodes) || !Array.isArray(workflow?.links)) return null;
|
||||
|
||||
const sgDef = (workflow.definitions?.subgraphs || [])
|
||||
.find((sg) => (sg.nodes || []).some((n) => n.type === "MiniMaxH3ImageToVideo"));
|
||||
if (!sgDef) return null;
|
||||
|
||||
const instanceNode = workflow.nodes.find((n) => n.type === sgDef.id);
|
||||
if (!instanceNode || !Array.isArray(instanceNode.widgets_values)) return null;
|
||||
|
||||
const firstFrameSlot = instanceNode.inputs.findIndex((inp) => inp.name === "first_frame");
|
||||
const lastFrameSlot = instanceNode.inputs.findIndex((inp) => inp.name === "last_frame");
|
||||
const widthSlot = instanceNode.inputs.findIndex((inp) => inp.name === "width");
|
||||
if (firstFrameSlot === -1 || lastFrameSlot === -1 || widthSlot === -1) return null;
|
||||
|
||||
const findLinkedNode = (targetSlot) => {
|
||||
const link = workflow.links.find((l) => l[3] === instanceNode.id && l[4] === targetSlot);
|
||||
if (!link) return null;
|
||||
return workflow.nodes.find((n) => n.id === link[1]) || null;
|
||||
};
|
||||
|
||||
// first_frameはoptional入力のため、LoadImageノードが接続されていないワークフロー
|
||||
// (テキストのみで動作するT2V構成など)もサポート対象とする。未接続の場合は
|
||||
// loadImageNode: null のまま返し、必要ならrunGeneration側で動的にノードを注入する。
|
||||
const rawLoadImageNode = findLinkedNode(firstFrameSlot);
|
||||
const loadImageNode = (rawLoadImageNode && rawLoadImageNode.type === "LoadImage") ? rawLoadImageNode : null;
|
||||
const resolutionNode = findLinkedNode(widthSlot);
|
||||
if (!resolutionNode || resolutionNode.type !== "ResolutionSelector") return null;
|
||||
|
||||
const promptIdx = _widgetIndex(instanceNode, "prompt");
|
||||
const durationIdx = _widgetIndex(instanceNode, "value_1");
|
||||
if (promptIdx === -1 || durationIdx === -1) return null;
|
||||
|
||||
return {
|
||||
sgDef, instanceNode, loadImageNode, resolutionNode,
|
||||
firstFrameSlot, lastFrameSlot, promptIdx, durationIdx,
|
||||
};
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// ワークフロー読み込み
|
||||
// ============================================
|
||||
|
||||
function _showFramePreview(which, filename) {
|
||||
const previewImg = document.getElementById(`wfm-video-${which}-frame-preview`);
|
||||
const wrap = document.getElementById(`wfm-video-${which}-frame-wrap`);
|
||||
if (!previewImg || !wrap || !filename) return;
|
||||
previewImg.src = `${comfyUI.baseUrl}/view?filename=${encodeURIComponent(filename)}&type=input`;
|
||||
wrap.style.display = "";
|
||||
}
|
||||
|
||||
export async function loadWorkflowIntoVideoEditor(workflow, filename) {
|
||||
const nodes = locateMiniMaxNodes(workflow);
|
||||
if (!nodes) {
|
||||
showToast(t("videoUnsupportedWorkflow"), "error");
|
||||
return false;
|
||||
}
|
||||
|
||||
state.templateWorkflow = workflow;
|
||||
state.templateFilename = filename || "";
|
||||
state.firstFrameFilename = null;
|
||||
state.lastFrameFilename = null;
|
||||
|
||||
const nameEl = document.getElementById("wfm-video-wf-name");
|
||||
if (nameEl) nameEl.textContent = filename || "Loaded Workflow";
|
||||
|
||||
const { instanceNode, resolutionNode, loadImageNode, promptIdx, durationIdx } = nodes;
|
||||
|
||||
const promptEl = document.getElementById("wfm-video-prompt");
|
||||
if (promptEl) promptEl.value = instanceNode.widgets_values[promptIdx] ?? "";
|
||||
|
||||
const durationEl = document.getElementById("wfm-video-duration");
|
||||
if (durationEl) durationEl.value = instanceNode.widgets_values[durationIdx] ?? 2;
|
||||
|
||||
const arIdx = _widgetIndex(resolutionNode, "aspect_ratio");
|
||||
const mpIdx = _widgetIndex(resolutionNode, "megapixels");
|
||||
const multIdx = _widgetIndex(resolutionNode, "multiple");
|
||||
const aspectEl = document.getElementById("wfm-video-aspect-ratio");
|
||||
if (aspectEl && arIdx !== -1 && resolutionNode.widgets_values[arIdx] != null) {
|
||||
aspectEl.value = resolutionNode.widgets_values[arIdx];
|
||||
}
|
||||
const mpEl = document.getElementById("wfm-video-megapixels");
|
||||
if (mpEl && mpIdx !== -1) mpEl.value = resolutionNode.widgets_values[mpIdx] ?? mpEl.value;
|
||||
const multEl = document.getElementById("wfm-video-multiple");
|
||||
if (multEl && multIdx !== -1) multEl.value = resolutionNode.widgets_values[multIdx] ?? multEl.value;
|
||||
|
||||
const fnIdx = _widgetIndex(loadImageNode, "image");
|
||||
if (fnIdx !== -1 && loadImageNode.widgets_values[fnIdx]) {
|
||||
state.firstFrameFilename = loadImageNode.widgets_values[fnIdx];
|
||||
_showFramePreview("first", state.firstFrameFilename);
|
||||
}
|
||||
|
||||
showToast(t("videoWorkflowLoaded", filename || ""), "success");
|
||||
return true;
|
||||
}
|
||||
|
||||
async function loadDefaultWorkflow() {
|
||||
try {
|
||||
const wf = await getRawWorkflow(DEFAULT_WORKFLOW_FILENAME);
|
||||
await loadWorkflowIntoVideoEditor(wf, DEFAULT_WORKFLOW_FILENAME);
|
||||
} catch {
|
||||
// 初回自動ロード失敗は静かに無視する(環境によってファイルが存在しないこともある)。
|
||||
// Workflowタブの「Load in Video」ボタンから明示的に読み込める。
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Aspect Ratio 選択肢(object_infoから動的取得、ハードコードしない)
|
||||
// ============================================
|
||||
|
||||
async function _populateAspectRatioOptions() {
|
||||
const select = document.getElementById("wfm-video-aspect-ratio");
|
||||
if (!select) return;
|
||||
try {
|
||||
const info = await comfyUI.fetchObjectInfo("ResolutionSelector");
|
||||
const inputDef = info?.ResolutionSelector?.input?.required?.aspect_ratio;
|
||||
if (!inputDef) return;
|
||||
const first = inputDef[0];
|
||||
let values = null;
|
||||
if (Array.isArray(first)) values = first;
|
||||
else if (typeof first === "string" && Array.isArray(inputDef[1]?.values)) values = inputDef[1].values;
|
||||
else if (typeof first === "string" && Array.isArray(inputDef[1]?.options)) values = inputDef[1].options;
|
||||
if (!values?.length) return;
|
||||
select.innerHTML = values.map((v) => `<option value="${escapeHtml(v)}">${escapeHtml(v)}</option>`).join("");
|
||||
} catch {
|
||||
// ResolutionSelectorが未導入の環境などは選択肢が空のまま(手入力不可のselectなので実質何もできないが、
|
||||
// Videoタブ自体の初期化は継続させる)。
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// first_frame / last_frame アップロード
|
||||
// ============================================
|
||||
|
||||
function _wireDropZone(dropZoneId, fileInputId, onFile) {
|
||||
const dropZone = document.getElementById(dropZoneId);
|
||||
const fileInput = document.getElementById(fileInputId);
|
||||
if (!dropZone || !fileInput) return;
|
||||
fileInput.addEventListener("change", () => {
|
||||
if (fileInput.files.length > 0) onFile(fileInput.files[0]);
|
||||
});
|
||||
dropZone.addEventListener("dragover", (e) => { e.preventDefault(); dropZone.classList.add("drag-over"); });
|
||||
dropZone.addEventListener("dragleave", () => dropZone.classList.remove("drag-over"));
|
||||
dropZone.addEventListener("drop", (e) => {
|
||||
e.preventDefault();
|
||||
dropZone.classList.remove("drag-over");
|
||||
if (e.dataTransfer.files.length > 0) onFile(e.dataTransfer.files[0]);
|
||||
});
|
||||
}
|
||||
|
||||
async function _handleFrameUpload(which, file) {
|
||||
if (!file || !file.type.startsWith("image/")) return;
|
||||
const statusEl = document.getElementById(`wfm-video-${which}-frame-status`);
|
||||
const previewImg = document.getElementById(`wfm-video-${which}-frame-preview`);
|
||||
const wrap = document.getElementById(`wfm-video-${which}-frame-wrap`);
|
||||
if (previewImg) previewImg.src = URL.createObjectURL(file);
|
||||
if (wrap) wrap.style.display = "";
|
||||
if (statusEl) statusEl.textContent = "Uploading...";
|
||||
try {
|
||||
const result = await comfyUI.uploadImage(file, file.name);
|
||||
if (which === "first") state.firstFrameFilename = result.name;
|
||||
else state.lastFrameFilename = result.name;
|
||||
if (statusEl) {
|
||||
statusEl.textContent = `✓ ${result.name}`;
|
||||
statusEl.style.color = "var(--wfm-success)";
|
||||
}
|
||||
} catch (err) {
|
||||
if (statusEl) {
|
||||
statusEl.textContent = `✗ ${err.message}`;
|
||||
statusEl.style.color = "var(--wfm-danger)";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function _clearFrame(which) {
|
||||
if (which === "first") state.firstFrameFilename = null;
|
||||
else state.lastFrameFilename = null;
|
||||
const wrap = document.getElementById(`wfm-video-${which}-frame-wrap`);
|
||||
const previewImg = document.getElementById(`wfm-video-${which}-frame-preview`);
|
||||
const statusEl = document.getElementById(`wfm-video-${which}-frame-status`);
|
||||
const fileInput = document.getElementById(`wfm-video-${which}-frame-file`);
|
||||
if (wrap) wrap.style.display = "none";
|
||||
if (previewImg) previewImg.src = "";
|
||||
if (statusEl) statusEl.textContent = "";
|
||||
if (fileInput) fileInput.value = "";
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// フォーム値の読み取り・ワークフローへの反映
|
||||
// ============================================
|
||||
|
||||
function _readFormValues() {
|
||||
return {
|
||||
prompt: document.getElementById("wfm-video-prompt")?.value || "",
|
||||
aspectRatio: document.getElementById("wfm-video-aspect-ratio")?.value || "",
|
||||
megapixels: Number(document.getElementById("wfm-video-megapixels")?.value) || 0.2,
|
||||
multiple: Number(document.getElementById("wfm-video-multiple")?.value) || 32,
|
||||
duration: Number(document.getElementById("wfm-video-duration")?.value) || 2,
|
||||
};
|
||||
}
|
||||
|
||||
function _applyFormToWorkflow(nodes, form) {
|
||||
const { instanceNode, resolutionNode, loadImageNode, promptIdx, durationIdx } = nodes;
|
||||
|
||||
instanceNode.widgets_values[promptIdx] = form.prompt;
|
||||
instanceNode.widgets_values[durationIdx] = form.duration;
|
||||
|
||||
const arIdx = _widgetIndex(resolutionNode, "aspect_ratio");
|
||||
const mpIdx = _widgetIndex(resolutionNode, "megapixels");
|
||||
const multIdx = _widgetIndex(resolutionNode, "multiple");
|
||||
if (arIdx !== -1) resolutionNode.widgets_values[arIdx] = form.aspectRatio;
|
||||
if (mpIdx !== -1) resolutionNode.widgets_values[mpIdx] = form.megapixels;
|
||||
if (multIdx !== -1) resolutionNode.widgets_values[multIdx] = form.multiple;
|
||||
|
||||
// first_frameは既存のLoadImageノードが接続されている場合のみここで書き換える。
|
||||
// 接続が無い場合(loadImageNode: null)は、first_frameが新規指定された時だけ
|
||||
// _injectFrameNode()でノードごと注入する(未指定ならバイパス=未接続のまま実行)。
|
||||
if (loadImageNode) {
|
||||
const fnIdx = _widgetIndex(loadImageNode, "image");
|
||||
if (fnIdx !== -1) loadImageNode.widgets_values[fnIdx] = state.firstFrameFilename;
|
||||
}
|
||||
}
|
||||
|
||||
// first_frame/last_frameが未接続のワークフローに対して、画像が指定された時だけ
|
||||
// LoadImageノードを新規注入する共通ヘルパー。ノードID/リンクIDはclone内の実際の
|
||||
// 最大値+1で採番するため、重複ID/リンクID不整合は起きない
|
||||
// (CLAUDE.md記載の既知の落とし穴への対策)。未指定時は何もしない
|
||||
// (テンプレート由来のlink:nullのまま=クリーンな状態を毎回cloneするので残留の心配がない=バイパス扱い)。
|
||||
function _injectFrameNode(clone, instanceNode, targetSlot, filename) {
|
||||
const maxNodeId = Math.max(clone.last_node_id || 0, ...clone.nodes.map((n) => n.id));
|
||||
const maxLinkId = Math.max(clone.last_link_id || 0, ...clone.links.map((l) => l[0]));
|
||||
const newNodeId = maxNodeId + 1;
|
||||
const newLinkId = maxLinkId + 1;
|
||||
|
||||
clone.nodes.push({
|
||||
id: newNodeId,
|
||||
type: "LoadImage",
|
||||
pos: [(instanceNode.pos?.[0] || 0) - 260, (instanceNode.pos?.[1] || 0) + 40],
|
||||
size: [280, 314],
|
||||
flags: {},
|
||||
order: clone.nodes.length,
|
||||
mode: 0,
|
||||
inputs: [
|
||||
{ localized_name: "image", name: "image", type: "COMBO", widget: { name: "image" }, link: null },
|
||||
{ localized_name: "choose file to upload", name: "upload", type: "IMAGEUPLOAD", widget: { name: "upload" }, link: null },
|
||||
],
|
||||
outputs: [
|
||||
{ localized_name: "IMAGE", name: "IMAGE", type: "IMAGE", links: [newLinkId] },
|
||||
{ localized_name: "MASK", name: "MASK", type: "MASK", links: null },
|
||||
],
|
||||
properties: { "Node name for S&R": "LoadImage" },
|
||||
widgets_values: [filename, "image"],
|
||||
});
|
||||
|
||||
clone.links.push([newLinkId, newNodeId, 0, instanceNode.id, targetSlot, "IMAGE"]);
|
||||
const targetInput = instanceNode.inputs[targetSlot];
|
||||
if (targetInput) targetInput.link = newLinkId;
|
||||
|
||||
clone.last_node_id = newNodeId;
|
||||
clone.last_link_id = newLinkId;
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// 実行
|
||||
// ============================================
|
||||
|
||||
async function runGeneration() {
|
||||
if (state.generating) return;
|
||||
if (!state.templateWorkflow) {
|
||||
showToast(t("videoNoWorkflowLoaded"), "error");
|
||||
return;
|
||||
}
|
||||
|
||||
const clone = structuredClone(state.templateWorkflow);
|
||||
const nodes = locateMiniMaxNodes(clone);
|
||||
if (!nodes) {
|
||||
showToast(t("videoUnsupportedWorkflow"), "error");
|
||||
return;
|
||||
}
|
||||
|
||||
_applyFormToWorkflow(nodes, _readFormValues());
|
||||
// first_frame: 既存のLoadImageノードが無いワークフロー(T2V構成等)で、
|
||||
// ユーザーが新たに画像を指定した場合のみノードを注入する。未指定ならバイパス(未接続のまま実行)。
|
||||
if (!nodes.loadImageNode && state.firstFrameFilename) {
|
||||
_injectFrameNode(clone, nodes.instanceNode, nodes.firstFrameSlot, state.firstFrameFilename);
|
||||
}
|
||||
if (state.lastFrameFilename) {
|
||||
_injectFrameNode(clone, nodes.instanceNode, nodes.lastFrameSlot, state.lastFrameFilename);
|
||||
}
|
||||
|
||||
const genBtn = document.getElementById("wfm-video-generate-btn");
|
||||
const progressBar = document.getElementById("wfm-video-progress-bar");
|
||||
const progressText = document.getElementById("wfm-video-progress-text");
|
||||
|
||||
state.generating = true;
|
||||
if (genBtn) genBtn.disabled = true;
|
||||
if (progressBar) progressBar.style.width = "0%";
|
||||
if (progressText) progressText.textContent = "Converting workflow...";
|
||||
|
||||
try {
|
||||
const apiWorkflow = await comfyWorkflow.convertUiToApi(clone);
|
||||
|
||||
const seedValue = Number(document.getElementById("wfm-video-noise-seed")?.value) || 0;
|
||||
const seedMode = document.getElementById("wfm-video-seed-randomize")?.checked ? "random" : "fixed";
|
||||
|
||||
const { images, seed } = await comfyUI.generate(apiWorkflow, {
|
||||
seedMode,
|
||||
seedValue,
|
||||
timeoutMs: 30 * 60 * 1000, // 動画生成は静止画より長時間になりうる
|
||||
onProgress: (pct) => {
|
||||
if (progressBar) progressBar.style.width = `${(pct * 100).toFixed(1)}%`;
|
||||
if (progressText) progressText.textContent = `${(pct * 100).toFixed(0)}%`;
|
||||
},
|
||||
});
|
||||
|
||||
const seedEl = document.getElementById("wfm-video-noise-seed");
|
||||
if (seedEl) seedEl.value = seed;
|
||||
|
||||
const outputMedia = images.filter((img) => img.type !== "temp");
|
||||
if (progressText) progressText.textContent = t("videoDoneCount", outputMedia.length);
|
||||
if (progressBar) progressBar.style.width = "100%";
|
||||
|
||||
_renderResult(outputMedia);
|
||||
await _saveGeneratedVideoMeta(outputMedia, apiWorkflow);
|
||||
showToast(t("videoGenerateSuccess"), "success");
|
||||
} catch (err) {
|
||||
showToast(t("errorWithMsg", err.message), "error");
|
||||
if (progressText) progressText.textContent = "Error";
|
||||
} finally {
|
||||
state.generating = false;
|
||||
if (genBtn) genBtn.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// 結果表示
|
||||
// ============================================
|
||||
|
||||
function _renderResult(images) {
|
||||
const container = document.getElementById("wfm-video-result");
|
||||
if (!container) return;
|
||||
if (!images?.length) {
|
||||
container.innerHTML = `<p class="wfm-placeholder">${t("videoNoResult")}</p>`;
|
||||
return;
|
||||
}
|
||||
container.innerHTML = images.map((img) => {
|
||||
const params = new URLSearchParams({ filename: img.filename, subfolder: img.subfolder || "", type: img.type || "output" });
|
||||
const src = `${comfyUI.baseUrl}/view?${params}`;
|
||||
const isVideo = img.filename.toLowerCase().endsWith(".mp4");
|
||||
return isVideo
|
||||
? `<video class="wfm-video-result-item" src="${src}" controls></video>`
|
||||
: `<img class="wfm-video-result-item" src="${src}" alt="">`;
|
||||
}).join("");
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Gallery連携(生成結果のワークフローをサイドカーメタとして保存)
|
||||
// ============================================
|
||||
|
||||
let _outputDir = "";
|
||||
|
||||
async function _fetchOutputDir() {
|
||||
try {
|
||||
const res = await fetch("/api/wfm/settings/output-dir");
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
_outputDir = (data.current || "").replace(/\\/g, "/").replace(/\/$/, "");
|
||||
}
|
||||
} catch { /* non-critical */ }
|
||||
}
|
||||
|
||||
async function _saveGeneratedVideoMeta(images, workflow) {
|
||||
if (!_outputDir) await _fetchOutputDir();
|
||||
if (!_outputDir) return;
|
||||
for (const img of images) {
|
||||
if (img.type !== "output") continue;
|
||||
const parts = [_outputDir];
|
||||
if (img.subfolder) parts.push(img.subfolder);
|
||||
parts.push(img.filename);
|
||||
const path = parts.join("/");
|
||||
try {
|
||||
await fetch("/wfm/gallery/image/meta", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ path, workflow }),
|
||||
});
|
||||
} catch { /* non-critical */ }
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// i18nの適用(app.jsのapplyI18nToHtml()と同じ「個別要素にt()を適用」方式)
|
||||
// ============================================
|
||||
|
||||
function _applyVideoI18n() {
|
||||
const setText = (id, key) => {
|
||||
const el = document.getElementById(id);
|
||||
if (el) el.textContent = t(key);
|
||||
};
|
||||
setText("wfm-video-title-label", "videoTitle");
|
||||
setText("wfm-video-first-frame-label", "videoFirstFrame");
|
||||
setText("wfm-video-last-frame-label", "videoLastFrame");
|
||||
setText("wfm-video-first-frame-drop-label", "videoDropOrClick");
|
||||
setText("wfm-video-last-frame-drop-label", "videoDropOrClick");
|
||||
setText("wfm-video-first-frame-clear", "clear");
|
||||
setText("wfm-video-last-frame-clear", "clear");
|
||||
setText("wfm-video-prompt-label", "videoPrompt");
|
||||
setText("wfm-video-aspect-ratio-label", "videoAspectRatio");
|
||||
setText("wfm-video-megapixels-label", "videoMegapixels");
|
||||
setText("wfm-video-multiple-label", "videoMultiple");
|
||||
setText("wfm-video-duration-label", "videoDuration");
|
||||
setText("wfm-video-noise-seed-label", "videoNoiseSeed");
|
||||
setText("wfm-video-randomize-label", "videoRandomizeSeed");
|
||||
setText("wfm-video-generate-btn", "videoGenerate");
|
||||
setText("wfm-video-result-label", "videoResult");
|
||||
setText("wfm-video-no-result-label", "videoNoResult");
|
||||
setText("wfm-video-edit-placeholder-label", "videoEditPlaceholder");
|
||||
setText("wfm-video-properties-label", "videoProperties");
|
||||
setText("wfm-video-properties-placeholder-label", "videoPropertiesPlaceholder");
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// 初期化
|
||||
// ============================================
|
||||
|
||||
export function initVideoTab() {
|
||||
_applyVideoI18n();
|
||||
_populateAspectRatioOptions();
|
||||
|
||||
_wireDropZone("wfm-video-first-frame-drop", "wfm-video-first-frame-file", (file) => _handleFrameUpload("first", file));
|
||||
_wireDropZone("wfm-video-last-frame-drop", "wfm-video-last-frame-file", (file) => _handleFrameUpload("last", file));
|
||||
|
||||
document.getElementById("wfm-video-first-frame-clear")?.addEventListener("click", () => _clearFrame("first"));
|
||||
document.getElementById("wfm-video-last-frame-clear")?.addEventListener("click", () => _clearFrame("last"));
|
||||
document.getElementById("wfm-video-generate-btn")?.addEventListener("click", runGeneration);
|
||||
|
||||
loadDefaultWorkflow();
|
||||
}
|
||||
+18
-25
@@ -7,6 +7,7 @@
|
||||
import { showToast, openModal, closeModal } from "./app.js";
|
||||
import { comfyWorkflow } from "./comfyui-workflow.js";
|
||||
import { loadWorkflowIntoEditor } from "./generate-tab.js";
|
||||
import { loadWorkflowIntoVideoEditor } from "./video-tab.js";
|
||||
import { t, getSummaryPrompt } from "./i18n.js";
|
||||
import { highlightJSON } from "./json-highlight.js";
|
||||
import { openBadgeEditModal } from "./models-tab.js";
|
||||
@@ -615,6 +616,8 @@ async function showSidePanel(wf, cardEl) {
|
||||
// Enable toolbar load buttons
|
||||
const listLoadBtn = document.getElementById("wfm-list-load-btn");
|
||||
if (listLoadBtn) { listLoadBtn.disabled = false; listLoadBtn.title = ""; }
|
||||
const listLoadVideoBtn = document.getElementById("wfm-list-load-video-btn");
|
||||
if (listLoadVideoBtn) { listLoadVideoBtn.disabled = false; listLoadVideoBtn.title = ""; }
|
||||
const listOpenComfyBtn = document.getElementById("wfm-list-open-comfyui-btn");
|
||||
if (listOpenComfyBtn) { listOpenComfyBtn.disabled = false; listOpenComfyBtn.title = ""; }
|
||||
|
||||
@@ -660,6 +663,8 @@ function closeSidePanel() {
|
||||
if (titleEl) titleEl.textContent = "";
|
||||
const listLoadBtn = document.getElementById("wfm-list-load-btn");
|
||||
if (listLoadBtn) { listLoadBtn.disabled = true; listLoadBtn.title = t("selectCardFirst"); }
|
||||
const listLoadVideoBtn = document.getElementById("wfm-list-load-video-btn");
|
||||
if (listLoadVideoBtn) { listLoadVideoBtn.disabled = true; listLoadVideoBtn.title = t("selectCardFirst"); }
|
||||
const listOpenComfyBtn = document.getElementById("wfm-list-open-comfyui-btn");
|
||||
if (listOpenComfyBtn) { listOpenComfyBtn.disabled = true; listOpenComfyBtn.title = t("selectCardFirst"); }
|
||||
renderSideGroup(null);
|
||||
@@ -956,8 +961,6 @@ function openDetailModal(wf) {
|
||||
<textarea class="wfm-textarea" id="wfm-detail-memo" rows="4" placeholder="${t("memoPlaceholder")}">${meta.memo || ""}</textarea>
|
||||
</section>
|
||||
<div class="wfm-modal-actions">
|
||||
<button class="wfm-btn wfm-btn-primary" id="wfm-detail-load">${t("loadInGenerate")}</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-detail-open-comfyui">${t("sendToCanvas")}</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-detail-set-default">${t("setAsDefault")}</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-detail-change-thumb">${t("changeThumbnail")}</button>
|
||||
<input type="file" id="wfm-detail-thumb-file" accept="image/png,image/webp,image/jpeg" style="display:none">
|
||||
@@ -1094,29 +1097,6 @@ function openDetailModal(wf) {
|
||||
}
|
||||
});
|
||||
|
||||
// Load in GenerateUI
|
||||
document.getElementById("wfm-detail-load").addEventListener("click", async () => {
|
||||
try {
|
||||
const wfData = await getRawWorkflow(wf.filename);
|
||||
const loaded = await loadWorkflowIntoEditor(wfData, wf.filename);
|
||||
if (loaded === false) return;
|
||||
document.querySelector('.wfm-tab[data-tab="generate"]')?.click();
|
||||
closeModal();
|
||||
} catch (err) {
|
||||
showToast(t("loadError") + ": " + err.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
// Send to Canvas
|
||||
document.getElementById("wfm-detail-open-comfyui")?.addEventListener("click", async () => {
|
||||
try {
|
||||
const wfData = await getRawWorkflow(wf.filename);
|
||||
sendToCanvas(wfData, wf.filename);
|
||||
} catch (err) {
|
||||
showToast(t("loadError") + ": " + err.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
// Set as default workflow
|
||||
document.getElementById("wfm-detail-set-default")?.addEventListener("click", async () => {
|
||||
try {
|
||||
@@ -1398,6 +1378,19 @@ export function initWorkflowTab() {
|
||||
}
|
||||
});
|
||||
|
||||
// Toolbar: Load in Video button (MiniMax H3専用。非対応ワークフローはloadWorkflowIntoVideoEditor内でエラートースト表示済み)
|
||||
document.getElementById("wfm-list-load-video-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedWf) return;
|
||||
try {
|
||||
const wfData = await getRawWorkflow(state.selectedWf.filename);
|
||||
const loaded = await loadWorkflowIntoVideoEditor(wfData, state.selectedWf.filename);
|
||||
if (loaded === false) return;
|
||||
document.querySelector('.wfm-tab[data-tab="video"]')?.click();
|
||||
} catch (err) {
|
||||
showToast(t("loadError") + ": " + err.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
// Toolbar: Send to Canvas button
|
||||
document.getElementById("wfm-list-open-comfyui-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedWf) return;
|
||||
|
||||
+136
-4
@@ -10,6 +10,7 @@
|
||||
<link rel="stylesheet" href="/wfm_static/css/tagger-tab.css">
|
||||
<link rel="stylesheet" href="/wfm_static/css/image-edit-tab.css">
|
||||
<link rel="stylesheet" href="/wfm_static/css/lab-tab.css">
|
||||
<link rel="stylesheet" href="/wfm_static/css/video-tab.css">
|
||||
</head>
|
||||
<body>
|
||||
<!-- Header -->
|
||||
@@ -25,6 +26,7 @@
|
||||
<button class="wfm-tab" data-tab="prompt">Prompt</button>
|
||||
<button class="wfm-tab" data-tab="gallery">Gallery</button>
|
||||
<button class="wfm-tab" data-tab="image-edit">Image Edit</button>
|
||||
<button class="wfm-tab" data-tab="video">Video</button>
|
||||
<button class="wfm-tab" data-tab="tagger">Tagger</button>
|
||||
<button class="wfm-tab" data-tab="settings">Settings</button>
|
||||
<button class="wfm-tab" data-tab="help">Help</button>
|
||||
@@ -54,6 +56,7 @@
|
||||
<option value="">All Groups</option>
|
||||
</select>
|
||||
<button id="wfm-list-load-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary" disabled title="Select a card first">Load in GenerateUI</button>
|
||||
<button id="wfm-list-load-video-btn" class="wfm-btn wfm-btn-sm" disabled title="Select a card first">Load in Video</button>
|
||||
<button id="wfm-list-open-comfyui-btn" class="wfm-btn wfm-btn-sm" disabled title="Select a card first">Send to Canvas</button>
|
||||
<div class="wfm-view-btns">
|
||||
<button class="wfm-view-btn active" data-view="thumb" title="Thumbnail">⊞</button>
|
||||
@@ -567,6 +570,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="wfm-lab-col-btns">
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-up" data-col="model" title="Move selected keyframe up">▲</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-down" data-col="model" title="Move selected keyframe down">▼</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="model" title="Add keyframe">+</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="model" title="Remove last keyframe">-</button>
|
||||
</div>
|
||||
@@ -577,6 +582,9 @@
|
||||
<div class="wfm-lab-col-header">
|
||||
<span>プロンプト</span>
|
||||
<div class="wfm-lab-col-btns">
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-up" data-col="prompt" title="Move selected keyframe up">▲</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-down" data-col="prompt" title="Move selected keyframe down">▼</button>
|
||||
<button type="button" id="wfm-lab-prompt-group-btn" class="wfm-btn wfm-btn-xs" title="Apply Prompt Group">PG</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="prompt" title="Add keyframe">+</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="prompt" title="Remove last keyframe">-</button>
|
||||
</div>
|
||||
@@ -587,6 +595,8 @@
|
||||
<div class="wfm-lab-col-header">
|
||||
<span>Ksampler</span>
|
||||
<div class="wfm-lab-col-btns">
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-up" data-col="ksampler" title="Move selected keyframe up">▲</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-down" data-col="ksampler" title="Move selected keyframe down">▼</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="ksampler" title="Add keyframe">+</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="ksampler" title="Remove last keyframe">-</button>
|
||||
</div>
|
||||
@@ -1277,6 +1287,7 @@
|
||||
<span style="flex:1;"></span>
|
||||
<button id="wfm-ptable-style-deselect-btn" class="wfm-btn wfm-btn-sm" disabled title="Clear row selection">Deselect</button>
|
||||
<button id="wfm-ptable-style-delete-btn" class="wfm-btn wfm-btn-sm wfm-btn-danger" disabled>Delete</button>
|
||||
<button id="wfm-ptable-style-addfile-btn" class="wfm-btn wfm-btn-sm" disabled title="Select a style whose file is not custom.json to add a new style to that same file">+ Add to this file</button>
|
||||
<button id="wfm-ptable-style-add-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary">+ New Style</button>
|
||||
</div>
|
||||
<div class="wfm-prompt-table-scroll">
|
||||
@@ -1328,6 +1339,7 @@
|
||||
<button class="wfm-help-nav-item" data-help-page="aitool">AI TOOL Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="tagger">Tagger Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="imageedit">Image Edit Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="video">Video Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="shortcuts">Keyboard Shortcuts</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="trouble">Troubleshooting</button>
|
||||
</div>
|
||||
@@ -1512,6 +1524,8 @@
|
||||
<li id="wfm-help-lab-15">Checkpoint / LoRA / VAE each carry forward independently, the same effective-value rule as every other column (see above): a keyframe in one never resets the other two to the workflow default. A field left blank in the edit modal shows "(inherits: ...)" as its placeholder instead of "(workflow default)" when an earlier keyframe in that same list already set something, so it's clear what actually applies. "Revert to #1's setting" and Bypass — like +/- — only ever affect whichever ONE of the three is currently selected by the C/L/V toggle, never the other two</li>
|
||||
<li id="wfm-help-lab-16">Bypass LoRA node checkbox (LoRA keyframe's own edit modal only): forces that keyframe's strength_model/strength_clip to 0 at apply-time, standing in for ComfyUI's own node Bypass (mode:4) — the workflow used here is already converted to API format, which has no mode concept, so zeroing strength is the behavioral equivalent. Disables the strength fields while checked; independent of the row-level Bypass checkbox above, which skips the whole row instead of touching the node</li>
|
||||
<li id="wfm-help-lab-17">Apply LoRA syntax + trigger words to Positive prompt checkbox (LoRA column only): when checked, appends <lora:name:strengthModel:strengthClip> plus that LoRA's cached CivitAI trigger words to the Positive prompt, comma-separated, at apply-time — the same format GenerateUI's own Model tab Apply button writes. Switching keyframes (a different LoRA, this checkbox turned off, or the row Bypassed) always strips exactly what the previous iteration injected before adding anything new, so a batch never accumulates every LoRA it has used. Disabled automatically while Bypass LoRA node is checked</li>
|
||||
<li id="wfm-help-lab-18">A single click on a keyframe cell selects it (blue outline) instead of opening it — double-click to open the edit modal as before. Each column's header (Model / Prompt / Ksampler) also has <b>▲ / ▼</b> buttons that swap the selected keyframe with its immediate neighbor to reorder them without retyping anything; keyframe #1 (the baseline) can never move, and nothing can be swapped into its slot</li>
|
||||
<li id="wfm-help-lab-19">Prompt column header's <b>PG</b> button: pick one of the Prompt tab's preset groups (Table view's Presets Group, the same groups used by the Batch tab's checklist) and replace the entire Prompt column with one keyframe per preset in that group's order, starting at #1 (#1 is overwritten, not appended after). If the group has more presets than the current Batch count, Batch count is raised automatically to fit (capped at 50, the Batch input's own limit); anything still beyond that shows the usual "keyframes beyond Batch count" warning instead of being silently dropped</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -1600,6 +1614,7 @@
|
||||
<li id="wfm-help-prompt-23">Wildcards table — same files as the Form tab's Wildcard file manager; editing the <b>File</b> path or the <b>Ext</b> dropdown renames the file (saves the content under the new name, then removes the old file)</li>
|
||||
<li id="wfm-help-prompt-24">Style table — same styles as the Form tab's Style manager, editable inline the same way as Presets</li>
|
||||
<li id="wfm-help-prompt-25">Presets table toolbar — the ★ and B sort buttons (next to the search box) bring favorited / batch-selected presets to the top of the list; both can be enabled together (★ takes priority, B breaks ties), and everything else keeps its original relative order</li>
|
||||
<li id="wfm-help-prompt-26">Style table toolbar — select exactly one row whose <b>File</b> badge isn't <code>custom.json</code> to enable <b>+ Add to this file</b>: it adds a blank row targeting that same file (shown as a badge in the File column even before saving) — the same capability as the Form tab's Style manager (see above); custom.json entries and multi-row selections leave the button disabled, use the regular <b>+ New Style</b> button for those instead</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -2051,8 +2066,7 @@
|
||||
<ul>
|
||||
<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">Save to Input: 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-19b">Send to Workflow: uploads the composite PNG (same as Save to Input) and additionally writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable</li>
|
||||
<li id="wfm-help-imageedit-19b">Send to Workflow: uploads the composite PNG to ComfyUI's input folder via /upload/image and writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable</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>
|
||||
@@ -2073,6 +2087,20 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wfm-help-page" id="wfm-help-page-video">
|
||||
<h2 id="wfm-help-video-title">Video Tab</h2>
|
||||
<p id="wfm-help-video-desc">A dedicated video generation tab for the MiniMax H3 (Image to Video) workflow, independent of the GenerateUI tab.</p>
|
||||
<div class="wfm-help-card">
|
||||
<ul>
|
||||
<li id="wfm-help-video-1">Set first_frame (optional) / last_frame (optional) images, prompt, aspect_ratio / megapixels / multiple (resolution), duration (seconds), and noise_seed, then click Generate. Leaving first_frame empty runs the workflow text-only (bypassed), and workflows with no LoadImage node at all are also supported.</li>
|
||||
<li id="wfm-help-video-2">Model selection (UNet / CLIP / VAE / Audio VAE) is fixed to the loaded workflow's defaults and cannot be changed from this tab.</li>
|
||||
<li id="wfm-help-video-3">Use the "Load in Video" button in the Workflow tab's detail modal to load a workflow containing a MiniMax H3 Image-to-Video node. Unsupported workflows show an error instead.</li>
|
||||
<li id="wfm-help-video-4">Generated videos (mp4) can also be browsed and played back in the Gallery tab.</li>
|
||||
</ul>
|
||||
</div>
|
||||
<button class="wfm-help-jump-btn wfm-btn wfm-btn-sm" data-jump-tab="video">Go to Video Tab</button>
|
||||
</div>
|
||||
|
||||
<div class="wfm-help-page" id="wfm-help-page-shortcuts">
|
||||
<div class="wfm-help-article-header">
|
||||
<h2 id="wfm-help-shortcuts-title">Keyboard Shortcuts</h2>
|
||||
@@ -2276,8 +2304,9 @@
|
||||
</div>
|
||||
<div class="wfm-gallery-detail-action-row">
|
||||
<button id="wfm-gallery-open-metadata-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-green" title="Open in Metadata tab (or Alt+click image)">Metadata</button>
|
||||
<button id="wfm-gallery-load-genui-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-primary" title="Load workflow into GenerateUI">Load GenUI</button>
|
||||
<button id="wfm-gallery-load-genui-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-primary" title="Load workflow into GenerateUI">GenUI</button>
|
||||
<button id="wfm-gallery-open-tagger-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-tagger" title="Open in Tagger"></button>
|
||||
<button id="wfm-gallery-download-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-orange" title="Download">Download</button>
|
||||
</div>
|
||||
<!-- Info タブ -->
|
||||
<div id="wfm-gallery-detail-info" class="wfm-gallery-detail-tab-content" style="display:none;">
|
||||
@@ -2592,7 +2621,6 @@
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-redo-btn" title="Redo (Ctrl+Y)">↪</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-save-btn">Save PNG</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-save-gallery-btn" title="Save to Gallery root folder">Save to Gallery</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-upload-comfy-btn">Save to Input</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-send-workflow-btn" title="Upload and write this image's filename into the selected node's image widget (e.g. LoadImage)">Send to Workflow</button>
|
||||
</div>
|
||||
|
||||
@@ -2650,6 +2678,110 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Video Tab (MiniMax H3専用・GenerateUIタブとは独立) -->
|
||||
<section id="wfm-tab-video" class="wfm-tab-content">
|
||||
<div class="wfm-video-layout">
|
||||
<div class="wfm-video-form-panel">
|
||||
<div class="wfm-video-header">
|
||||
<h3 id="wfm-video-title-label">Video (MiniMax H3)</h3>
|
||||
<span id="wfm-video-wf-name" class="wfm-video-wf-name">No workflow loaded</span>
|
||||
</div>
|
||||
|
||||
<div class="wfm-video-frame-slots">
|
||||
<div class="wfm-video-frame-slot">
|
||||
<label id="wfm-video-first-frame-label">First Frame (optional)</label>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-video-first-frame-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-video-first-frame-preview">
|
||||
</div>
|
||||
<div class="wfm-i2i-drop-zone" id="wfm-video-first-frame-drop">
|
||||
<label class="wfm-i2i-drop-label">
|
||||
<span id="wfm-video-first-frame-drop-label">Drop image or click to select</span>
|
||||
<input type="file" accept="image/*" id="wfm-video-first-frame-file" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;align-items:center;">
|
||||
<span class="wfm-i2i-status" id="wfm-video-first-frame-status" style="flex:1;"></span>
|
||||
<button type="button" class="wfm-btn wfm-btn-sm" id="wfm-video-first-frame-clear">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wfm-video-frame-slot">
|
||||
<label id="wfm-video-last-frame-label">Last Frame (optional)</label>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-video-last-frame-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-video-last-frame-preview">
|
||||
</div>
|
||||
<div class="wfm-i2i-drop-zone" id="wfm-video-last-frame-drop">
|
||||
<label class="wfm-i2i-drop-label">
|
||||
<span id="wfm-video-last-frame-drop-label">Drop image or click to select</span>
|
||||
<input type="file" accept="image/*" id="wfm-video-last-frame-file" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;align-items:center;">
|
||||
<span class="wfm-i2i-status" id="wfm-video-last-frame-status" style="flex:1;"></span>
|
||||
<button type="button" class="wfm-btn wfm-btn-sm" id="wfm-video-last-frame-clear">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label for="wfm-video-prompt" id="wfm-video-prompt-label">Prompt</label>
|
||||
<textarea id="wfm-video-prompt" class="wfm-textarea" rows="6"></textarea>
|
||||
|
||||
<div class="wfm-video-resolution-row">
|
||||
<div>
|
||||
<label for="wfm-video-aspect-ratio" id="wfm-video-aspect-ratio-label">Aspect Ratio</label>
|
||||
<select id="wfm-video-aspect-ratio" class="wfm-input"></select>
|
||||
</div>
|
||||
<div>
|
||||
<label for="wfm-video-megapixels" id="wfm-video-megapixels-label">Megapixels</label>
|
||||
<input type="number" id="wfm-video-megapixels" class="wfm-input" step="0.01" min="0.01" value="0.2">
|
||||
</div>
|
||||
<div>
|
||||
<label for="wfm-video-multiple" id="wfm-video-multiple-label">Multiple</label>
|
||||
<input type="number" id="wfm-video-multiple" class="wfm-input" step="8" min="8" value="32">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wfm-video-resolution-row">
|
||||
<div>
|
||||
<label for="wfm-video-duration" id="wfm-video-duration-label">Duration (seconds)</label>
|
||||
<input type="number" id="wfm-video-duration" class="wfm-input" step="0.5" min="0.5" value="2">
|
||||
</div>
|
||||
<div>
|
||||
<label for="wfm-video-noise-seed" id="wfm-video-noise-seed-label">Noise Seed</label>
|
||||
<input type="number" id="wfm-video-noise-seed" class="wfm-input" value="0">
|
||||
</div>
|
||||
<div class="wfm-video-seed-randomize-wrap">
|
||||
<label><input type="checkbox" id="wfm-video-seed-randomize" checked> <span id="wfm-video-randomize-label">Randomize</span></label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;align-items:center;gap:10px;margin-top:10px;">
|
||||
<button id="wfm-video-generate-btn" class="wfm-btn wfm-btn-primary" style="flex:1;">Generate</button>
|
||||
</div>
|
||||
<div class="wfm-gen-progress-container">
|
||||
<div class="wfm-gen-progress-track">
|
||||
<div id="wfm-video-progress-bar" class="wfm-gen-progress-bar"></div>
|
||||
</div>
|
||||
<span id="wfm-video-progress-text" class="wfm-gen-progress-text">Ready</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 中央ペイン: プレビュー + 編集(将来機能用プレースホルダー) -->
|
||||
<div class="wfm-video-center-panel">
|
||||
<div class="wfm-video-result-panel">
|
||||
<h4 id="wfm-video-result-label">Result</h4>
|
||||
<div id="wfm-video-result"><p class="wfm-placeholder" id="wfm-video-no-result-label">No result yet</p></div>
|
||||
</div>
|
||||
<div class="wfm-video-edit-panel">
|
||||
<span id="wfm-video-edit-placeholder-label" class="wfm-placeholder">Editing tools coming soon</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 右ペイン: プロパティ(将来機能用プレースホルダー) -->
|
||||
<div class="wfm-video-properties-panel">
|
||||
<h4 id="wfm-video-properties-label">Properties</h4>
|
||||
<span id="wfm-video-properties-placeholder-label" class="wfm-placeholder">Coming soon</span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Tagger Tab -->
|
||||
<section id="wfm-tab-tagger" class="wfm-tab-content">
|
||||
<div class="wfm-tagger-subtab-nav">
|
||||
|
||||
Reference in New Issue
Block a user