v1.4.0 修复反爬误判+浏览器崩溃空转, 详情页多元翻页
- 修复反爬误判: is_challenge_page 仅匹配 title 关键词 + html 前 20KB 强特征标记, 不再全文匹配 captcha/challenge 等词 (博客园正文提 captcha 的页面被误杀) - 修复浏览器崩溃后空转: 检测 Target page/context/browser closed, 自动重启浏览器并重试当前 URL (不消耗重试配额, 单页最多重建3次); 页面读取连续异常3次快速失败; 新增 browser_max_pages 配置定期重启浏览器防内存膨胀 - 详情页多元翻页: 首页/末页/页码列表(带省略号)/页码跳转输入框(回车/GO)/每页条数选择(50/100/200/500)
This commit is contained in:
+77
-8
@@ -3,12 +3,13 @@
|
||||
|
||||
const $ = (id) => document.getElementById(id);
|
||||
const MODE_LABEL = { batch: "批量", scheduled: "定时", auto: "自动" };
|
||||
const DETAIL_PAGE_SIZE = 100; // 详情结果每页条数 (默认)
|
||||
|
||||
const state = {
|
||||
tasks: [],
|
||||
editTask: null, // 正在编辑的任务
|
||||
mode: "batch", // 当前表单模式
|
||||
detail: { task: null, runId: null, logOffset: 0, timer: null },
|
||||
detail: { task: null, runId: null, logOffset: 0, timer: null, pageSize: DETAIL_PAGE_SIZE },
|
||||
logTimer: null,
|
||||
};
|
||||
let formDirty = false; // 新建/编辑表单是否有未保存修改
|
||||
@@ -522,7 +523,6 @@ async function submitForm(e) {
|
||||
}
|
||||
|
||||
/* ---------------- 详情 ---------------- */
|
||||
const DETAIL_PAGE_SIZE = 100; // 详情结果每页条数
|
||||
|
||||
async function openDetail(tid) {
|
||||
try {
|
||||
@@ -531,6 +531,7 @@ async function openDetail(tid) {
|
||||
const runs = t.runs || [];
|
||||
const cur = t.run;
|
||||
state.detail.runId = cur ? cur.id : (runs[0] ? runs[0].id : null);
|
||||
state.detail.pageSize = (t.run && t.run.run_page_size) || DETAIL_PAGE_SIZE;
|
||||
state.detail.logOffset = 0;
|
||||
$("detailTitle").textContent = `任务详情 · ${t.name}`;
|
||||
renderDetail();
|
||||
@@ -539,8 +540,9 @@ async function openDetail(tid) {
|
||||
} catch (e) { toast(e.message, true); }
|
||||
}
|
||||
|
||||
async function loadRunPage(tid, rid, page) {
|
||||
return api(`/api/tasks/${tid}?run=${rid}&page=${page}&page_size=${DETAIL_PAGE_SIZE}`);
|
||||
async function loadRunPage(tid, rid, page, size) {
|
||||
const ps = size || state.detail.pageSize || DETAIL_PAGE_SIZE;
|
||||
return api(`/api/tasks/${tid}?run=${rid}&page=${page}&page_size=${ps}`);
|
||||
}
|
||||
|
||||
async function selectRun(rid) {
|
||||
@@ -550,6 +552,7 @@ async function selectRun(rid) {
|
||||
const d = await loadRunPage(t.id, rid, 1);
|
||||
state.detail.task = d;
|
||||
state.detail.runId = d.run ? d.run.id : null;
|
||||
state.detail.pageSize = (d.run && d.run.run_page_size) || DETAIL_PAGE_SIZE;
|
||||
state.detail.logOffset = 0;
|
||||
renderDetail();
|
||||
startLogPoll();
|
||||
@@ -559,13 +562,62 @@ async function selectRun(rid) {
|
||||
async function goRunPage(p) {
|
||||
const t = state.detail.task;
|
||||
if (!t || !state.detail.runId) return;
|
||||
const ps = (t.run && t.run.run_page_size) || state.detail.pageSize || DETAIL_PAGE_SIZE;
|
||||
try {
|
||||
const d = await loadRunPage(t.id, state.detail.runId, p);
|
||||
const d = await loadRunPage(t.id, state.detail.runId, p, ps);
|
||||
state.detail.task = d;
|
||||
state.detail.pageSize = (d.run && d.run.run_page_size) || ps;
|
||||
renderDetail();
|
||||
} catch (e) { toast(e.message, true); }
|
||||
}
|
||||
|
||||
/* 跳转到指定页码 (输入框回车/点击 GO) */
|
||||
function jumpRunPage() {
|
||||
const t = state.detail.task;
|
||||
if (!t || !state.detail.runId || !t.run) return;
|
||||
const inp = $("pagerJump");
|
||||
const pages = t.run.run_pages || 1;
|
||||
let p = parseInt(inp.value, 10);
|
||||
if (!p || isNaN(p)) p = 1;
|
||||
p = Math.min(Math.max(p, 1), pages);
|
||||
inp.value = p;
|
||||
goRunPage(p);
|
||||
}
|
||||
|
||||
/* 切换每页条数 */
|
||||
async function changePageSize(size) {
|
||||
const t = state.detail.task;
|
||||
if (!t || !state.detail.runId) return;
|
||||
try {
|
||||
const d = await loadRunPage(t.id, state.detail.runId, 1, parseInt(size, 10) || 100);
|
||||
state.detail.task = d;
|
||||
state.detail.pageSize = (d.run && d.run.run_page_size) || 100;
|
||||
renderDetail();
|
||||
} catch (e) { toast(e.message, true); }
|
||||
}
|
||||
|
||||
/* 生成页码窗口列表, 0 表示省略号: 1 2 3 … 97 98 99 100 */
|
||||
function pageWindow(cur, pages, width) {
|
||||
width = width || 5;
|
||||
const win = [];
|
||||
if (pages <= width + 2) {
|
||||
for (let i = 1; i <= pages; i++) win.push(i);
|
||||
return win;
|
||||
}
|
||||
win.push(1);
|
||||
let lo = Math.max(2, cur - Math.floor(width / 2));
|
||||
let hi = Math.min(pages - 1, cur + Math.floor(width / 2));
|
||||
if (hi - lo < width - 1) {
|
||||
if (lo <= 2) hi = lo + width - 1;
|
||||
else lo = hi - width + 1;
|
||||
}
|
||||
if (lo > 2) win.push(0);
|
||||
for (let i = lo; i <= hi; i++) win.push(i);
|
||||
if (hi < pages - 1) win.push(0);
|
||||
win.push(pages);
|
||||
return win;
|
||||
}
|
||||
|
||||
function renderDetail() {
|
||||
const t = state.detail.task;
|
||||
const runs = t.runs || [];
|
||||
@@ -664,13 +716,30 @@ function renderRunPanel(t, run) {
|
||||
const total = run.results_total || results.length;
|
||||
const pages = run.run_pages || 1;
|
||||
const page = run.run_page || 1;
|
||||
const pageSize = run.run_page_size || DETAIL_PAGE_SIZE;
|
||||
const multi = pages > 1;
|
||||
const pager = total > 0 ? `
|
||||
<div class="pager">
|
||||
${total > results.length ? `
|
||||
<button class="btn sm" ${page <= 1 ? "disabled" : ""} onclick="goRunPage(${page - 1})">◀ 上一页</button>
|
||||
${multi ? `
|
||||
<button class="btn sm" title="首页" ${page <= 1 ? "disabled" : ""} onclick="goRunPage(1)">⏮</button>
|
||||
<button class="btn sm" title="上一页" ${page <= 1 ? "disabled" : ""} onclick="goRunPage(${page - 1})">◀</button>
|
||||
<span class="pager-pages">${pageWindow(page, pages).map((p) => p === 0
|
||||
? '<span class="pager-ellipsis">…</span>'
|
||||
: `<button class="btn sm page-btn ${p === page ? "active" : ""}" onclick="goRunPage(${p})">${p}</button>`).join("")}</span>
|
||||
<button class="btn sm" title="下一页" ${page >= pages ? "disabled" : ""} onclick="goRunPage(${page + 1})">▶</button>
|
||||
<button class="btn sm" title="末页" ${page >= pages ? "disabled" : ""} onclick="goRunPage(${pages})">⏭</button>
|
||||
<span class="pager-info">第 <b>${page}</b> / ${pages} 页 · 共 ${total} 条</span>
|
||||
<button class="btn sm" ${page >= pages ? "disabled" : ""} onclick="goRunPage(${page + 1})">下一页 ▶</button>`
|
||||
<span class="pager-jump">跳至
|
||||
<input type="number" id="pagerJump" min="1" max="${pages}" value="${page}"
|
||||
onkeydown="if(event.key==='Enter')jumpRunPage()"> 页
|
||||
<button class="btn sm" onclick="jumpRunPage()">GO</button>
|
||||
</span>`
|
||||
: `<span class="pager-info">共 ${total} 条</span>`}
|
||||
<span class="pager-size">每页
|
||||
<select id="pagerSize" onchange="changePageSize(this.value)">
|
||||
${[50, 100, 200, 500].map((s) => `<option value="${s}" ${s === pageSize ? "selected" : ""}>${s}</option>`).join("")}
|
||||
</select> 条
|
||||
</span>
|
||||
</div>` : "";
|
||||
|
||||
return `
|
||||
|
||||
@@ -287,3 +287,20 @@ td.title-cell { max-width: 220px; overflow: hidden; text-overflow: ellipsis; }
|
||||
}
|
||||
.pager-info { color: var(--text-dim, #999); font-size: 13px; }
|
||||
.pager .btn:disabled { opacity: 0.4; cursor: not-allowed; }
|
||||
.pager-pages { display: flex; align-items: center; gap: 4px; flex-wrap: wrap; }
|
||||
.pager-pages .page-btn { min-width: 30px; padding: 4px 6px; }
|
||||
.pager-pages .page-btn.active {
|
||||
background: var(--accent, #2d6cdf);
|
||||
color: #fff;
|
||||
border-color: var(--accent, #2d6cdf);
|
||||
font-weight: 600;
|
||||
}
|
||||
.pager-ellipsis { color: var(--text-dim, #999); padding: 0 2px; user-select: none; }
|
||||
.pager-jump { display: inline-flex; align-items: center; gap: 4px; color: var(--text-dim, #999); font-size: 13px; }
|
||||
.pager-jump input {
|
||||
width: 56px;
|
||||
padding: 3px 6px;
|
||||
text-align: center;
|
||||
}
|
||||
.pager-size { display: inline-flex; align-items: center; gap: 4px; color: var(--text-dim, #999); font-size: 13px; }
|
||||
.pager-size select { padding: 3px 4px; width: auto; }
|
||||
Reference in New Issue
Block a user