feat: v0.3.8–v0.3.14 工作区汇总(依赖升级、整理来源、手动入库、原地入库等)
生产 v0.3.8~v0.3.13 均由 8013196 加工作区修改构建部署,此前未提交;本提交补齐源码,
并含未部署的 v0.3.14 原地入库。中间各版本源码状态未保存,无法逐版拆分,详见
docs/plan/17-full-upgrade.md 与 docs/plan/18-organize-release.md。
- v0.3.8 全面升级:Deno workspace 依赖、Router 8 / Vite 8、camofox 1.18.0 / Node 24、
PostgreSQL 18.6、备份客户端 18.6、演示 qB 5.2.4
- v0.3.9 媒体整理:分类规则、整理来源与目录快照(0059)、文件管理整理入口
- v0.3.10 手动下载与入库:独立手动下载、详情页资源下载、TMDB / Local 元数据兜底
(metadata.resolve_organize)、正常多版本 / 一次性洗版(0060)
- v0.3.11 搜索详情与桌面黑边修复
- v0.3.12 列表分页、搜索历史、首页概况
- v0.3.13 统一整理弹窗与队列
- v0.3.14 原地入库(0061,未部署)
同批审计修复:
- 刮削入队:确认原记录存在后才删重放产生的新记录;写回 run 关联失败时保持 queued,
由处理器补关联(对齐 MP 先登记、只在入队失败时记失败)
- 识别升级链只在结果更确定时采用,不再用 no_match 顶替原有歧义候选
- bluray_dir 资产以原盘目录本身为刮削根(MP 同做法)
- metadata.resolve_organize 登记到入库排障 Skill 与能力地图
- db/src/types.ts 按迁移重新生成;contracts 整理动作枚举顺序与数据库对齐
- 测试:原地入库用例改为直接查记录表;domain 测试模板补 version
- 前端:通知铃铛弹层与用户菜单统一样式;站点卡片共用卡头、底栏贴底、分页间距
依赖升级证据只提交摘要文件,registry-snapshot.json 移至 .local/(SHA-256 记于文档)。
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
8013196e3f
commit
ceb66f8c77
265 files changed
+17751
-2483
No files matched your search
@@ -85,6 +85,6 @@ describe("DataTable groupBy:渲染", () => {
|
||||
rowKey: (r: Row) => r.id,
|
||||
}),
|
||||
);
|
||||
expect(html).not.toContain("aria-expanded");
|
||||
expect(html).not.toContain('aria-expanded="true"');
|
||||
});
|
||||
});
|
||||
@@ -1,9 +1,10 @@
|
||||
import { ChevronRight, type LucideIcon } from "lucide-react";
|
||||
import { Fragment, type ReactNode, useEffect, useMemo, useState } from "react";
|
||||
import { Button } from "~/components/ui/button.tsx";
|
||||
import { Pagination, type PaginationProps } from "~/components/ui/pagination.tsx";
|
||||
import { cn } from "~/lib/utils.ts";
|
||||
import { groupRows, readCollapsed, toggleCollapsed, writeCollapsed } from "./data-table-groups.ts";
|
||||
import { EmptyState, ErrorState, LoadingState } from "./empty-state.tsx";
|
||||
import { useListPagination } from "./use-list-pagination.ts";
|
||||
|
||||
export type DataColumn<T> = {
|
||||
/** 列 key(React key 用) */
|
||||
@@ -33,7 +34,7 @@ const HIDE: Record<NonNullable<DataColumn<unknown>["hideBelow"]>, string> = {
|
||||
};
|
||||
|
||||
/**
|
||||
* 数据表:内置 loading / error / empty 三态与"加载更多"游标翻页。
|
||||
* 数据表:内置 loading / error / empty 三态与统一分页。
|
||||
* 外层自带 pg-slab 卡片(plain 时不带);表格在卡片内横向滚动,页面本身不溢出。
|
||||
*
|
||||
* <DataTable columns={cols} rows={q.data?.items} rowKey={(r) => r.id}
|
||||
@@ -43,7 +44,7 @@ const HIDE: Record<NonNullable<DataColumn<unknown>["hideBelow"]>, string> = {
|
||||
*/
|
||||
export function DataTable<T>({
|
||||
columns,
|
||||
rows,
|
||||
rows: allRows,
|
||||
rowKey,
|
||||
loading = false,
|
||||
error,
|
||||
@@ -57,6 +58,8 @@ export function DataTable<T>({
|
||||
plain = false,
|
||||
groupBy,
|
||||
className,
|
||||
pagination = true,
|
||||
paginationKey,
|
||||
}: {
|
||||
columns: DataColumn<T>[];
|
||||
rows: T[] | undefined;
|
||||
@@ -73,7 +76,17 @@ export function DataTable<T>({
|
||||
plain?: boolean;
|
||||
groupBy?: DataGroupBy<T>;
|
||||
className?: string;
|
||||
pagination?: boolean | PaginationProps;
|
||||
paginationKey?: string;
|
||||
}) {
|
||||
const paged = useListPagination(allRows, {
|
||||
hasMore: pagination === true && hasMore,
|
||||
onLoadMore,
|
||||
loadingMore,
|
||||
error,
|
||||
resetKey: paginationKey ?? (allRows?.[0] ? rowKey(allRows[0]) : ""),
|
||||
});
|
||||
const rows = pagination === true ? paged.items : allRows;
|
||||
const storageKey = groupBy?.storageKey;
|
||||
const [collapsed, setCollapsed] = useState<Set<string>>(() => new Set());
|
||||
// 折叠态在挂载后读(服务端渲染时没有 localStorage,首屏一律展开)
|
||||
@@ -217,17 +230,11 @@ export function DataTable<T>({
|
||||
return (
|
||||
<div className={cn("min-w-0 overflow-hidden rounded-xl", !plain && "pg-slab", className)}>
|
||||
{body}
|
||||
{rows && rows.length > 0 && (hasMore || error) ? (
|
||||
<div className="flex items-center justify-center gap-3 border-t border-border/60 px-4 py-3">
|
||||
{error ? (
|
||||
<span className="text-meta text-destructive">{String((error as Error).message ?? error)}</span>
|
||||
) : null}
|
||||
{hasMore && onLoadMore ? (
|
||||
<Button variant="outline" size="sm" onClick={onLoadMore} disabled={loadingMore}>
|
||||
{loadingMore ? "加载中…" : "加载更多"}
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
{error && allRows?.length ? (
|
||||
<div className="px-4 py-2 text-meta text-destructive">{String((error as Error).message ?? error)}</div>
|
||||
) : null}
|
||||
{pagination && allRows ? (
|
||||
<Pagination {...(typeof pagination === "object" ? pagination : paged.pagination)} />
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -4,6 +4,7 @@ import { ArrowRight, Bell, CheckCheck } from "lucide-react";
|
||||
import { useMemo, useRef, useState } from "react";
|
||||
import { Link, useNavigate } from "react-router";
|
||||
import { decisionKeys, useDecisionSummary, useDecisions } from "~/api/decisions.ts";
|
||||
import { EmptyState, ErrorState, LoadingState } from "~/components/console/empty-state.tsx";
|
||||
import { SEVERITY } from "~/components/library/labels.ts";
|
||||
import { Button } from "~/components/ui/button.tsx";
|
||||
import { Popover, PopoverContent, PopoverTrigger } from "~/components/ui/popover.tsx";
|
||||
@@ -59,55 +60,54 @@ export function InboxBell() {
|
||||
<Popover open={open} onOpenChange={setOpen}>
|
||||
<PopoverTrigger asChild>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="relative h-8 w-8"
|
||||
variant="outline"
|
||||
size="icon-sm"
|
||||
className="relative"
|
||||
aria-label={total ? `待处理 ${total} 项` : "待处理"}
|
||||
title={total ? `待处理 ${total} 项` : "待处理"}
|
||||
>
|
||||
<Bell className="h-4 w-4" />
|
||||
{total ? (
|
||||
<span className="absolute -top-0.5 -right-0.5 min-w-4 rounded-full bg-warning px-1 text-center text-micro leading-4 font-semibold text-background tabular-nums">
|
||||
<span className="absolute -top-0.5 -right-0.5 min-w-4 rounded-full bg-primary px-1 text-center text-micro leading-4 font-semibold text-primary-foreground tabular-nums">
|
||||
{total > 99 ? "99+" : total}
|
||||
</span>
|
||||
) : null}
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent align="end" className="w-[min(22rem,calc(100vw-2rem))] p-0">
|
||||
<div className="flex items-center justify-between border-b border-border/60 px-4 py-3">
|
||||
<PopoverContent
|
||||
align="end"
|
||||
sideOffset={8}
|
||||
collisionPadding={16}
|
||||
aria-label="待处理事项"
|
||||
className="pg-float-solid flex max-h-[var(--radix-popover-content-available-height)] w-[min(22rem,calc(100vw-2rem))] flex-col overflow-hidden p-2"
|
||||
>
|
||||
<div className="flex shrink-0 items-center justify-between gap-3 border-b border-border px-2 pt-1 pb-2">
|
||||
<p className="text-sm font-semibold text-foreground">
|
||||
待处理
|
||||
{total ? <span className="ml-1.5 text-warning tabular-nums">{total}</span> : null}
|
||||
{total ? <span className="ml-1.5 font-normal text-muted-foreground tabular-nums">{total}</span> : null}
|
||||
</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => go(inboxPath())}
|
||||
className="inline-flex cursor-pointer items-center gap-1 text-meta text-muted-foreground hover:text-foreground"
|
||||
>
|
||||
<Button variant="ghost" size="xs" onClick={() => go(inboxPath())}>
|
||||
查看全部
|
||||
<ArrowRight className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
<ArrowRight />
|
||||
</Button>
|
||||
</div>
|
||||
{list.isPending ? (
|
||||
<p className="px-4 py-6 text-center text-caption text-muted-foreground">加载中…</p>
|
||||
<LoadingState className="px-4 py-6" />
|
||||
) : list.isError ? (
|
||||
<p className="px-4 py-6 text-center text-caption text-destructive">加载失败,稍后再试</p>
|
||||
<ErrorState plain error="稍后再试" className="py-8" />
|
||||
) : groups.length === 0 ? (
|
||||
<div className="flex flex-col items-center gap-2 px-4 py-8 text-caption text-muted-foreground">
|
||||
<CheckCheck className="h-5 w-5" />
|
||||
没有需要处理的事项
|
||||
</div>
|
||||
<EmptyState plain icon={CheckCheck} title="没有需要处理的事项" className="py-8" />
|
||||
) : (
|
||||
<div className="max-h-[60vh] overflow-y-auto py-1">
|
||||
<div className="min-h-0 overflow-y-auto overscroll-contain pt-1">
|
||||
{groups.map((g) => (
|
||||
<section key={g.kind} className="py-1">
|
||||
<section key={g.kind} className="pt-1">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => go(inboxPath(g.kind))}
|
||||
className="flex w-full cursor-pointer items-center justify-between px-4 py-1 text-meta font-medium text-muted-foreground hover:text-foreground"
|
||||
className="flex w-full cursor-pointer items-center justify-between gap-2 rounded-lg px-2 py-1.5 text-label font-semibold tracking-[0.18em] text-muted-foreground uppercase outline-none transition-colors hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
>
|
||||
<span>{decisionKindLabel(g.kind)}</span>
|
||||
<span className="tabular-nums">{g.count}</span>
|
||||
<span className="tracking-normal tabular-nums">{g.count}</span>
|
||||
</button>
|
||||
<ul>
|
||||
{g.items.map((d) => (
|
||||
@@ -115,14 +115,12 @@ export function InboxBell() {
|
||||
<Link
|
||||
to={inboxPath(d.kind)}
|
||||
onClick={() => setOpen(false)}
|
||||
className="flex items-start gap-2.5 px-4 py-2 hover:bg-foreground/[0.04]"
|
||||
className="block rounded-lg px-2 py-2 outline-none transition-colors hover:bg-foreground/[0.06] focus-visible:bg-foreground/[0.06] focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
>
|
||||
<span aria-hidden className={cn("mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full", DOT[d.severity])} />
|
||||
<span className="min-w-0 flex-1">
|
||||
<span className="line-clamp-2 text-caption text-foreground">{d.title}</span>
|
||||
<span className="text-meta text-muted-foreground">
|
||||
{SEVERITY[d.severity].label} · {formatRelative(d.createdAt)}
|
||||
</span>
|
||||
<span className="line-clamp-2 text-body break-words text-foreground">{d.title}</span>
|
||||
<span className="mt-0.5 flex items-center gap-1.5 text-meta text-muted-foreground">
|
||||
<span aria-hidden className={cn("h-1.5 w-1.5 shrink-0 rounded-full", DOT[d.severity])} />
|
||||
{SEVERITY[d.severity].label} · {formatRelative(d.createdAt)}
|
||||
</span>
|
||||
</Link>
|
||||
</li>
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import { createElement } from "react";
|
||||
import { renderToStaticMarkup } from "react-dom/server";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { Pagination, pageNumbers } from "~/components/ui/pagination.tsx";
|
||||
import { DataTable } from "./data-table.tsx";
|
||||
import { pageWindow } from "./use-list-pagination.ts";
|
||||
|
||||
describe("list pagination", () => {
|
||||
it("keeps empty and short final pages in range", () => {
|
||||
expect(pageWindow(0, 20, 8)).toEqual({ page: 1, pages: 1, start: 0, end: 0 });
|
||||
expect(pageWindow(135, 100, 8)).toEqual({ page: 2, pages: 2, start: 100, end: 135 });
|
||||
expect(pageWindow(135, 50, 0)).toEqual({ page: 1, pages: 3, start: 0, end: 50 });
|
||||
});
|
||||
it("shows nearby pages and endpoints without a button for every record page", () => {
|
||||
expect(pageNumbers(50, 100)).toEqual([1, "…", 49, 50, 51, "…", 100]);
|
||||
expect(pageNumbers(1, 2)).toEqual([1, 2]);
|
||||
});
|
||||
it("does not invent a total or last page for cursor results", () => {
|
||||
const html = renderToStaticMarkup(
|
||||
createElement(Pagination, {
|
||||
page: 1,
|
||||
pageSize: 50,
|
||||
total: 50,
|
||||
hasMore: true,
|
||||
onPageChange: () => {},
|
||||
}),
|
||||
);
|
||||
expect(html).toContain("已加载 50 条");
|
||||
expect(html).toContain('aria-label="第 2 页"');
|
||||
expect(html).not.toContain('aria-label="最后一页"');
|
||||
});
|
||||
it("limits table rows and shares the page-size control even for empty lists", () => {
|
||||
const table = (rows: { id: string }[]) =>
|
||||
renderToStaticMarkup(
|
||||
createElement(DataTable<{ id: string }>, {
|
||||
rows,
|
||||
columns: [{ key: "id", header: "ID", cell: (r: { id: string }) => r.id }],
|
||||
rowKey: (r: { id: string }) => r.id,
|
||||
}),
|
||||
);
|
||||
const html = table(Array.from({ length: 135 }, (_, i) => ({ id: `item-${i}` })));
|
||||
expect(html.split("<tbody>")[1]?.split("</tbody>")[0]?.match(/<tr /g)).toHaveLength(50);
|
||||
expect(html).toContain('aria-label="每页条数"');
|
||||
expect(html).not.toContain("item-50</td>");
|
||||
expect(table([])).toContain('aria-label="每页条数"');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,33 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { useListPagination } from "~/components/console/use-list-pagination.ts";
|
||||
import { Pagination } from "~/components/ui/pagination.tsx";
|
||||
|
||||
/** Shared paging for custom record lists, keeping row markup and actions with the caller. */
|
||||
export function PaginatedList<T>({
|
||||
rows,
|
||||
children,
|
||||
label,
|
||||
resetKey,
|
||||
className,
|
||||
as = "div",
|
||||
compact = false,
|
||||
}: {
|
||||
rows: T[];
|
||||
children: (row: T, index: number) => ReactNode;
|
||||
label: string;
|
||||
resetKey?: string;
|
||||
className?: string;
|
||||
as?: "div" | "ul" | "fieldset";
|
||||
compact?: boolean;
|
||||
}) {
|
||||
const { items, pagination } = useListPagination(rows, { resetKey });
|
||||
const Container = as;
|
||||
return (
|
||||
<section aria-label={label}>
|
||||
<Container className={className}>
|
||||
{items?.map((row, index) => children(row, (pagination.page - 1) * pagination.pageSize + index))}
|
||||
</Container>
|
||||
{!compact || rows.length > 10 ? <Pagination {...pagination} /> : null}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
|
||||
import type { PaginationProps } from "~/components/ui/pagination.tsx";
|
||||
|
||||
export const PAGE_SIZES = [10, 20, 50, 100] as const;
|
||||
const SIZE_KEY = "umt.list.page-size";
|
||||
const SIZE_EVENT = "umt:list-page-size";
|
||||
function readSize() {
|
||||
try {
|
||||
const size = Number(localStorage.getItem(SIZE_KEY));
|
||||
return PAGE_SIZES.some((n) => n === size) ? size : 0;
|
||||
} catch {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
function subscribeSize(notify: () => void) {
|
||||
window.addEventListener("storage", notify);
|
||||
window.addEventListener(SIZE_EVENT, notify);
|
||||
return () => {
|
||||
window.removeEventListener("storage", notify);
|
||||
window.removeEventListener(SIZE_EVENT, notify);
|
||||
};
|
||||
}
|
||||
export function pageWindow(total: number, size: number, requested: number) {
|
||||
const pages = Math.max(1, Math.ceil(total / size));
|
||||
const page = Math.max(1, Math.min(requested, pages));
|
||||
return { page, pages, start: (page - 1) * size, end: Math.min(page * size, total) };
|
||||
}
|
||||
/** Present cached cursor results as pages; fetch only enough to fill the requested page. */
|
||||
export function useListPagination<T>(
|
||||
rows: T[] | undefined,
|
||||
{
|
||||
hasMore = false,
|
||||
onLoadMore,
|
||||
loadingMore = false,
|
||||
error,
|
||||
resetKey = "",
|
||||
defaultPageSize = 50,
|
||||
}: {
|
||||
hasMore?: boolean;
|
||||
onLoadMore?: () => unknown;
|
||||
loadingMore?: boolean;
|
||||
error?: unknown;
|
||||
resetKey?: string;
|
||||
defaultPageSize?: number;
|
||||
} = {},
|
||||
) {
|
||||
const storedSize = useSyncExternalStore(subscribeSize, readSize, () => 0);
|
||||
const [localSize, setLocalSize] = useState<number | null>(null);
|
||||
const pageSize = localSize ?? (storedSize || defaultPageSize);
|
||||
const scope = `${resetKey}|${pageSize}`;
|
||||
const [position, setPosition] = useState({ scope, page: 1 });
|
||||
useEffect(() => {
|
||||
setPosition({ scope, page: 1 });
|
||||
}, [scope]);
|
||||
const requested = position.scope === scope ? position.page : 1;
|
||||
const total = rows?.length ?? 0;
|
||||
const range = pageWindow(total, pageSize, requested);
|
||||
const needsMore = !!rows && hasMore && total < requested * pageSize;
|
||||
const fetching = useRef(false);
|
||||
const load = useCallback(() => {
|
||||
if (!onLoadMore || fetching.current || loadingMore) return;
|
||||
fetching.current = true;
|
||||
Promise.resolve(onLoadMore())
|
||||
.catch(() => {})
|
||||
.finally(() => {
|
||||
fetching.current = false;
|
||||
});
|
||||
}, [onLoadMore, loadingMore]);
|
||||
// biome-ignore lint/correctness/useExhaustiveDependencies: every new cursor chunk must trigger filling the requested page
|
||||
useEffect(() => {
|
||||
if (needsMore && !error) load();
|
||||
}, [needsMore, total, error, load]);
|
||||
const onPageChange = (page: number) => {
|
||||
const next = Math.max(1, Math.min(page, range.pages + (hasMore ? 1 : 0)));
|
||||
setPosition({ scope, page: next });
|
||||
if (hasMore && next * pageSize > total) load();
|
||||
};
|
||||
const onPageSizeChange = (size: number) => {
|
||||
if (!PAGE_SIZES.some((n) => n === size)) return;
|
||||
setLocalSize(size);
|
||||
setPosition({ scope: `${resetKey}|${size}`, page: 1 });
|
||||
try {
|
||||
localStorage.setItem(SIZE_KEY, String(size));
|
||||
window.dispatchEvent(new Event(SIZE_EVENT));
|
||||
setLocalSize(null);
|
||||
} catch {
|
||||
/* selected size still applies to this list */
|
||||
}
|
||||
};
|
||||
const pagination: PaginationProps = {
|
||||
page: range.page,
|
||||
pageSize,
|
||||
total,
|
||||
hasMore,
|
||||
busy: loadingMore || (needsMore && !error),
|
||||
onPageChange,
|
||||
onPageSizeChange,
|
||||
};
|
||||
return { items: rows?.slice(range.start, range.end), pagination };
|
||||
}
|
||||
Reference in new issue
Block a user