From 93002f1bd248c726c83d61a1669969bc02e7238a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= Date: Tue, 22 Sep 2026 13:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=20model3d=20=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=99=A8=E7=8A=B6=E6=80=81=E7=B1=BB=E5=9E=8B=E5=91=BD?= =?UTF-8?q?=E5=90=8D=EF=BC=9AModel3DViewerStatus=20=E6=94=B9=E5=9B=9E=20Mo?= =?UTF-8?q?del3dViewerStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - packages/model3d-viewer/src/status.ts:状态类型改名,与同文件的 Model3dViewerFailureReason / Model3dViewerStatusDetail 以及仓库既有 Model3d* 口径一致 - packages/model3d-viewer/src/Model3DViewer.tsx、packages/model3d-viewer/src/index.ts:跟随改名更新导入与引用 - src/components/image-editor/model3d-preview/Model3dViewerModal.tsx:跟随改名更新导入与状态类型引用 验证:npx tsc -p tsconfig.typecheck-guardrails.json --noEmit、npm run lint:eslint(改动文件) --- packages/model3d-viewer/src/Model3DViewer.tsx | 8 ++++---- packages/model3d-viewer/src/index.ts | 2 +- packages/model3d-viewer/src/status.ts | 2 +- .../image-editor/model3d-preview/Model3dViewerModal.tsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/model3d-viewer/src/Model3DViewer.tsx b/packages/model3d-viewer/src/Model3DViewer.tsx index c9978abbe..8d3e03049 100644 --- a/packages/model3d-viewer/src/Model3DViewer.tsx +++ b/packages/model3d-viewer/src/Model3DViewer.tsx @@ -17,7 +17,7 @@ import { createModel3dViewerScene, type Model3dViewerScene } from './scene'; import { MODEL3D_VIEWER_LOADING_TEXT, MODEL3D_VIEWER_STATUS_ATTRIBUTE, - type Model3DViewerStatus, + type Model3dViewerStatus, type Model3dViewerStatusDetail, resolveModel3dViewerErrorText, } from './status'; @@ -34,7 +34,7 @@ export type Model3DViewerProps = { /** 失败时那一行状态文案;不传用内置文案。 */ errorText?: string; onStatusChange?: ( - status: Model3DViewerStatus, + status: Model3dViewerStatus, detail: Model3dViewerStatusDetail, ) => void; className?: string; @@ -58,14 +58,14 @@ export function Model3DViewer({ const sceneRef = useRef(null); const onStatusChangeRef = useRef(onStatusChange); const autoRotateRef = useRef(autoRotate); - const [status, setStatus] = useState('idle'); + const [status, setStatus] = useState('idle'); useEffect(() => { onStatusChangeRef.current = onStatusChange; }, [onStatusChange]); const reportStatus = useCallback( - (next: Model3DViewerStatus, detail: Model3dViewerStatusDetail) => { + (next: Model3dViewerStatus, detail: Model3dViewerStatusDetail) => { setStatus(next); onStatusChangeRef.current?.(next, detail); }, diff --git a/packages/model3d-viewer/src/index.ts b/packages/model3d-viewer/src/index.ts index a03952e50..6ae70675f 100644 --- a/packages/model3d-viewer/src/index.ts +++ b/packages/model3d-viewer/src/index.ts @@ -13,7 +13,7 @@ export type { Model3DViewerHandle, Model3DViewerProps } from './Model3DViewer'; export { Model3DViewer } from './Model3DViewer'; export type { Model3dViewerFailureReason, - Model3DViewerStatus, + Model3dViewerStatus, Model3dViewerStatusDetail, } from './status'; export { diff --git a/packages/model3d-viewer/src/status.ts b/packages/model3d-viewer/src/status.ts index 822a7e051..d36b88cd6 100644 --- a/packages/model3d-viewer/src/status.ts +++ b/packages/model3d-viewer/src/status.ts @@ -1,4 +1,4 @@ -export type Model3DViewerStatus = 'idle' | 'loading' | 'ready' | 'failed'; +export type Model3dViewerStatus = 'idle' | 'loading' | 'ready' | 'failed'; export type Model3dViewerFailureReason = | 'unsupported-format' diff --git a/src/components/image-editor/model3d-preview/Model3dViewerModal.tsx b/src/components/image-editor/model3d-preview/Model3dViewerModal.tsx index c3934ea0a..67e2f8dfb 100644 --- a/src/components/image-editor/model3d-preview/Model3dViewerModal.tsx +++ b/src/components/image-editor/model3d-preview/Model3dViewerModal.tsx @@ -2,7 +2,7 @@ import { Model3DViewer, type Model3DViewerHandle, type Model3DViewerSource, - type Model3DViewerStatus, + type Model3dViewerStatus, type Model3dViewerStatusDetail, } from '@genarrative/model3d-viewer'; import { useRef, useState } from 'react'; @@ -86,7 +86,7 @@ export function Model3dViewerModal({ // 用 effect 在切换时重置不行 —— 它在挂载后运行,会盖掉查看器刚上报的 ready。 const [viewerStatus, setViewerStatus] = useState<{ identity: string; - status: Model3DViewerStatus; + status: Model3dViewerStatus; detail: Model3dViewerStatusDetail | null; } | null>(null);