diff --git a/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx b/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx index 5e91cc91..edcc9103 100644 --- a/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx +++ b/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx @@ -309,6 +309,29 @@ const seriesTemplates = [ ] as SeriesTemplateDTO[] describe('AssetCenterClient 预览操作区', () => { + it('加载模型节点后不会默认选中第一个节点', async () => { + const actor = userEvent.setup() + + render( + , + ) + + await actor.click(screen.getByText('桌面板族')) + await actor.click(screen.getByText('桌面板A')) + + expect(screen.getByText('selected:none')).toBeInTheDocument() + expect(screen.queryByText('selected:panel-a')).not.toBeInTheDocument() + }) + it('会把一次 gizmo 拖拽封成一条撤销记录,Ctrl+Z 后直接回到拖拽前', async () => { const actor = userEvent.setup() diff --git a/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx b/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx index bb02f314..b2e4b934 100644 --- a/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx +++ b/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx @@ -2350,7 +2350,7 @@ export default function AssetCenterClient({ return Object.fromEntries(nextEntries) }) setSelectedPreviewNodeName((current) => - current && nodeNames.includes(current) ? current : nodeNames[0] ?? null, + current && nodeNames.includes(current) ? current : null, ) }} onNodeSelect={(payload) => { diff --git a/furniture-3d-system/src/components/3d/ModelViewer.tsx b/furniture-3d-system/src/components/3d/ModelViewer.tsx index 91c34124..a9c360b8 100644 --- a/furniture-3d-system/src/components/3d/ModelViewer.tsx +++ b/furniture-3d-system/src/components/3d/ModelViewer.tsx @@ -469,7 +469,6 @@ function ModelViewerComponent({ const engineRef = useRef(null); const transformControlsRef = useRef(null); const transformHelperRef = useRef(null); - const fallbackTransformNodeNameRef = useRef(null); const pointerStartRef = useRef< { x: number; y: number; button: number } | null >(null); @@ -1272,8 +1271,7 @@ function ModelViewerComponent({ applyRotationSnap(); // hover 时重绘样式(Three.js 会覆盖 material color) - const resolveActiveNodeName = () => - selectedNodeNameRef.current ?? fallbackTransformNodeNameRef.current; + const resolveActiveNodeName = () => selectedNodeNameRef.current; const beginInteraction = () => { const activeNodeName = resolveActiveNodeName(); const engine = engineRef.current; @@ -1413,32 +1411,23 @@ function ModelViewerComponent({ syncRotationSnapRef.current?.(); applyGizmoStyleRef.current?.(); - if (!enableTranslateGizmoRef.current) { - fallbackTransformNodeNameRef.current = null; + if (!enableTranslateGizmoRef.current || !selectedNodeNameRef.current) { currentTransformControls.detach(); currentHelper.visible = false; transformInteractionActiveRef.current = false; return; } - let activeNodeName = selectedNodeNameRef.current; - let targetObject = currentEngine.resolveObjectByNodeName(activeNodeName); - if (!targetObject) { - const fallbackTarget = currentEngine.resolveDefaultTransformTarget?.(); - activeNodeName = fallbackTarget?.nodeName ?? null; - targetObject = fallbackTarget?.object ?? null; - } + const activeNodeName = selectedNodeNameRef.current; + const targetObject = currentEngine.resolveObjectByNodeName(activeNodeName); if (!targetObject) { - fallbackTransformNodeNameRef.current = null; currentTransformControls.detach(); currentHelper.visible = false; transformInteractionActiveRef.current = false; return; } - fallbackTransformNodeNameRef.current = - activeNodeName === selectedNodeNameRef.current ? null : activeNodeName; currentTransformControls.enabled = true; currentTransformControls.showX = true; currentTransformControls.showY = true; diff --git a/furniture-3d-system/src/components/3d/__tests__/ModelViewer.gizmo.test.tsx b/furniture-3d-system/src/components/3d/__tests__/ModelViewer.gizmo.test.tsx index bfda0dae..c57b5c9e 100644 --- a/furniture-3d-system/src/components/3d/__tests__/ModelViewer.gizmo.test.tsx +++ b/furniture-3d-system/src/components/3d/__tests__/ModelViewer.gizmo.test.tsx @@ -285,7 +285,7 @@ describe("ModelViewer gizmo mode switching", () => { ); }); - it("没有显式节点名时,会回退到模型默认对象显示 gizmo", async () => { + it("没有显式节点名时,不显示 gizmo", async () => { render( { await flushViewer(); - expect(resolveDefaultTransformTargetMock).toHaveBeenCalled(); + expect(resolveDefaultTransformTargetMock).not.toHaveBeenCalled(); expect(transformControlsInstances).toHaveLength(1); - expect(transformControlsInstances[0]?.attach).toHaveBeenCalledWith(targetObject); - expect(transformControlsInstances[0]?.helper.visible).toBe(true); + expect(transformControlsInstances[0]?.attach).not.toHaveBeenCalled(); + expect(transformControlsInstances[0]?.helper.visible).toBe(false); }); it("移动时只显示有变化的轴,并显示 mm 数值", async () => { diff --git a/furniture-3d-system/src/components/platform/ViewportStageShell.tsx b/furniture-3d-system/src/components/platform/ViewportStageShell.tsx index 38f25355..ee2cac7c 100644 --- a/furniture-3d-system/src/components/platform/ViewportStageShell.tsx +++ b/furniture-3d-system/src/components/platform/ViewportStageShell.tsx @@ -69,7 +69,7 @@ export function ViewportStageShell({
{children}
{/* Obsidian Atelier vertical viewport tools */} -
+
{/* 交互模式 */} {enableTranslateGizmo && (