v1.2.13 人物页增强：分页控件(12条/页)，与角色筛选/搜索组合

api.py

@@ -191,15 +191,10 @@ def api_playoffs():
 def api_news():
     q = request.args.get("q", "")
     kind = request.args.get("kind", "")
-    limit = int(request.args.get("limit", 20))
-    if q:
-        r = tools.search_news(q, limit=limit)
-        return jsonify(r.get("results", []))
-    from db import query
-    rows = query("""SELECT id,title,author,source,publish_time,tags,kind,substr(content,1,160) AS summary
-                    FROM news WHERE (?='' OR kind=?) ORDER BY publish_time DESC, id DESC LIMIT ?""",
-                 (kind, kind, limit))
-    return jsonify(rows)
+    tag = request.args.get("tag", "")
+    page = max(1, int(request.args.get("page", 1)))
+    size = min(30, max(1, int(request.args.get("size", 10))))
+    return jsonify(tools.list_news(q, kind=kind, tag=tag, page=page, size=size))
 
 
 @app.route("/api/news/<int:nid>")
@@ -216,12 +211,9 @@ def api_news_detail(nid):
 def api_persons():
     q = request.args.get("q", "")
     role = request.args.get("role", "")
-    limit = int(request.args.get("limit", 50))
-    r = tools.search_persons(q, limit=limit)
-    results = r.get("results", [])
-    if role:
-        results = [p for p in results if p["role"] == role]
-    return jsonify(results)
+    page = max(1, int(request.args.get("page", 1)))
+    size = min(30, max(1, int(request.args.get("size", 12))))
+    return jsonify(tools.list_persons(q, role=role, page=page, size=size))
 
 
 @app.route("/api/persons/<int:pid>")

static/app.js

@@ -92,8 +92,18 @@ function loadView(v) {
     $$("#view-games .btn.small").forEach((x) => x.classList.toggle("active", x.dataset.status === ""));
     loadGames();
   }
-  else if (v === "news") loadNews("");
-  else if (v === "persons") loadPersons("");
+  else if (v === "news") {
+    newsPage = 1; newsQ = ""; newsKind = ""; newsTag = "";
+    $("#search-news").value = "";
+    $$("#view-news .btn.small").forEach((x) => x.classList.toggle("active", !x.dataset.kind && !x.dataset.tag));
+    loadNews();
+  }
+  else if (v === "persons") {
+    personsPage = 1; personsQ = ""; personsRole = "";
+    $("#search-persons").value = "";
+    $$("#view-persons .btn.small").forEach((x) => x.classList.toggle("active", x.dataset.role === ""));
+    loadPersons();
+  }
   else if (v === "standings") {
     if ($("#season-select").options.length) { loadStandings(); loadPlayoffs(); }
     else loadSeasons();
@@ -411,6 +421,8 @@ function renderPager(d, key) {
 function goPage(key, p) {
   if (key === "players") { playersPage = p; loadPlayers(); }
   else if (key === "games") { gamesPage = p; loadGames(); }
+  else if (key === "news") { newsPage = p; loadNews(); }
+  else if (key === "persons") { personsPage = p; loadPersons(); }
 }
 
 $("#btn-players").addEventListener("click", () => { playersQ = $("#search-players").value.trim(); playersPage = 1; loadPlayers(); });
@@ -497,8 +509,10 @@ async function openGame(id) {
 }
 
 /* ================= 新闻 ================= */
-async function loadNews(q) {
-  const news = await getJSON(`/api/news?q=${encodeURIComponent(q)}&limit=30`);
+let newsPage = 1, newsQ = "", newsKind = "", newsTag = "";
+async function loadNews() {
+  const d = await getJSON(`/api/news?q=${encodeURIComponent(newsQ)}&kind=${newsKind}&tag=${encodeURIComponent(newsTag)}&page=${newsPage}&size=10`);
+  const news = d.results || [];
   $("#list-news").innerHTML = news.map((n) => `
     <div class="list-item" onclick="openNews(${n.id})">
       <div style="display:flex;gap:8px;align-items:center;flex-wrap:wrap">
@@ -507,10 +521,19 @@ async function loadNews(q) {
       </div>
       <div class="meta">🕐 ${esc(n.publish_time)} · ${esc(n.source)}${n.author ? " · " + esc(n.author) : ""}</div>
       <div class="meta" style="margin-top:4px">${esc(n.summary || n.content || "")}…</div>
-    </div>`).join("");
+    </div>`).join("") || '<div class="meta">没有符合条件的新闻</div>';
+  renderPager(d, "news");
 }
-$("#btn-news").addEventListener("click", () => loadNews($("#search-news").value.trim()));
+$("#btn-news").addEventListener("click", () => { newsQ = $("#search-news").value.trim(); newsPage = 1; loadNews(); });
 $("#search-news").addEventListener("keydown", (e) => { if (e.key === "Enter") $("#btn-news").click(); });
+$$("#view-news .btn.small").forEach((b) => b.addEventListener("click", () => {
+  $$("#view-news .btn.small").forEach((x) => x.classList.remove("active"));
+  b.classList.add("active");
+  newsKind = b.dataset.kind;
+  newsTag = b.dataset.tag;
+  newsPage = 1;
+  loadNews();
+}));
 async function openNews(id) {
   const n = await getJSON(`/api/news/${id}`);
   openModal(`
@@ -522,24 +545,26 @@ async function openNews(id) {
 }
 
 /* ================= 人物 ================= */
-let personRoleFilter = "";
-async function loadPersons(q) {
-  const persons = await getJSON(`/api/persons?q=${encodeURIComponent(q)}&limit=60`);
-  const list = persons.filter((p) => !personRoleFilter || p.role === personRoleFilter);
-  $("#grid-persons").innerHTML = list.map((p) => `
+let personsPage = 1, personsQ = "", personsRole = "";
+async function loadPersons() {
+  const d = await getJSON(`/api/persons?q=${encodeURIComponent(personsQ)}&role=${personsRole}&page=${personsPage}&size=12`);
+  const persons = d.results || [];
+  $("#grid-persons").innerHTML = persons.map((p) => `
     <div class="card" onclick="openPerson(${p.id})">
       <h3>${esc(p.name)} <span class="en">${esc(p.name_en || "")}</span></h3>
       <div class="meta"><span class="tag">${esc(p.role_cn)}</span>${esc(p.title || "")}${p.team ? " · " + esc(p.team) : ""}</div>
       <div class="meta">${esc((p.bio || "").slice(0, 60))}…</div>
     </div>`).join("");
+  renderPager(d, "persons");
 }
 $$("#view-persons .btn.small").forEach((b) => b.addEventListener("click", () => {
   $$("#view-persons .btn.small").forEach((x) => x.classList.remove("active"));
   b.classList.add("active");
-  personRoleFilter = b.dataset.role;
-  loadPersons($("#search-persons").value.trim());
+  personsRole = b.dataset.role;
+  personsPage = 1;
+  loadPersons();
 }));
-$("#btn-persons").addEventListener("click", () => loadPersons($("#search-persons").value.trim()));
+$("#btn-persons").addEventListener("click", () => { personsQ = $("#search-persons").value.trim(); personsPage = 1; loadPersons(); });
 $("#search-persons").addEventListener("keydown", (e) => { if (e.key === "Enter") $("#btn-persons").click(); });
 async function openPerson(id) {
   const p = await getJSON(`/api/persons/${id}`);

static/index.html

@@ -82,8 +82,18 @@
     <div class="pager" id="pager-games"></div>
   </section>
   <section id="view-news" class="view">
-    <div class="toolbar"><input class="search" id="search-news" placeholder="搜索新闻关键词"><button class="btn" id="btn-news">搜索</button></div>
+    <div class="toolbar">
+      <button class="btn small active" data-kind="" data-tag="">全部</button>
+      <button class="btn small" data-kind="news" data-tag="">新闻</button>
+      <button class="btn small" data-kind="wiki" data-tag="">百科</button>
+      <button class="btn small" data-kind="" data-tag="总决赛">总决赛</button>
+      <button class="btn small" data-kind="" data-tag="续约">续约</button>
+      <button class="btn small" data-kind="" data-tag="中国球员">中国球员</button>
+      <button class="btn small" data-kind="" data-tag="选秀">选秀</button>
+      <input class="search" id="search-news" placeholder="搜索新闻关键词"><button class="btn" id="btn-news">搜索</button>
+    </div>
     <div class="list" id="list-news"></div>
+    <div class="pager" id="pager-news"></div>
   </section>
   <section id="view-persons" class="view">
     <div class="toolbar">
@@ -97,6 +107,7 @@
       <input class="search" id="search-persons" placeholder="搜索人物"><button class="btn" id="btn-persons">搜索</button>
     </div>
     <div class="grid" id="grid-persons"></div>
+    <div class="pager" id="pager-persons"></div>
   </section>
   <section id="view-standings" class="view">
     <div class="toolbar">

static/style.css

@@ -133,9 +133,9 @@ main { flex: 1; width: 100%; max-width: 1200px; margin: 0 auto; padding: 20px 16
 .pager button:disabled { opacity: .35; cursor: default; }
 .pager span { margin: 0 4px; }
 
-/* ---------- 比赛网格卡片（固定宽度，宽度足够一行多个） ---------- */
-.games-grid { grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); align-items: stretch; }
-.games-grid .list-item { display: flex; flex-direction: column; justify-content: space-between; gap: 8px; height: 100%; padding: 14px 16px; }
+/* ---------- 比赛网格卡片（固定宽度420px，居中排列） ---------- */
+.games-grid { display: flex; flex-wrap: wrap; justify-content: center; gap: 14px; }
+.games-grid .list-item { flex: 0 0 420px; width: 420px; display: flex; flex-direction: column; justify-content: space-between; gap: 8px; height: 100%; padding: 14px 16px; }
 .card { background: var(--card); border: 1px solid var(--line); border-radius: var(--radius); padding: 14px 16px; cursor: pointer; transition: .18s; }
 .card:hover { transform: translateY(-3px); border-color: var(--orange2); box-shadow: 0 6px 20px rgba(0,0,0,.35); }
 .card h3 { font-size: 15.5px; margin-bottom: 4px; }

tools.py

@@ -351,6 +351,28 @@ def player_game_logs(player_id, limit=10):
     return out
 
 
+# ================================================================== 新闻列表（前台分页版）
+def list_news(q="", kind="", tag="", page=1, size=10):
+    """前台新闻列表：关键词 + 类型(kind) + 话题标签(tag) + 分页"""
+    conds, args = [], []
+    if q:
+        like = f"%{fuzzy(q)}%"
+        conds.append("(title LIKE ? ESCAPE '\\' OR content LIKE ? ESCAPE '\\' OR tags LIKE ? ESCAPE '\\')")
+        args += [like, like, like]
+    if kind:
+        conds.append("kind=?")
+        args.append(kind)
+    if tag:
+        conds.append("tags LIKE ? ESCAPE '\\'")
+        args.append(f"%{fuzzy(tag)}%")
+    where = ("WHERE " + " AND ".join(conds)) if conds else ""
+    total = query_one(f"SELECT COUNT(*) AS c FROM news {where}", args)["c"]
+    rows = query(f"""SELECT id,title,author,source,publish_time,tags,kind,substr(content,1,160) AS summary
+                     FROM news {where} ORDER BY publish_time DESC, id DESC LIMIT ? OFFSET ?""",
+                 args + [size, (page - 1) * size])
+    return {"results": rows, "total": total, "page": page, "size": size}
+
+
 # ================================================================== 新闻（SQL 关键词 + 向量语义 + 可选 rerank 融合）
 def search_news(query_text, limit=5):
     q = (query_text or "").strip()
@@ -411,6 +433,28 @@ def search_persons(query_text, limit=MAX_SHOW):
          "bio": r["bio"], "achievements": r["achievements"]} for r in rows]}
 
 
+# ================================================================== 人物列表（前台分页版）
+def list_persons(q="", role="", page=1, size=12):
+    """前台人物列表：关键词 + 角色筛选 + 分页"""
+    conds, args = [], []
+    if q:
+        like = f"%{fuzzy(q)}%"
+        conds.append("(p.name LIKE ? ESCAPE '\\' OR p.name_en LIKE ? ESCAPE '\\' OR p.role_cn LIKE ? ESCAPE '\\' OR t.name LIKE ? ESCAPE '\\' OR p.bio LIKE ? ESCAPE '\\')")
+        args += [like] * 5
+    if role:
+        conds.append("p.role=?")
+        args.append(role)
+    where = ("WHERE " + " AND ".join(conds)) if conds else ""
+    total = query_one(f"SELECT COUNT(*) AS c FROM persons p LEFT JOIN teams t ON p.team_id=t.id {where}", args)["c"]
+    rows = query(f"""SELECT p.*, t.name AS team_name FROM persons p LEFT JOIN teams t ON p.team_id=t.id
+                     {where} ORDER BY p.id LIMIT ? OFFSET ?""", args + [size, (page - 1) * size])
+    return {"results": [
+        {"id": r["id"], "name": r["name"], "name_en": r["name_en"], "role": r["role"],
+         "role_cn": r["role_cn"], "title": r["title"], "team": r["team_name"],
+         "bio": r["bio"], "achievements": r["achievements"]} for r in rows],
+        "total": total, "page": page, "size": size}
+
+
 # ================================================================== 知识百科（纯向量检索）
 def search_knowledge(query_text, limit=3):
     q = (query_text or "").strip()