fix: improve psd template text rendering
This commit is contained in:
parent
bc8c3084fe
commit
71997086e1
@ -70,6 +70,7 @@ import {
|
|||||||
isAgentPsdImageLayerSlot,
|
isAgentPsdImageLayerSlot,
|
||||||
isAgentPsdTextLayerSlot,
|
isAgentPsdTextLayerSlot,
|
||||||
parseAgentPsdTemplates,
|
parseAgentPsdTemplates,
|
||||||
|
resolveAgentPsdTextLayerEffectiveAlign,
|
||||||
} from "@/lib/agents/psd-template-config";
|
} from "@/lib/agents/psd-template-config";
|
||||||
import {
|
import {
|
||||||
defaultAgentPsdTemplateSecondaryCategoryConfig,
|
defaultAgentPsdTemplateSecondaryCategoryConfig,
|
||||||
@ -992,9 +993,11 @@ function getLayerFrameStyle(
|
|||||||
|
|
||||||
function getResolvedTextPreview(
|
function getResolvedTextPreview(
|
||||||
layer: AgentPsdTemplateTextLayerSlot,
|
layer: AgentPsdTemplateTextLayerSlot,
|
||||||
value: string
|
value?: string
|
||||||
) {
|
) {
|
||||||
return value || layer.placeholder || layer.layerName;
|
return typeof value === "string"
|
||||||
|
? value
|
||||||
|
: layer.placeholder || layer.layerName;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getResolvedTextLayerColor(
|
function getResolvedTextLayerColor(
|
||||||
@ -1023,10 +1026,11 @@ function getTextLayerRenderFrame(
|
|||||||
});
|
});
|
||||||
const width = Math.max(layer.width, resolvedLayout.contentWidth);
|
const width = Math.max(layer.width, resolvedLayout.contentWidth);
|
||||||
const height = Math.max(layer.height, resolvedLayout.contentHeight);
|
const height = Math.max(layer.height, resolvedLayout.contentHeight);
|
||||||
|
const textAlign = resolveAgentPsdTextLayerEffectiveAlign(layer);
|
||||||
const offsetX =
|
const offsetX =
|
||||||
layer.textAlign === "right"
|
textAlign === "right"
|
||||||
? layer.width - width
|
? layer.width - width
|
||||||
: layer.textAlign === "center"
|
: textAlign === "center"
|
||||||
? (layer.width - width) / 2
|
? (layer.width - width) / 2
|
||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
@ -1046,16 +1050,17 @@ function renderTextLayerPreviewContent(
|
|||||||
) {
|
) {
|
||||||
const resolvedText = getResolvedTextPreview(layer, value);
|
const resolvedText = getResolvedTextPreview(layer, value);
|
||||||
const resolvedLayout = getTextLayerRenderFrame(layer, resolvedText);
|
const resolvedLayout = getTextLayerRenderFrame(layer, resolvedText);
|
||||||
|
const textAlign = resolveAgentPsdTextLayerEffectiveAlign(layer);
|
||||||
const textAnchor =
|
const textAnchor =
|
||||||
layer.textAlign === "center"
|
textAlign === "center"
|
||||||
? "middle"
|
? "middle"
|
||||||
: layer.textAlign === "right"
|
: textAlign === "right"
|
||||||
? "end"
|
? "end"
|
||||||
: "start";
|
: "start";
|
||||||
const textX =
|
const textX =
|
||||||
layer.textAlign === "center"
|
textAlign === "center"
|
||||||
? resolvedLayout.width / 2
|
? resolvedLayout.width / 2
|
||||||
: layer.textAlign === "right"
|
: textAlign === "right"
|
||||||
? resolvedLayout.width - layer.paddingX
|
? resolvedLayout.width - layer.paddingX
|
||||||
: layer.paddingX;
|
: layer.paddingX;
|
||||||
|
|
||||||
@ -3043,7 +3048,7 @@ export function AgentPsdTemplateEditorDialog({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const value =
|
const value =
|
||||||
effectiveTextAssignments[layer.id] || "";
|
effectiveTextAssignments[layer.id] ?? "";
|
||||||
const resolvedTextColor =
|
const resolvedTextColor =
|
||||||
effectiveTextColorAssignments[layer.id] ||
|
effectiveTextColorAssignments[layer.id] ||
|
||||||
layer.textColor;
|
layer.textColor;
|
||||||
@ -3076,7 +3081,7 @@ export function AgentPsdTemplateEditorDialog({
|
|||||||
|
|
||||||
const textFrame = getTextLayerRenderFrame(
|
const textFrame = getTextLayerRenderFrame(
|
||||||
layer,
|
layer,
|
||||||
value || layer.placeholder || layer.layerName
|
value
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -3092,7 +3097,7 @@ export function AgentPsdTemplateEditorDialog({
|
|||||||
>
|
>
|
||||||
{renderTextLayerPreviewContent(
|
{renderTextLayerPreviewContent(
|
||||||
layer,
|
layer,
|
||||||
value || layer.placeholder || layer.layerName,
|
value,
|
||||||
resolvedTextColor
|
resolvedTextColor
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@ -3243,7 +3248,7 @@ export function AgentPsdTemplateEditorDialog({
|
|||||||
isSelected
|
isSelected
|
||||||
);
|
);
|
||||||
const currentValue =
|
const currentValue =
|
||||||
effectiveTextAssignments[layer.id] || "";
|
effectiveTextAssignments[layer.id] ?? "";
|
||||||
const resolvedTextColor =
|
const resolvedTextColor =
|
||||||
effectiveTextColorAssignments[layer.id] ||
|
effectiveTextColorAssignments[layer.id] ||
|
||||||
layer.textColor;
|
layer.textColor;
|
||||||
@ -3496,7 +3501,7 @@ export function AgentPsdTemplateEditorDialog({
|
|||||||
}
|
}
|
||||||
rows={4}
|
rows={4}
|
||||||
value={
|
value={
|
||||||
effectiveTextAssignments[selectedTextLayer.id] || ""
|
effectiveTextAssignments[selectedTextLayer.id] ?? ""
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<div className="flex flex-wrap gap-x-4 gap-y-2 rounded-xl bg-white/[0.02] px-4 py-3 text-white/60 text-xs shadow-inner">
|
<div className="flex flex-wrap gap-x-4 gap-y-2 rounded-xl bg-white/[0.02] px-4 py-3 text-white/60 text-xs shadow-inner">
|
||||||
|
|||||||
@ -171,8 +171,7 @@ export function AgentWorkflowMaterialPicker({
|
|||||||
recommendedImageIds.every((id) => selectedSet.has(id));
|
recommendedImageIds.every((id) => selectedSet.has(id));
|
||||||
const isAutoSelectedResult =
|
const isAutoSelectedResult =
|
||||||
Boolean(hasSystemRecommendedSelection) && !hasManualSelectionInteraction;
|
Boolean(hasSystemRecommendedSelection) && !hasManualSelectionInteraction;
|
||||||
const canTogglePreviewMode =
|
const canTogglePreviewMode = totalImageCount > 0;
|
||||||
totalImageCount > 0 && selectedGalleryCount > 0 && selectedGalleryCount < totalImageCount;
|
|
||||||
const visibleImages = useMemo(() => {
|
const visibleImages = useMemo(() => {
|
||||||
if (!galleryImages.length) {
|
if (!galleryImages.length) {
|
||||||
return [];
|
return [];
|
||||||
@ -201,8 +200,8 @@ export function AgentWorkflowMaterialPicker({
|
|||||||
if (hasManualSelectionInteraction) {
|
if (hasManualSelectionInteraction) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setPreviewDisplayMode(hasSystemRecommendedSelection ? "selected" : "all");
|
setPreviewDisplayMode("all");
|
||||||
}, [hasManualSelectionInteraction, hasSystemRecommendedSelection, previewResetKey]);
|
}, [hasManualSelectionInteraction, previewResetKey]);
|
||||||
|
|
||||||
const hasFetchSuccess = !disabled && !isLoading && !errorText && Boolean(result);
|
const hasFetchSuccess = !disabled && !isLoading && !errorText && Boolean(result);
|
||||||
|
|
||||||
|
|||||||
@ -95,9 +95,12 @@ export async function executeAgentPsdTemplateRenderRequest(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isAgentPsdTextLayerSlot(layer)) {
|
if (isAgentPsdTextLayerSlot(layer)) {
|
||||||
const nextText = String(body.textAssignments[layer.id] || layer.defaultText || "").trim();
|
if (
|
||||||
if (nextText) {
|
Object.prototype.hasOwnProperty.call(body.textAssignments, layer.id)
|
||||||
textAssignments[layer.id] = nextText;
|
) {
|
||||||
|
textAssignments[layer.id] = String(
|
||||||
|
body.textAssignments[layer.id] ?? ""
|
||||||
|
).trim();
|
||||||
}
|
}
|
||||||
textColorAssignments[layer.id] = normalizeHexColor(
|
textColorAssignments[layer.id] = normalizeHexColor(
|
||||||
body.textColorAssignments[layer.id] || layer.textColor,
|
body.textColorAssignments[layer.id] || layer.textColor,
|
||||||
@ -112,7 +115,8 @@ export async function executeAgentPsdTemplateRenderRequest(
|
|||||||
layer.isRequired &&
|
layer.isRequired &&
|
||||||
(isAgentPsdImageLayerSlot(layer)
|
(isAgentPsdImageLayerSlot(layer)
|
||||||
? !imageAssignments[layer.id]
|
? !imageAssignments[layer.id]
|
||||||
: !textAssignments[layer.id])
|
: !Object.prototype.hasOwnProperty.call(textAssignments, layer.id) &&
|
||||||
|
!String(layer.defaultText || "").trim())
|
||||||
);
|
);
|
||||||
if (missingRequiredLayer) {
|
if (missingRequiredLayer) {
|
||||||
throw new Error(`缺少必传素材:${missingRequiredLayer.layerName}`);
|
throw new Error(`缺少必传素材:${missingRequiredLayer.layerName}`);
|
||||||
|
|||||||
@ -289,6 +289,27 @@ export function normalizeAgentPsdTextAlign(value: unknown): AgentPsdTextAlign {
|
|||||||
return "left";
|
return "left";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function resolveAgentPsdTextLayerEffectiveAlign(
|
||||||
|
layer: Pick<
|
||||||
|
AgentPsdTemplateTextLayerSlot,
|
||||||
|
"paddingX" | "styleSource" | "textAlign" | "width"
|
||||||
|
>
|
||||||
|
): AgentPsdTextAlign {
|
||||||
|
const textAlign = normalizeAgentPsdTextAlign(layer.textAlign);
|
||||||
|
const paddingX = normalizePositiveInteger(layer.paddingX);
|
||||||
|
const width = normalizePositiveInteger(layer.width);
|
||||||
|
|
||||||
|
if (
|
||||||
|
layer.styleSource !== "custom" &&
|
||||||
|
textAlign === "center" &&
|
||||||
|
paddingX <= Math.max(2, Math.round(width * 0.02))
|
||||||
|
) {
|
||||||
|
return "left";
|
||||||
|
}
|
||||||
|
|
||||||
|
return textAlign;
|
||||||
|
}
|
||||||
|
|
||||||
export function normalizeAgentPsdTextStyleSource(value: unknown): AgentPsdTextStyleSource {
|
export function normalizeAgentPsdTextStyleSource(value: unknown): AgentPsdTextStyleSource {
|
||||||
return normalizeText(value) === "custom" ? "custom" : "auto";
|
return normalizeText(value) === "custom" ? "custom" : "auto";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import {
|
|||||||
hasAgentPsdTemplateStoredLayerSource,
|
hasAgentPsdTemplateStoredLayerSource,
|
||||||
isAgentPsdImageLayerSlot,
|
isAgentPsdImageLayerSlot,
|
||||||
isAgentPsdTextLayerSlot,
|
isAgentPsdTextLayerSlot,
|
||||||
|
resolveAgentPsdTextLayerEffectiveAlign,
|
||||||
type AgentPsdTemplate,
|
type AgentPsdTemplate,
|
||||||
} from "@/lib/agents/psd-template-config";
|
} from "@/lib/agents/psd-template-config";
|
||||||
import type { AgentPsdFont } from "@/lib/agents/psd-font-config";
|
import type { AgentPsdFont } from "@/lib/agents/psd-font-config";
|
||||||
@ -527,17 +528,30 @@ export async function renderAgentPsdTemplate(params: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isAgentPsdTextLayerSlot(layer)) {
|
if (isAgentPsdTextLayerSlot(layer)) {
|
||||||
const text = String(textAssignments[layer.id] || layer.defaultText || "").trim();
|
const hasTextAssignment = Object.prototype.hasOwnProperty.call(
|
||||||
|
textAssignments,
|
||||||
|
layer.id
|
||||||
|
);
|
||||||
const defaultText = String(layer.defaultText || "").trim();
|
const defaultText = String(layer.defaultText || "").trim();
|
||||||
|
const text = String(
|
||||||
|
hasTextAssignment ? textAssignments[layer.id] ?? "" : defaultText
|
||||||
|
).trim();
|
||||||
const textColor = normalizeHexColor(
|
const textColor = normalizeHexColor(
|
||||||
textColorAssignments[layer.id] || layer.textColor,
|
textColorAssignments[layer.id] || layer.textColor,
|
||||||
layer.textColor
|
layer.textColor
|
||||||
);
|
);
|
||||||
const hasColorChange = normalizeHexColor(textColor, layer.textColor) !== normalizeHexColor(layer.textColor);
|
const hasColorChange = normalizeHexColor(textColor, layer.textColor) !== normalizeHexColor(layer.textColor);
|
||||||
if (!text || (text === defaultText && !hasColorChange)) {
|
if (!text) {
|
||||||
|
if (!hasTextAssignment) {
|
||||||
|
await appendStoredLayer(layer);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (text === defaultText && !hasColorChange) {
|
||||||
await appendStoredLayer(layer);
|
await appendStoredLayer(layer);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
const textAlign = resolveAgentPsdTextLayerEffectiveAlign(layer);
|
||||||
|
|
||||||
const font = layer.fontId ? fontMap.get(layer.fontId) : undefined;
|
const font = layer.fontId ? fontMap.get(layer.fontId) : undefined;
|
||||||
const fontBuffer = font?.fileUrl
|
const fontBuffer = font?.fileUrl
|
||||||
@ -587,7 +601,7 @@ export async function renderAgentPsdTemplate(params: {
|
|||||||
lineHeight: layer.lineHeight,
|
lineHeight: layer.lineHeight,
|
||||||
letterSpacing: layer.letterSpacing,
|
letterSpacing: layer.letterSpacing,
|
||||||
textColor,
|
textColor,
|
||||||
textAlign: layer.textAlign,
|
textAlign,
|
||||||
paddingX: layer.paddingX,
|
paddingX: layer.paddingX,
|
||||||
paddingY: layer.paddingY,
|
paddingY: layer.paddingY,
|
||||||
maxLines: layer.maxLines,
|
maxLines: layer.maxLines,
|
||||||
@ -612,7 +626,7 @@ export async function renderAgentPsdTemplate(params: {
|
|||||||
layerHeight: layer.height,
|
layerHeight: layer.height,
|
||||||
contentWidth: overlayLayout.contentWidth,
|
contentWidth: overlayLayout.contentWidth,
|
||||||
contentHeight: overlayLayout.contentHeight,
|
contentHeight: overlayLayout.contentHeight,
|
||||||
textAlign: layer.textAlign,
|
textAlign,
|
||||||
topOffset: -overlayLayout.visualOffsetY,
|
topOffset: -overlayLayout.visualOffsetY,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -272,9 +272,12 @@ export function analyzeTextLayerPixels(params: {
|
|||||||
const rightGap = Math.max(0, width - maxX - 1);
|
const rightGap = Math.max(0, width - maxX - 1);
|
||||||
const centerTolerance = Math.max(4, width * 0.06);
|
const centerTolerance = Math.max(4, width * 0.06);
|
||||||
const edgeTolerance = Math.max(6, width * 0.08);
|
const edgeTolerance = Math.max(6, width * 0.08);
|
||||||
|
const hasReliableCenterPadding =
|
||||||
|
leftGap >= edgeTolerance && rightGap >= edgeTolerance;
|
||||||
const contentCenterX = (minX + maxX) / 2;
|
const contentCenterX = (minX + maxX) / 2;
|
||||||
const stageCenterX = (width - 1) / 2;
|
const stageCenterX = (width - 1) / 2;
|
||||||
const inferredTextAlign: AgentPsdTextAlign =
|
const inferredTextAlign: AgentPsdTextAlign =
|
||||||
|
hasReliableCenterPadding &&
|
||||||
Math.abs(contentCenterX - stageCenterX) <= centerTolerance &&
|
Math.abs(contentCenterX - stageCenterX) <= centerTolerance &&
|
||||||
Math.abs(leftGap - rightGap) <= edgeTolerance
|
Math.abs(leftGap - rightGap) <= edgeTolerance
|
||||||
? "center"
|
? "center"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user