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]>
2026-10-02 15:47:17 +08:00
1 parent 8013196e3f
commit ceb66f8c77
@@ -1,154 +1,134 @@
 import { ChevronLeft, ChevronRight, ChevronsLeft, ChevronsRight } from "lucide-react";
+import { PAGE_SIZES } from "~/components/console/use-list-pagination.ts";
+import { Button } from "~/components/ui/button.tsx";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "~/components/ui/select.tsx";
 import { cn } from "~/lib/utils.ts";

-const PAGE_SIZE_OPTIONS = [10, 15, 20, 50, 100];
-
-type PaginationProps = {
+export type PaginationProps = {
  page: number;
  pageSize: number;
+  /** With hasMore, total is the loaded count, not a complete total. */
  total: number;
+  hasMore?: boolean;
+  busy?: boolean;
  onPageChange: (page: number) => void;
  onPageSizeChange?: (size: number) => void;
  className?: string;
 };
-
-export function Pagination({ page, pageSize, total, onPageChange, onPageSizeChange, className }: PaginationProps) {
-  const totalPages = Math.max(1, Math.ceil(total / pageSize));
-  const from = total === 0 ? 0 : (page - 1) * pageSize + 1;
+export function pageNumbers(page: number, pages: number): (number | "…")[] {
+  const values = new Set([1, pages, page - 1, page, page + 1]);
+  const valid = [...values].filter((n) => n >= 1 && n <= pages).sort((a, b) => a - b);
+  return valid.flatMap((n, i): (number | "…")[] => (i && n - valid[i - 1] > 1 ? ["…", n] : [n]));
+}
+/** Shared pagination for tables, cards and cursor-backed record lists. */
+export function Pagination({
+  page,
+  pageSize,
+  total,
+  hasMore = false,
+  busy = false,
+  onPageChange,
+  onPageSizeChange,
+  className,
+}: PaginationProps) {
+  const loadedPages = Math.max(1, Math.ceil(total / pageSize));
+  const pages = loadedPages + (hasMore ? 1 : 0);
+  const from = total ? (page - 1) * pageSize + 1 : 0;
  const to = Math.min(page * pageSize, total);
-
-  const isFirst = page <= 1;
-  const isLast = page >= totalPages;
-
-  // 生成页码列表（最多显示 7 个按钮）
-  function buildPages(): (number | "...")[] {
-    if (totalPages <= 7) {
-      return Array.from({ length: totalPages }, (_, i) => i + 1);
-    }
-    if (page <= 4) {
-      return [1, 2, 3, 4, 5, "...", totalPages];
-    }
-    if (page >= totalPages - 3) {
-      return [1, "...", totalPages - 4, totalPages - 3, totalPages - 2, totalPages - 1, totalPages];
-    }
-    return [1, "...", page - 1, page, page + 1, "...", totalPages];
-  }
-
-  const pages = buildPages();
-
  return (
-    <div className={cn("flex flex-wrap items-center justify-between gap-3", className)}>
-      {/* 左侧：总数 + 每页显示 */}
-      <div className="flex items-center gap-3">
-        <span className="text-xs text-muted-foreground whitespace-nowrap">
-          共 <span className="font-medium text-foreground tabular-nums">{total}</span> 条 · 第{" "}
-          <span className="font-medium text-foreground tabular-nums">{from}</span>
-          {" 至 "}
-          <span className="font-medium text-foreground tabular-nums">{to}</span> 条
-        </span>
-
-        {/* 每页条数 */}
-        {onPageSizeChange && (
-          <div className="flex items-center gap-1.5">
-            <span className="text-xs text-muted-foreground/60 whitespace-nowrap">每页</span>
-            <select
-              value={pageSize}
-              onChange={(e) => {
-                onPageSizeChange(Number(e.target.value));
-                onPageChange(1); // 切换页大小时回到第 1 页
-              }}
-              className="h-7 rounded-lg border border-foreground/10 bg-foreground/5 px-2 text-xs text-foreground outline-none transition-colors focus:border-primary/50 cursor-pointer appearance-none pr-6"
-              style={{
-                backgroundImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%23888' stroke-width='2'%3E%3Cpath d='M6 9l6 6 6-6'/%3E%3C/svg%3E")`,
-                backgroundRepeat: "no-repeat",
-                backgroundPosition: "right 6px center",
-              }}
-            >
-              {PAGE_SIZE_OPTIONS.map((s) => (
-                <option key={s} value={s} className="bg-card text-foreground">
-                  {s} 条
-                </option>
-              ))}
-            </select>
-          </div>
-        )}
-      </div>
-
-      {/* 右侧：页码导航 */}
-      <div className="flex items-center gap-0.5">
-        {/* 首页 */}
-        <NavBtn onClick={() => onPageChange(1)} disabled={isFirst} title="第一页">
-          <ChevronsLeft className="h-3.5 w-3.5" />
-        </NavBtn>
-
-        {/* 上一页 */}
-        <NavBtn onClick={() => onPageChange(page - 1)} disabled={isFirst} title="上一页">
-          <ChevronLeft className="h-3.5 w-3.5" />
-        </NavBtn>
-
-        {/* 页码按钮 */}
-        <div className="flex items-center gap-0.5 mx-1">
-          {pages.map((p, i) =>
-            p === "..." ? (
-              <span
-                key={`ellipsis-${i}`}
-                className="flex h-7 w-6 items-center justify-center text-xs text-muted-foreground/40 select-none"
-              >
-                ···
-              </span>
-            ) : (
-              <button
-                key={p}
-                type="button"
-                onClick={() => onPageChange(p as number)}
-                className={cn(
-                  "flex h-7 min-w-[28px] px-1.5 items-center justify-center rounded-full text-xs font-medium transition-all",
-                  p === page ? "pill-selected" : "text-muted-foreground hover:bg-foreground/8 hover:text-foreground",
-                )}
-              >
-                {p}
-              </button>
-            ),
-          )}
-        </div>
-
-        {/* 下一页 */}
-        <NavBtn onClick={() => onPageChange(page + 1)} disabled={isLast} title="下一页">
-          <ChevronRight className="h-3.5 w-3.5" />
-        </NavBtn>
-
-        {/* 末页 */}
-        <NavBtn onClick={() => onPageChange(totalPages)} disabled={isLast} title="最后一页">
-          <ChevronsRight className="h-3.5 w-3.5" />
-        </NavBtn>
-      </div>
-    </div>
-  );
-}
-
-function NavBtn({
-  children,
-  onClick,
-  disabled,
-  title,
-}: {
-  children: React.ReactNode;
-  onClick: () => void;
-  disabled: boolean;
-  title?: string;
-}) {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      disabled={disabled}
-      title={title}
-      className={cn(
-        "flex h-7 w-7 items-center justify-center rounded-lg text-muted-foreground transition-all",
-        disabled ? "opacity-25 cursor-not-allowed" : "hover:bg-foreground/8 hover:text-foreground",
-      )}
+    <nav
+      aria-label="列表分页"
+      aria-busy={busy}
+      className={cn("flex flex-wrap items-center justify-between gap-3 border-t border-border/60 px-4 py-3", className)}
    >
-      {children}
-    </button>
+      <div className="flex flex-wrap items-center gap-3 text-meta text-muted-foreground">
+        <span aria-live="polite" className="tabular-nums">
+          {hasMore ? `已加载 ${total} 条` : `共 ${total} 条`} · {from}–{to} 条
+        </span>
+        {onPageSizeChange ? (
+          <div className="flex items-center gap-2">
+            <span>每页</span>
+            <Select value={String(pageSize)} disabled={busy} onValueChange={(value) => onPageSizeChange(Number(value))}>
+              <SelectTrigger size="sm" aria-label="每页条数" className="min-w-24 text-caption text-foreground">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent position="popper" align="start" collisionPadding={16}>
+                {PAGE_SIZES.map((size) => (
+                  <SelectItem key={size} value={String(size)}>
+                    {size} 条
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+        ) : null}
+      </div>
+      <div className="flex max-w-full flex-wrap items-center gap-1">
+        <Button
+          type="button"
+          size="sm"
+          variant="ghost"
+          aria-label="第一页"
+          disabled={busy || page <= 1}
+          onClick={() => onPageChange(1)}
+        >
+          <ChevronsLeft className="h-4 w-4" />
+        </Button>
+        <Button
+          type="button"
+          size="sm"
+          variant="outline"
+          aria-label="上一页"
+          disabled={busy || page <= 1}
+          onClick={() => onPageChange(page - 1)}
+        >
+          <ChevronLeft className="h-4 w-4" />
+          <span className="hidden sm:inline">上一页</span>
+        </Button>
+        {pageNumbers(page, pages).map((n, i) =>
+          n === "…" ? (
+            <span key={`gap-${i}`} aria-hidden className="px-1 text-muted-foreground">
+              …
+            </span>
+          ) : (
+            <Button
+              key={n}
+              type="button"
+              size="sm"
+              variant={n === page ? "secondary" : "ghost"}
+              aria-label={`第 ${n} 页`}
+              aria-current={n === page ? "page" : undefined}
+              disabled={busy}
+              onClick={() => onPageChange(n)}
+            >
+              {n}
+            </Button>
+          ),
+        )}
+        <Button
+          type="button"
+          size="sm"
+          variant="outline"
+          aria-label="下一页"
+          disabled={busy || page >= pages}
+          onClick={() => onPageChange(page + 1)}
+        >
+          <span className="hidden sm:inline">下一页</span>
+          <ChevronRight className="h-4 w-4" />
+        </Button>
+        {!hasMore ? (
+          <Button
+            type="button"
+            size="sm"
+            variant="ghost"
+            aria-label="最后一页"
+            disabled={busy || page >= pages}
+            onClick={() => onPageChange(pages)}
+          >
+            <ChevronsRight className="h-4 w-4" />
+          </Button>
+        ) : null}
+      </div>
+    </nav>
  );
 }