style: 格式化 web 代码以满足 prettier 代码规范检查
This commit is contained in:
1 parent
b1076b9aa6
commit
2a5e0f0dc3
4 files changed
+129
-84
No files matched your search
@@ -33,12 +33,15 @@ export function CachedResourceImage({ storageKey, src = "", fallback = null, eag
|
|||||||
setNearViewport(true);
|
setNearViewport(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const observer = new IntersectionObserver((entries) => {
|
const observer = new IntersectionObserver(
|
||||||
if (entries.some((entry) => entry.isIntersecting)) {
|
(entries) => {
|
||||||
setNearViewport(true);
|
if (entries.some((entry) => entry.isIntersecting)) {
|
||||||
observer.disconnect();
|
setNearViewport(true);
|
||||||
}
|
observer.disconnect();
|
||||||
}, { rootMargin: "240px" });
|
}
|
||||||
|
},
|
||||||
|
{ rootMargin: "240px" },
|
||||||
|
);
|
||||||
observer.observe(image);
|
observer.observe(image);
|
||||||
return () => observer.disconnect();
|
return () => observer.disconnect();
|
||||||
}, [eager, remoteResource]);
|
}, [eager, remoteResource]);
|
||||||
@@ -50,47 +53,61 @@ export function CachedResourceImage({ storageKey, src = "", fallback = null, eag
|
|||||||
if (remoteResource && storageKey) {
|
if (remoteResource && storageKey) {
|
||||||
if (!nearViewport) {
|
if (!nearViewport) {
|
||||||
setCachedSrc("");
|
setCachedSrc("");
|
||||||
return () => { cancelled = true; };
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
setCachedSrc("");
|
setCachedSrc("");
|
||||||
const resolve = cacheResourceObjectUrl(storageKey);
|
const resolve = cacheResourceObjectUrl(storageKey);
|
||||||
void resolve.then((url) => {
|
void resolve
|
||||||
if (!cancelled) setCachedSrc(url || src);
|
.then((url) => {
|
||||||
}).catch(() => {
|
if (!cancelled) setCachedSrc(url || src);
|
||||||
if (!cancelled) {
|
})
|
||||||
setCacheFailed(true);
|
.catch(() => {
|
||||||
setCachedSrc(src);
|
if (!cancelled) {
|
||||||
}
|
setCacheFailed(true);
|
||||||
});
|
setCachedSrc(src);
|
||||||
return () => { cancelled = true; };
|
}
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (localImageResource && storageKey) {
|
if (localImageResource && storageKey) {
|
||||||
void resolveImageUrl(storageKey, src).then((url) => {
|
void resolveImageUrl(storageKey, src)
|
||||||
if (!cancelled) setCachedSrc(url || src);
|
.then((url) => {
|
||||||
}).catch(() => {
|
if (!cancelled) setCachedSrc(url || src);
|
||||||
if (!cancelled) setCachedSrc(src);
|
})
|
||||||
});
|
.catch(() => {
|
||||||
return () => { cancelled = true; };
|
if (!cancelled) setCachedSrc(src);
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
setCachedSrc(src);
|
setCachedSrc(src);
|
||||||
return () => { cancelled = true; };
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
}, [localImageResource, nearViewport, remoteResource, src, storageKey]);
|
}, [localImageResource, nearViewport, remoteResource, src, storageKey]);
|
||||||
|
|
||||||
const handleImgError = (e: React.SyntheticEvent<HTMLImageElement, Event>) => {
|
const handleImgError = (e: React.SyntheticEvent<HTMLImageElement, Event>) => {
|
||||||
if (localImageResource && storageKey && cachedSrc.startsWith("blob:")) {
|
if (localImageResource && storageKey && cachedSrc.startsWith("blob:")) {
|
||||||
void resolveImageUrl(storageKey).then((url) => {
|
void resolveImageUrl(storageKey)
|
||||||
if (url && url !== cachedSrc) {
|
.then((url) => {
|
||||||
setCachedSrc(url);
|
if (url && url !== cachedSrc) {
|
||||||
return;
|
setCachedSrc(url);
|
||||||
}
|
return;
|
||||||
setCacheFailed(true);
|
}
|
||||||
onError?.(e);
|
setCacheFailed(true);
|
||||||
}).catch(() => {
|
onError?.(e);
|
||||||
setCacheFailed(true);
|
})
|
||||||
onError?.(e);
|
.catch(() => {
|
||||||
});
|
setCacheFailed(true);
|
||||||
|
onError?.(e);
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setCacheFailed(true);
|
setCacheFailed(true);
|
||||||
|
|||||||
@@ -14,11 +14,15 @@ import { cn } from "@/lib/utils";
|
|||||||
import { useSyncProgressStore } from "@/stores/use-sync-progress-store";
|
import { useSyncProgressStore } from "@/stores/use-sync-progress-store";
|
||||||
|
|
||||||
export function CanvasCreateCard({ disabled, onClick }: { disabled?: boolean; onClick: () => void }) {
|
export function CanvasCreateCard({ disabled, onClick }: { disabled?: boolean; onClick: () => void }) {
|
||||||
return <button type="button" className="app-canvas-create-card" disabled={disabled} onClick={onClick}>
|
return (
|
||||||
<span className="app-canvas-create-preview"><Plus className="app-canvas-create-icon" /></span>
|
<button type="button" className="app-canvas-create-card" disabled={disabled} onClick={onClick}>
|
||||||
<span className="app-canvas-create-title">新建画布</span>
|
<span className="app-canvas-create-preview">
|
||||||
<span className="app-canvas-create-meta">从空白开始</span>
|
<Plus className="app-canvas-create-icon" />
|
||||||
</button>;
|
</span>
|
||||||
|
<span className="app-canvas-create-title">新建画布</span>
|
||||||
|
<span className="app-canvas-create-meta">从空白开始</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function CanvasProjectCard({ project, projectName, variant = "library", readOnly = false, footer }: { project: CanvasProject; projectName?: string; variant?: "library" | "recent"; readOnly?: boolean; footer?: ReactNode }) {
|
export function CanvasProjectCard({ project, projectName, variant = "library", readOnly = false, footer }: { project: CanvasProject; projectName?: string; variant?: "library" | "recent"; readOnly?: boolean; footer?: ReactNode }) {
|
||||||
@@ -55,14 +59,27 @@ export function CanvasProjectCard({ project, projectName, variant = "library", r
|
|||||||
>
|
>
|
||||||
<ProjectPreview project={project} />
|
<ProjectPreview project={project} />
|
||||||
</button>
|
</button>
|
||||||
{!compact && !readOnly ? <span className={`canvas-project-select ${selected ? "is-visible" : ""}`} onClick={(event) => event.stopPropagation()}><input type="checkbox" checked={selected} onChange={(event) => toggleSelected(project.id, event.target.checked)} className="app-canvas-project-checkbox" aria-label={`选择 ${project.title}`} /></span> : null}
|
{!compact && !readOnly ? (
|
||||||
<div className="canvas-project-cover-meta" aria-hidden="true"><span className="canvas-project-node-count">{project.nodes.length} 节点</span></div>
|
<span className={`canvas-project-select ${selected ? "is-visible" : ""}`} onClick={(event) => event.stopPropagation()}>
|
||||||
|
<input type="checkbox" checked={selected} onChange={(event) => toggleSelected(project.id, event.target.checked)} className="app-canvas-project-checkbox" aria-label={`选择 ${project.title}`} />
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
<div className="canvas-project-cover-meta" aria-hidden="true">
|
||||||
|
<span className="canvas-project-node-count">{project.nodes.length} 节点</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={cn("app-canvas-project-body", compact ? "is-compact" : "")}>
|
<div className={cn("app-canvas-project-body", compact ? "is-compact" : "")}>
|
||||||
<div className="canvas-project-heading-row">
|
<div className="canvas-project-heading-row">
|
||||||
{editing && !readOnly ? (
|
{editing && !readOnly ? (
|
||||||
<Input className="canvas-project-title-input" value={editingTitle} onClick={(event) => event.stopPropagation()} onChange={(event) => setEditingTitle(event.target.value)} onKeyDown={(event) => event.key === "Enter" && saveTitle()} autoFocus />
|
<Input
|
||||||
|
className="canvas-project-title-input"
|
||||||
|
value={editingTitle}
|
||||||
|
onClick={(event) => event.stopPropagation()}
|
||||||
|
onChange={(event) => setEditingTitle(event.target.value)}
|
||||||
|
onKeyDown={(event) => event.key === "Enter" && saveTitle()}
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
) : (
|
) : (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -77,12 +94,18 @@ export function CanvasProjectCard({ project, projectName, variant = "library", r
|
|||||||
)}
|
)}
|
||||||
{editing && !readOnly ? (
|
{editing && !readOnly ? (
|
||||||
<div className="canvas-project-actions" onClick={(event) => event.stopPropagation()}>
|
<div className="canvas-project-actions" onClick={(event) => event.stopPropagation()}>
|
||||||
<button type="button" onClick={saveTitle} aria-label="保存名称"><Check className="size-3.5" /></button>
|
<button type="button" onClick={saveTitle} aria-label="保存名称">
|
||||||
<button type="button" onClick={stopEditing} aria-label="取消重命名"><X className="size-3.5" /></button>
|
<Check className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
<button type="button" onClick={stopEditing} aria-label="取消重命名">
|
||||||
|
<X className="size-3.5" />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
) : !readOnly ? (
|
) : !readOnly ? (
|
||||||
<div className="canvas-project-actions" onClick={(event) => event.stopPropagation()}>
|
<div className="canvas-project-actions" onClick={(event) => event.stopPropagation()}>
|
||||||
<button type="button" onClick={() => startEditing(project.id, project.title)} aria-label={`重命名 ${project.title}`} title="重命名"><Pencil className="size-3.5" /></button>
|
<button type="button" onClick={() => startEditing(project.id, project.title)} aria-label={`重命名 ${project.title}`} title="重命名">
|
||||||
|
<Pencil className="size-3.5" />
|
||||||
|
</button>
|
||||||
<Dropdown
|
<Dropdown
|
||||||
trigger={["click"]}
|
trigger={["click"]}
|
||||||
menu={{
|
menu={{
|
||||||
@@ -94,13 +117,23 @@ export function CanvasProjectCard({ project, projectName, variant = "library", r
|
|||||||
],
|
],
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<button type="button" aria-label={`${project.title} 画布操作`} title="更多操作"><MoreHorizontal className="size-4" /></button>
|
<button type="button" aria-label={`${project.title} 画布操作`} title="更多操作">
|
||||||
|
<MoreHorizontal className="size-4" />
|
||||||
|
</button>
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
<div className="canvas-project-stats"><span>{projectName || "自由画布"}</span><span aria-hidden="true">·</span><time dateTime={project.updatedAt}>{formatProjectTime(project.updatedAt)}</time></div>
|
<div className="canvas-project-stats">
|
||||||
{footer ? <div className="canvas-project-card-footer" onClick={(event) => event.stopPropagation()}>{footer}</div> : null}
|
<span>{projectName || "自由画布"}</span>
|
||||||
|
<span aria-hidden="true">·</span>
|
||||||
|
<time dateTime={project.updatedAt}>{formatProjectTime(project.updatedAt)}</time>
|
||||||
|
</div>
|
||||||
|
{footer ? (
|
||||||
|
<div className="canvas-project-card-footer" onClick={(event) => event.stopPropagation()}>
|
||||||
|
{footer}
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
);
|
);
|
||||||
@@ -109,26 +142,31 @@ export function CanvasProjectCard({ project, projectName, variant = "library", r
|
|||||||
export function ProjectPreview({ project, preferLatestImage = false }: { project: CanvasProject; preferLatestImage?: boolean }) {
|
export function ProjectPreview({ project, preferLatestImage = false }: { project: CanvasProject; preferLatestImage?: boolean }) {
|
||||||
const syncProgress = useSyncProgressStore((state) => state.syncingProjects[project.id]);
|
const syncProgress = useSyncProgressStore((state) => state.syncingProjects[project.id]);
|
||||||
const isSyncing = Boolean(syncProgress && (syncProgress.phase === "uploading" || syncProgress.phase === "saving"));
|
const isSyncing = Boolean(syncProgress && (syncProgress.phase === "uploading" || syncProgress.phase === "saving"));
|
||||||
const mediaNodes = project.nodes
|
const mediaNodes = project.nodes.flatMap((node) => {
|
||||||
.flatMap((node) => {
|
if (node.type !== CanvasNodeType.Image && node.type !== CanvasNodeType.Video) return [];
|
||||||
if (node.type !== CanvasNodeType.Image && node.type !== CanvasNodeType.Video) return [];
|
const url = getNodeMediaUrl(node);
|
||||||
const url = getNodeMediaUrl(node);
|
const storageKey = node.metadata?.storageKey;
|
||||||
const storageKey = node.metadata?.storageKey;
|
return isPreviewUrl(url) || Boolean(storageKey) ? [{ node, url, storageKey }] : [];
|
||||||
return isPreviewUrl(url) || Boolean(storageKey) ? [{ node, url, storageKey }] : [];
|
});
|
||||||
});
|
|
||||||
const imageNodes = mediaNodes.filter(({ node }) => node.type === CanvasNodeType.Image);
|
const imageNodes = mediaNodes.filter(({ node }) => node.type === CanvasNodeType.Image);
|
||||||
const media = preferLatestImage
|
const media = preferLatestImage ? imageNodes[imageNodes.length - 1] || mediaNodes[mediaNodes.length - 1] : imageNodes[0] || mediaNodes[0];
|
||||||
? imageNodes[imageNodes.length - 1] || mediaNodes[mediaNodes.length - 1]
|
|
||||||
: imageNodes[0] || mediaNodes[0];
|
|
||||||
|
|
||||||
const content = media ? (
|
const content = media ? (
|
||||||
<div className="canvas-project-media size-full">
|
<div className="canvas-project-media size-full">
|
||||||
{media.node.type === CanvasNodeType.Video
|
{media.node.type === CanvasNodeType.Video ? (
|
||||||
? <div className="canvas-project-video size-full"><Video className="size-8" aria-label={media.node.title || "项目视频"} /></div>
|
<div className="canvas-project-video size-full">
|
||||||
: <CachedResourceImage storageKey={media.storageKey} src={media.url} alt={media.node.title || "项目图片"} loading="lazy" decoding="async" className="size-full min-h-0 object-cover" />}
|
<Video className="size-8" aria-label={media.node.title || "项目视频"} />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<CachedResourceImage storageKey={media.storageKey} src={media.url} alt={media.node.title || "项目图片"} loading="lazy" decoding="async" className="size-full min-h-0 object-cover" />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : !project.nodes.length ? (
|
) : !project.nodes.length ? (
|
||||||
<div className="canvas-project-empty size-full"><Plus className="canvas-project-empty-icon" /><span>空白画布</span><small>等待第一幕</small></div>
|
<div className="canvas-project-empty size-full">
|
||||||
|
<Plus className="canvas-project-empty-icon" />
|
||||||
|
<span>空白画布</span>
|
||||||
|
<small>等待第一幕</small>
|
||||||
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="canvas-project-preview-canvas relative size-full overflow-hidden">
|
<div className="canvas-project-preview-canvas relative size-full overflow-hidden">
|
||||||
{buildNodePreviewLayout(project.nodes.slice(0, 8)).map(({ node, style }) => {
|
{buildNodePreviewLayout(project.nodes.slice(0, 8)).map(({ node, style }) => {
|
||||||
@@ -147,10 +185,7 @@ export function ProjectPreview({ project, preferLatestImage = false }: { project
|
|||||||
<div className="relative size-full overflow-hidden">
|
<div className="relative size-full overflow-hidden">
|
||||||
{content}
|
{content}
|
||||||
{isSyncing && syncProgress ? (
|
{isSyncing && syncProgress ? (
|
||||||
<div
|
<div className="absolute inset-0 z-20 flex flex-col items-center justify-center gap-2 bg-stone-950/75 p-3 text-center backdrop-blur-sm transition-all duration-300 pointer-events-none select-none" onClick={(e) => e.stopPropagation()}>
|
||||||
className="absolute inset-0 z-20 flex flex-col items-center justify-center gap-2 bg-stone-950/75 p-3 text-center backdrop-blur-sm transition-all duration-300 pointer-events-none select-none"
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
|
||||||
>
|
|
||||||
<div className="flex items-center gap-1.5 text-amber-400">
|
<div className="flex items-center gap-1.5 text-amber-400">
|
||||||
<CloudUpload className="size-4 animate-bounce" />
|
<CloudUpload className="size-4 animate-bounce" />
|
||||||
<span className="text-xs font-medium tracking-wide">云端同步中</span>
|
<span className="text-xs font-medium tracking-wide">云端同步中</span>
|
||||||
@@ -230,7 +265,7 @@ function getNodePresentation(node: CanvasNodeData) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function isPreviewUrl(value?: string) {
|
function isPreviewUrl(value?: string) {
|
||||||
return Boolean(value && (/^(https?:|blob:|data:image\/|data:video\/|\/api\/)/.test(value)));
|
return Boolean(value && /^(https?:|blob:|data:image\/|data:video\/|\/api\/)/.test(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function formatProjectTime(value: string) {
|
export function formatProjectTime(value: string) {
|
||||||
|
|||||||
@@ -172,9 +172,9 @@ export default function CanvasPage() {
|
|||||||
const oldKey = node.metadata?.storageKey;
|
const oldKey = node.metadata?.storageKey;
|
||||||
const mapped = oldKey ? storageKeyMap.get(oldKey) : undefined;
|
const mapped = oldKey ? storageKeyMap.get(oldKey) : undefined;
|
||||||
const isDeadBlob = (val?: string) => typeof val === "string" && val.startsWith("blob:");
|
const isDeadBlob = (val?: string) => typeof val === "string" && val.startsWith("blob:");
|
||||||
const nextStorageKey = mapped ? mapped.storageKey : (oldKey && !isDeadBlob(oldKey) ? oldKey : undefined);
|
const nextStorageKey = mapped ? mapped.storageKey : oldKey && !isDeadBlob(oldKey) ? oldKey : undefined;
|
||||||
const content = mapped ? mapped.url : (isDeadBlob(node.metadata?.content) ? "" : node.metadata?.content);
|
const content = mapped ? mapped.url : isDeadBlob(node.metadata?.content) ? "" : node.metadata?.content;
|
||||||
const previewContent = mapped ? mapped.url : (isDeadBlob(node.metadata?.previewContent) ? "" : node.metadata?.previewContent);
|
const previewContent = mapped ? mapped.url : isDeadBlob(node.metadata?.previewContent) ? "" : node.metadata?.previewContent;
|
||||||
return {
|
return {
|
||||||
...node,
|
...node,
|
||||||
metadata: {
|
metadata: {
|
||||||
@@ -419,20 +419,17 @@ export default function CanvasPage() {
|
|||||||
<CollectionGrid className="canvas-library-grid">
|
<CollectionGrid className="canvas-library-grid">
|
||||||
{showCreateCard ? <CanvasCreateCard disabled={!hydrated} onClick={createAndEnter} /> : null}
|
{showCreateCard ? <CanvasCreateCard disabled={!hydrated} onClick={createAndEnter} /> : null}
|
||||||
{visibleProjects.map((project) => (
|
{visibleProjects.map((project) => (
|
||||||
<CanvasFolderCard
|
<CanvasFolderCard key={project.id} project={project} projectName={project.projectId ? projectNames.get(project.projectId) || "未同步项目" : undefined} onClick={() => enterProject(project.id)} />
|
||||||
key={project.id}
|
|
||||||
project={project}
|
|
||||||
projectName={project.projectId ? projectNames.get(project.projectId) || "未同步项目" : undefined}
|
|
||||||
onClick={() => enterProject(project.id)}
|
|
||||||
/>
|
|
||||||
))}
|
))}
|
||||||
</CollectionGrid>
|
</CollectionGrid>
|
||||||
) : (
|
) : (
|
||||||
<WorkspaceState icon="canvas" title="没有匹配的画布" description="换一个画布名称或重置筛选条件。" />
|
<WorkspaceState icon="canvas" title="没有匹配的画布" description="换一个画布名称或重置筛选条件。" />
|
||||||
)}
|
)}
|
||||||
{hydrated && visibleProjects.length ? <div ref={loadMoreRef} className="library-load-more" aria-live="polite">
|
{hydrated && visibleProjects.length ? (
|
||||||
{visibleProjects.length < filteredProjects.length ? `继续下滑加载更多(每页 50 条)` : `已加载全部 ${filteredProjects.length} 个画布`}
|
<div ref={loadMoreRef} className="library-load-more" aria-live="polite">
|
||||||
</div> : null}
|
{visibleProjects.length < filteredProjects.length ? `继续下滑加载更多(每页 50 条)` : `已加载全部 ${filteredProjects.length} 个画布`}
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input ref={inputRef} type="file" accept="application/zip,.zip" className="hidden" onChange={(event) => void importCanvas(event.target.files?.[0])} />
|
<input ref={inputRef} type="file" accept="application/zip,.zip" className="hidden" onChange={(event) => void importCanvas(event.target.files?.[0])} />
|
||||||
|
|||||||
@@ -272,11 +272,7 @@ function collectLocalMediaKeys(value: unknown, set = new Set<string>()): string[
|
|||||||
return [...set];
|
return [...set];
|
||||||
}
|
}
|
||||||
|
|
||||||
async function ensureRemoteResourceReferences<T>(
|
async function ensureRemoteResourceReferences<T>(value: T, uploaded = new Map<string, string>(), onUploaded?: () => void): Promise<T> {
|
||||||
value: T,
|
|
||||||
uploaded = new Map<string, string>(),
|
|
||||||
onUploaded?: () => void,
|
|
||||||
): Promise<T> {
|
|
||||||
if (!value || typeof value !== "object") return value;
|
if (!value || typeof value !== "object") return value;
|
||||||
if (Array.isArray(value)) {
|
if (Array.isArray(value)) {
|
||||||
const result: unknown[] = [];
|
const result: unknown[] = [];
|
||||||
|
|||||||
Reference in new issue
Block a user