fix(system): sort recent tasks by finished_at desc
「最近任务」原先按 kv 键名排序;改为按 finished_at 倒序, 缺完成时间的排末尾。前端渲染侧同步按 finished_at 排序兜底。
This commit is contained in:
1 parent
8e7ead1669
commit
e7b48ba5d9
3 files changed
+70
-5
No files matched your search
@@ -622,19 +622,32 @@ class DashboardQueries:
|
||||
continue
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def _task_finished_sort_key(value: Any) -> tuple[int, int]:
|
||||
"""缺 finished_at 的排末尾;有值的按完成时间倒序。"""
|
||||
if isinstance(value, Mapping):
|
||||
raw = value.get("finished_at")
|
||||
try:
|
||||
return (0, -int(raw))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
return (1, 0)
|
||||
|
||||
def _task_records(self, conn: sqlite3.Connection) -> dict[str, Any]:
|
||||
rows = conn.execute(
|
||||
"SELECT k, v FROM kv WHERE k LIKE 'task:last:%' ORDER BY k"
|
||||
"SELECT k, v FROM kv WHERE k LIKE 'task:last:%'"
|
||||
).fetchall()
|
||||
result: dict[str, Any] = {}
|
||||
items: list[tuple[str, Any]] = []
|
||||
for row in rows:
|
||||
name = str(row["k"]).removeprefix("task:last:")
|
||||
try:
|
||||
value = json.loads(str(row["v"]))
|
||||
except (TypeError, json.JSONDecodeError):
|
||||
value = {"raw": row["v"]}
|
||||
result[name] = value
|
||||
return result
|
||||
items.append((name, value))
|
||||
items.sort(key=lambda pair: self._task_finished_sort_key(pair[1]))
|
||||
# 插入序即完成时间倒序;JSON/Object.entries 会保留。
|
||||
return dict(items)
|
||||
|
||||
def _task_running(self, conn: sqlite3.Connection) -> dict[str, Any]:
|
||||
rows = conn.execute(
|
||||
|
||||
@@ -6,7 +6,16 @@ import {
|
||||
} from "../format.js";
|
||||
|
||||
function taskRows(tasks) {
|
||||
const entries = Object.entries(tasks || {});
|
||||
const entries = Object.entries(tasks || {}).sort((a, b) => {
|
||||
const fa = Number(a[1] && a[1].finished_at);
|
||||
const fb = Number(b[1] && b[1].finished_at);
|
||||
const aOk = Number.isFinite(fa);
|
||||
const bOk = Number.isFinite(fb);
|
||||
if (aOk && bOk) return fb - fa;
|
||||
if (aOk) return -1;
|
||||
if (bOk) return 1;
|
||||
return String(a[0]).localeCompare(String(b[0]));
|
||||
});
|
||||
if (!entries.length) return emptyState("暂无任务记录", "运行一次同步、快照或发现后会写入最近结果。");
|
||||
return `<div class="table-wrap">
|
||||
<table class="data-table">
|
||||
|
||||
Reference in new issue
Block a user