fix(system): drop frontend taskRows sort; rely on backend started_at order
This commit is contained in:
1 parent
e6883f99a4
commit
d0bc724eee
2 files changed
+3
-11
No files matched your search
@@ -646,7 +646,7 @@ class DashboardQueries:
|
|||||||
value = {"raw": row["v"]}
|
value = {"raw": row["v"]}
|
||||||
items.append((name, value))
|
items.append((name, value))
|
||||||
items.sort(key=lambda pair: self._task_started_sort_key(pair[1]))
|
items.sort(key=lambda pair: self._task_started_sort_key(pair[1]))
|
||||||
# 插入序即开始时间倒序;JSON/Object.entries 会保留。
|
# 插入序即开始时间倒序;前端 Object.entries 保留该序,勿再排序。
|
||||||
return dict(items)
|
return dict(items)
|
||||||
|
|
||||||
def _task_running(self, conn: sqlite3.Connection) -> dict[str, Any]:
|
def _task_running(self, conn: sqlite3.Connection) -> dict[str, Any]:
|
||||||
|
|||||||
@@ -6,16 +6,8 @@ import {
|
|||||||
} from "../format.js";
|
} from "../format.js";
|
||||||
|
|
||||||
function taskRows(tasks) {
|
function taskRows(tasks) {
|
||||||
const entries = Object.entries(tasks || {}).sort((a, b) => {
|
// Order comes from backend (_task_records started_at DESC); do not re-sort here.
|
||||||
const sa = Number(a[1] && a[1].started_at);
|
const entries = Object.entries(tasks || {});
|
||||||
const sb = Number(b[1] && b[1].started_at);
|
|
||||||
const aOk = Number.isFinite(sa);
|
|
||||||
const bOk = Number.isFinite(sb);
|
|
||||||
if (aOk && bOk) return sb - sa;
|
|
||||||
if (aOk) return -1;
|
|
||||||
if (bOk) return 1;
|
|
||||||
return String(a[0]).localeCompare(String(b[0]));
|
|
||||||
});
|
|
||||||
if (!entries.length) return emptyState("暂无任务记录", "运行一次同步、快照或发现后会写入最近结果。");
|
if (!entries.length) return emptyState("暂无任务记录", "运行一次同步、快照或发现后会写入最近结果。");
|
||||||
return `<div class="table-wrap">
|
return `<div class="table-wrap">
|
||||||
<table class="data-table">
|
<table class="data-table">
|
||||||
|
|||||||
Reference in new issue
Block a user