+ const selectedLayerPositionPanel = selectedLayer ? (
+
- ) {
- const assignmentUrl = String(
- effectiveImageAssignments[layer.id] || ""
- ).trim();
- if (!assignmentUrl) {
- return;
- }
-
- event.preventDefault();
- event.stopPropagation();
- setSelectedLayerId(layer.id);
-
- imagePlacementDragStateRef.current = {
- layerId: layer.id,
- pointerId: event.pointerId,
- startClientX: event.clientX,
- startClientY: event.clientY,
- startPlacement: normalizeAgentPsdImagePlacement(
- effectiveImagePlacements[layer.id]
- ),
- };
-
- const nextTarget = event.currentTarget;
- try {
- nextTarget.setPointerCapture?.(event.pointerId);
- } catch (error) {
- console.warn(
- "[AgentPsdTemplateEditorDialog] setPointerCapture failed:",
- error
- );
- }
-
- const handlePointerMove = (moveEvent: PointerEvent) => {
- const dragState = imagePlacementDragStateRef.current;
- if (!dragState || dragState.layerId !== layer.id) {
- return;
- }
-
- updateImagePlacement(layer.id, () => ({
- ...dragState.startPlacement,
- offsetX:
- dragState.startPlacement.offsetX +
- (moveEvent.clientX - dragState.startClientX) / stageScale,
- offsetY:
- dragState.startPlacement.offsetY +
- (moveEvent.clientY - dragState.startClientY) / stageScale,
- }));
- };
-
- const handlePointerUp = (upEvent: PointerEvent) => {
- if (imagePlacementDragStateRef.current?.pointerId === upEvent.pointerId) {
- imagePlacementDragStateRef.current = null;
- }
- window.removeEventListener("pointermove", handlePointerMove);
- window.removeEventListener("pointerup", handlePointerUp);
- window.removeEventListener("pointercancel", handlePointerUp);
- };
-
- window.addEventListener("pointermove", handlePointerMove);
- window.addEventListener("pointerup", handlePointerUp);
- window.addEventListener("pointercancel", handlePointerUp);
- }
-
function handleTextDragStart(
layer: AgentPsdTemplateTextLayerSlot,
event: ReactPointerEvent
@@ -4217,11 +4140,6 @@ export function AgentPsdTemplateEditorDialog({
if (isAgentPsdImageLayerSlot(layer)) {
const assignedUrl =
effectiveImageAssignments[layer.id];
- const hasAssignedImage = Boolean(
- String(assignedUrl || "").trim()
- );
- const canDragAssignedImage =
- isLayerSuperLocked && hasAssignedImage;
const layerImageUrl =
assignedUrl ||
getPsdLayerPreviewSourceUrl(layer);
@@ -4238,51 +4156,39 @@ export function AgentPsdTemplateEditorDialog({
return (
图层层级
@@ -2488,7 +2477,7 @@ export function AgentPsdTemplateEditorDialog({
槽位内图片位置
- 目标图层保持固定；拖动预览中的替换图可在蒙版内微调位置。
+ 图层整体拖动已经改到中间预览区；这里保留槽位内图片的细调。
{
- event.stopPropagation();
- setSelectedLayerId(layer.id);
- }}
- onPointerDown={(event) => {
- if (canDragAssignedImage) {
- handleAssignedImagePlacementDragStart(
- layer,
- event
- );
- return;
- }
- if (!isLayerSuperLocked) {
- handleLayerDragStart(layer, event);
- }
- }}
+ onClick={
+ isLayerSuperLocked
+ ? undefined
+ : (event) => {
+ event.stopPropagation();
+ setSelectedLayerId(layer.id);
+ }
+ }
+ onPointerDown={(event) =>
+ isLayerSuperLocked
+ ? undefined
+ : handleLayerDragStart(layer, event)
+ }
style={{
...assignedImageContainerStyle,
zIndex: baseZIndex,
- cursor: canDragAssignedImage
- ? imagePlacementDragStateRef.current
- ?.layerId === layer.id
- ? "grabbing"
- : "grab"
- : isLayerSuperLocked
+ cursor:
+ isLayerSuperLocked
? "default"
: layerDragStateRef.current?.layerId ===
layer.id
? "grabbing"
: "grab",
- touchAction:
- isLayerSuperLocked && !hasAssignedImage
- ? "auto"
- : "none",
+ touchAction: isLayerSuperLocked
+ ? "auto"
+ : "none",
}}
- title={
- canDragAssignedImage
- ? `${getLayerLabel(layer)}：${layer.layerName}（目标已锁定，可拖动替换图）`
- : `${getLayerLabel(layer)}：${layer.layerName}`
- }
+ title={`${getLayerLabel(layer)}：${layer.layerName}`}
>
![{layer.layerName}]()
setSelectedLayerId(layer.id)}
- onPointerDown={(event) => {
- if (isLayerSuperLocked && hasAssignedImage) {
- handleAssignedImagePlacementDragStart(
- layer,
- event
- );
- return;
- }
- if (!isLayerSuperLocked) {
- handleLayerDragStart(layer, event);
- }
- }}
+ onPointerDown={(event) =>
+ handleLayerDragStart(layer, event)
+ }
style={{
...frameStyle,
zIndex:
@@ -4575,15 +4470,10 @@ export function AgentPsdTemplateEditorDialog({
? "rgba(249,115,22,0.08)"
: "transparent",
cursor:
- isLayerSuperLocked && hasAssignedImage
- ? imagePlacementDragStateRef.current
- ?.layerId === layer.id
- ? "grabbing"
- : "grab"
- : layerDragStateRef.current?.layerId ===
- layer.id
- ? "grabbing"
- : "grab",
+ layerDragStateRef.current?.layerId ===
+ layer.id
+ ? "grabbing"
+ : "grab",
touchAction: "none",
}}
title={`${getLayerLabel(layer)}：${layer.layerName}`}
diff --git a/lib/agents/psd-template-renderer.ts b/lib/agents/psd-template-renderer.ts
index d9a45880c..28d2e1fbf 100644
--- a/lib/agents/psd-template-renderer.ts
+++ b/lib/agents/psd-template-renderer.ts
@@ -576,13 +576,13 @@ export async function renderAgentPsdTemplate(params: {
for (const layer of orderedTemplateLayers) {
if (hiddenLayerIdSet.has(layer.id)) {
continue;
- }
-
- const storedLayerSourceUrl = getStoredLayerSourceUrl(layer);
- if (shouldRenderAsStaticLayer(layer)) {
- if (shouldUseRenderBaseFallback || shouldUseRenderSegments) {
- continue;
- }
+ }
+
+ const storedLayerSourceUrl = getStoredLayerSourceUrl(layer);
+ if (shouldRenderAsStaticLayer(layer)) {
+ if (shouldUseRenderBaseFallback || shouldUseRenderSegments) {
+ continue;
+ }
pushAsset(
storedLayerSourceUrl,
"PSD 图层素材",
@@ -913,10 +913,7 @@ export async function renderAgentPsdTemplate(params: {
}
for (const layer of [...orderedTemplateLayers].reverse()) {
- if (
- shouldUseRenderSegments &&
- (isAgentPsdTemplateLayerUserEditable(layer) || hasImageAssignment(layer))
- ) {
+ if (shouldUseRenderSegments && isAgentPsdTemplateLayerUserEditable(layer)) {
await appendRenderSegmentBeforeLayer(layer.id);
}
@@ -924,7 +921,7 @@ export async function renderAgentPsdTemplate(params: {
continue;
}
- if (shouldRenderAsStaticLayer(layer)) {
+ if (!isAgentPsdTemplateLayerUserEditable(layer)) {
if (shouldUseRenderBaseFallback || shouldUseRenderSegments) {
continue;
}