- use-canvas-media-tools.ts: createPortraitTextureNode 改为 generatePortraitTextureNode, 节点创建后立即触发后端生成任务(与情绪/多视角/局部编辑保持一致): 使用 nodeReferenceImage 获取源图引用,buildPortraitTexturePrompt 构建提示词, runBackendCanvasGenerationTask 执行生成,完成后更新缩略图 - project.tsx: 同步重命名 createPortraitTextureNode → generatePortraitTextureNode - canvas-drawing-excalidraw-editor.tsx: getDimensions 参数补充 number 类型注解 - canvas-drawing-editor-modal.tsx: Pick 类型补充 engine 字段 Co-authored-by: sikongyue <3155157671@qq.com>
This commit is contained in:
1 parent
d387b25e2e
commit
9b3ec218e2
4 files changed
+42
-33
No files matched your search
@@ -16,7 +16,7 @@ type CanvasDrawingEditorModalProps = {
|
|||||||
projectId: string;
|
projectId: string;
|
||||||
node: CanvasNodeData | null;
|
node: CanvasNodeData | null;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
onSaved: (nodeId: string, summary: Pick<CanvasDrawingSnapshot, "revision" | "updatedAt" | "shapeCount" | "pageCount">) => void;
|
onSaved: (nodeId: string, summary: Pick<CanvasDrawingSnapshot, "engine" | "revision" | "updatedAt" | "shapeCount" | "pageCount">) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function CanvasDrawingEditorModal({ open, projectId, node, onClose, onSaved }: CanvasDrawingEditorModalProps) {
|
export function CanvasDrawingEditorModal({ open, projectId, node, onClose, onSaved }: CanvasDrawingEditorModalProps) {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export const CanvasDrawingExcalidrawEditor = forwardRef<CanvasDrawingEditorHandl
|
|||||||
files,
|
files,
|
||||||
mimeType: "image/png",
|
mimeType: "image/png",
|
||||||
exportPadding: DRAWING_RENDER_PADDING,
|
exportPadding: DRAWING_RENDER_PADDING,
|
||||||
getDimensions: (width, height) => {
|
getDimensions: (width: number, height: number) => {
|
||||||
const scale = Math.min(4, DRAWING_RENDER_MAX_DIMENSION / Math.max(1, width, height));
|
const scale = Math.min(4, DRAWING_RENDER_MAX_DIMENSION / Math.max(1, width, height));
|
||||||
outputWidth = Math.max(1, Math.round(width * scale));
|
outputWidth = Math.max(1, Math.round(width * scale));
|
||||||
outputHeight = Math.max(1, Math.round(height * scale));
|
outputHeight = Math.max(1, Math.round(height * scale));
|
||||||
|
|||||||
@@ -509,7 +509,7 @@ function InfiniteCanvasPage() {
|
|||||||
emotionNodeId,
|
emotionNodeId,
|
||||||
annotationNodeId,
|
annotationNodeId,
|
||||||
createImageReversePromptNodes,
|
createImageReversePromptNodes,
|
||||||
createPortraitTextureNode,
|
generatePortraitTextureNode,
|
||||||
cropImageNode,
|
cropImageNode,
|
||||||
cropNodeId,
|
cropNodeId,
|
||||||
extractVideoLastFrame,
|
extractVideoLastFrame,
|
||||||
@@ -1557,7 +1557,7 @@ function InfiniteCanvasPage() {
|
|||||||
onAnnotate={(node) => setAnnotationNodeId(node.id)}
|
onAnnotate={(node) => setAnnotationNodeId(node.id)}
|
||||||
onMaskEdit={(node) => setMaskEditNodeId(node.id)}
|
onMaskEdit={(node) => setMaskEditNodeId(node.id)}
|
||||||
onEmotion={(node) => { setDialogNodeId(null); setEmotionNodeId((current) => current === node.id ? null : node.id); }}
|
onEmotion={(node) => { setDialogNodeId(null); setEmotionNodeId((current) => current === node.id ? null : node.id); }}
|
||||||
onPortraitTexture={createPortraitTextureNode}
|
onPortraitTexture={generatePortraitTextureNode}
|
||||||
onCrop={(node) => setCropNodeId(node.id)}
|
onCrop={(node) => setCropNodeId(node.id)}
|
||||||
onSplit={(node) => setSplitNodeId(node.id)}
|
onSplit={(node) => setSplitNodeId(node.id)}
|
||||||
onUpscale={(node) => setUpscaleNodeId(node.id)}
|
onUpscale={(node) => setUpscaleNodeId(node.id)}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import {
|
|||||||
} from "@/lib/canvas/canvas-project-generation";
|
} from "@/lib/canvas/canvas-project-generation";
|
||||||
import { fitNodeSize, VIDEO_NODE_MAX_SIZE } from "@/lib/canvas/canvas-node-size";
|
import { fitNodeSize, VIDEO_NODE_MAX_SIZE } from "@/lib/canvas/canvas-node-size";
|
||||||
import { compositeEmotionImage, emotionGenerationSize } from "@/lib/canvas/canvas-emotion";
|
import { compositeEmotionImage, emotionGenerationSize } from "@/lib/canvas/canvas-emotion";
|
||||||
import { DEFAULT_PORTRAIT_TEXTURE_SETTINGS } from "@/lib/canvas/canvas-portrait-texture";
|
import { DEFAULT_PORTRAIT_TEXTURE_SETTINGS, buildPortraitTexturePrompt } from "@/lib/canvas/canvas-portrait-texture";
|
||||||
import { captureVideoLastFrame } from "@/lib/canvas/canvas-video-frame";
|
import { captureVideoLastFrame } from "@/lib/canvas/canvas-video-frame";
|
||||||
import { mergeVideos, type MergeVideoProgress } from "@/lib/canvas/canvas-video-merge";
|
import { mergeVideos, type MergeVideoProgress } from "@/lib/canvas/canvas-video-merge";
|
||||||
import { generationErrorMessage } from "@/lib/generation-error";
|
import { generationErrorMessage } from "@/lib/generation-error";
|
||||||
@@ -129,41 +129,50 @@ export function useCanvasMediaTools({
|
|||||||
setContextMenu(null);
|
setContextMenu(null);
|
||||||
}, [effectiveConfig.model, effectiveConfig.textModel, message, setConnections, setContextMenu, setDialogNodeId, setNodes, setSelectedConnectionId, setSelectedNodeIds]);
|
}, [effectiveConfig.model, effectiveConfig.textModel, message, setConnections, setContextMenu, setDialogNodeId, setNodes, setSelectedConnectionId, setSelectedNodeIds]);
|
||||||
|
|
||||||
const createPortraitTextureNode = useCallback((node: CanvasNodeData) => {
|
const generatePortraitTextureNode = useCallback(async (node: CanvasNodeData) => {
|
||||||
if (node.type !== CanvasNodeType.Image || !node.metadata?.content) {
|
if (node.type !== CanvasNodeType.Image || !node.metadata?.content) {
|
||||||
message.warning("图片节点为空,无法调节人物质感");
|
message.warning("图片节点为空,无法调节人物质感");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const generationConfig = { ...buildGenerationConfig(effectiveConfig, node, "image"), count: "1" };
|
||||||
|
if (!isAiConfigReady(generationConfig, generationConfig.model)) {
|
||||||
|
navigateToSettings({ continueCreation: true });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const childId = nanoid();
|
||||||
const imageSpec = NODE_DEFAULT_SIZE[CanvasNodeType.Image];
|
const imageSpec = NODE_DEFAULT_SIZE[CanvasNodeType.Image];
|
||||||
const composerContent = `@[node:${node.id}]`;
|
const composerContent = `@[node:${node.id}]`;
|
||||||
const child = createCanvasNode(
|
const source = nodeReferenceImage(node);
|
||||||
CanvasNodeType.Image,
|
if (!source) return;
|
||||||
{
|
const prompt = buildPortraitTexturePrompt(composerContent, { ...DEFAULT_PORTRAIT_TEXTURE_SETTINGS, ...node.metadata?.portraitTexture });
|
||||||
x: node.position.x + node.width + 96 + imageSpec.width / 2,
|
const generationMetadata = buildImageGenerationMetadata("edit", generationConfig, 1, [source]);
|
||||||
y: node.position.y + node.height / 2,
|
const portraitTextureSettings = { ...DEFAULT_PORTRAIT_TEXTURE_SETTINGS, ...node.metadata?.portraitTexture };
|
||||||
},
|
|
||||||
{
|
|
||||||
generationMode: "image",
|
|
||||||
model: effectiveConfig.imageModel || effectiveConfig.model,
|
|
||||||
size: node.metadata.size || effectiveConfig.size,
|
|
||||||
quality: node.metadata.quality || effectiveConfig.quality,
|
|
||||||
transparentBackground: node.metadata.transparentBackground || effectiveConfig.transparentBackground,
|
|
||||||
count: 1,
|
|
||||||
prompt: composerContent,
|
|
||||||
composerContent,
|
|
||||||
portraitTexture: { ...DEFAULT_PORTRAIT_TEXTURE_SETTINGS },
|
|
||||||
},
|
|
||||||
);
|
|
||||||
child.title = "人物质感调节";
|
|
||||||
setNodes((current) => [...current, child]);
|
|
||||||
setConnections((current) => [...current, { id: nanoid(), fromNodeId: node.id, toNodeId: child.id }]);
|
|
||||||
setSelectedNodeIds(new Set([child.id]));
|
|
||||||
setSelectedConnectionId(null);
|
|
||||||
setDialogNodeId(child.id);
|
|
||||||
setContextMenu(null);
|
|
||||||
setHoveredNodeId(null);
|
setHoveredNodeId(null);
|
||||||
setToolbarNodeId(null);
|
setToolbarNodeId(null);
|
||||||
}, [effectiveConfig.imageModel, effectiveConfig.model, effectiveConfig.quality, effectiveConfig.size, effectiveConfig.transparentBackground, message, setConnections, setContextMenu, setDialogNodeId, setHoveredNodeId, setNodes, setSelectedConnectionId, setSelectedNodeIds, setToolbarNodeId]);
|
setRunningNodeId(childId);
|
||||||
|
setNodes((current) => [...current, { id: childId, type: CanvasNodeType.Image, title: "人物质感调节", position: { x: node.position.x + node.width + 96 + imageSpec.width / 2, y: node.position.y + node.height / 2 }, width: imageSpec.width, height: imageSpec.height, metadata: { prompt, status: NODE_STATUS_LOADING, composerContent, portraitTexture: portraitTextureSettings, ...generationMetadata } }]);
|
||||||
|
setConnections((current) => [...current, { id: nanoid(), fromNodeId: node.id, toNodeId: childId }]);
|
||||||
|
setSelectedNodeIds(new Set([childId]));
|
||||||
|
setSelectedConnectionId(null);
|
||||||
|
setDialogNodeId(childId);
|
||||||
|
const controller = startGenerationRequest(childId, node.id, childId);
|
||||||
|
try {
|
||||||
|
const result = await runBackendCanvasGenerationTask({ projectId, nodeId: childId, mode: "image", prompt, config: generationConfig, referenceImages: [source], signal: controller.signal, metadata: { sourceNodeId: node.id, edit: "portraitTexture", portraitTexture: portraitTextureSettings }, onTaskCreated: (task) => bindGenerationTask(childId, task) });
|
||||||
|
const image = result.images?.[0];
|
||||||
|
if (!image?.dataUrl) throw new Error("后端任务没有返回图片");
|
||||||
|
const uploaded = await uploadImage(image.dataUrl);
|
||||||
|
const size = fitNodeSize(uploaded.width, uploaded.height, imageSpec.width, imageSpec.height);
|
||||||
|
setNodes((current) => current.map((item) => item.id === childId ? { ...item, width: size.width, height: size.height, metadata: { ...item.metadata, ...imageMetadata(uploaded), prompt, ...generationMetadata, portraitTexture: portraitTextureSettings } } : item));
|
||||||
|
} catch (error) {
|
||||||
|
if (isGenerationCanceled(error)) return;
|
||||||
|
const details = generationErrorMessage(error);
|
||||||
|
message.error(details);
|
||||||
|
setNodes((current) => current.map((item) => item.id === childId ? { ...item, metadata: { ...item.metadata, status: NODE_STATUS_ERROR, errorDetails: details } } : item));
|
||||||
|
} finally {
|
||||||
|
finishGenerationRequest(childId, controller);
|
||||||
|
setRunningNodeId(null);
|
||||||
|
}
|
||||||
|
}, [bindGenerationTask, effectiveConfig, finishGenerationRequest, isAiConfigReady, message, projectId, setConnections, setDialogNodeId, setNodes, setRunningNodeId, setSelectedConnectionId, setSelectedNodeIds, startGenerationRequest]);
|
||||||
|
|
||||||
const cropImageNode = useCallback(async (node: CanvasNodeData, crop: CanvasImageCropRect) => {
|
const cropImageNode = useCallback(async (node: CanvasNodeData, crop: CanvasImageCropRect) => {
|
||||||
if (!node.metadata?.content) return;
|
if (!node.metadata?.content) return;
|
||||||
@@ -467,7 +476,7 @@ export function useCanvasMediaTools({
|
|||||||
emotionNodeId,
|
emotionNodeId,
|
||||||
annotationNodeId,
|
annotationNodeId,
|
||||||
createImageReversePromptNodes,
|
createImageReversePromptNodes,
|
||||||
createPortraitTextureNode,
|
generatePortraitTextureNode,
|
||||||
cropImageNode,
|
cropImageNode,
|
||||||
cropNodeId,
|
cropNodeId,
|
||||||
extractVideoLastFrame,
|
extractVideoLastFrame,
|
||||||
|
|||||||
Reference in new issue
Block a user