hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-09 09:30:45 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions 2

Show compare engine in progress and SQL skip reasons.

Browse source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-10-08 15:56:20 +08:00
parent ba16167c8e
commit 2df2f50510
6 changed files with 176 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/src/i18n/en.ts
View file

@ -501,6 +501,10 @@ const en = {
runStatusDoneSec: "Done {{s}}s",
runProgress: "{{phase}} · sheet {{i}}/{{n}} · {{sheet}} · {{s}}s elapsed",
runRowsLoaded: "Loaded {{side}} {{n}} rows",
runRowsSqlCount: "DB count {{side}} {{n}} rows",
runEngineSql: "engine SQL",
runEnginePython: "engine Python",
runEngineNote: "reason {{note}}",
sheetPending: "Pending",
ranWithDuration: "Compare finished ({{s}}s)",
unchangedNotStored: "Success rows were counted but not stored. Set “Store success rows” to sample and re-run for spot-check.",

4
web/src/i18n/zh.ts
View file

@ -500,6 +500,10 @@ const zh = {
runStatusDoneSec: "完成 {{s}}s",
runProgress: "{{phase}} · 表 {{i}}/{{n}} · {{sheet}} · 已用 {{s}}s",
runRowsLoaded: "已加载 {{side}} {{n}} 行",
runRowsSqlCount: "库内统计 {{side}} {{n}} 行",
runEngineSql: "引擎 SQL",
runEnginePython: "引擎 Python",
runEngineNote: "原因 {{note}}",
sheetPending: "等待中",
ranWithDuration: "比对完成（耗时 {{s}} 秒）",
unchangedNotStored: "成功行仅统计数量未落库。可在任务配置将「成功行保存」改为抽样后重新比对（抽查用）。",

47
web/src/pages/network/BizComparePage.tsx
View file

@ -1893,7 +1893,10 @@ export function BizComparePage({ pageMode = "all" }: { pageMode?: BizComparePage
diff_rows?: number;
load_side?: string;
rows_loaded?: number;
engine?: string;
engine_note?: string;
};
const runEngine = String(runProgress.engine || "").toLowerCase();
// Poll active compare runs so the modal can be closed and reopened safely.
useEffect(() => {
@ -3003,7 +3006,10 @@ export function BizComparePage({ pageMode = "all" }: { pageMode?: BizComparePage
sheet_title?: string;
rows_loaded?: number;
load_side?: string;
engine?: string;
engine_note?: string;
};
const eng = String(prog.engine || "").toLowerCase();
const stLabel =
st === "running" || st === "queued"
? t("bizCompare.runStatusRunning")
@ -3018,15 +3024,25 @@ export function BizComparePage({ pageMode = "all" }: { pageMode?: BizComparePage
<tr key={String(r.id)} className={selected ? "is-selected" : undefined}>
<td>
<NmStatusChip color={jobChipColor(st)}>{stLabel}</NmStatusChip>
{active && prog.phase ? (
{active && (prog.phase || eng) ? (
<div className="muted" style={{ fontSize: "0.75rem", marginTop: 4 }}>
{prog.phase}
{eng === "sql"
? t("bizCompare.runEngineSql")
: eng === "python"
? t("bizCompare.runEnginePython")
: ""}
{eng && prog.engine_note
? ` · ${prog.engine_note}`
: ""}
{prog.phase ? `${eng ? " · " : ""}${prog.phase}` : ""}
{prog.sheet_total
? ` · ${prog.sheet_index || 0}/${prog.sheet_total}`
: ""}
{prog.sheet_title ? ` · ${prog.sheet_title}` : ""}
{Number(prog.rows_loaded || 0) > 0
? ` · ${prog.load_side || ""} ${prog.rows_loaded}`
? eng === "sql"
? ` · ${prog.load_side || ""} ${prog.rows_loaded}`
: ` · ${prog.load_side || ""} ${prog.rows_loaded}`
: ""}
</div>
) : null}
@ -3240,6 +3256,18 @@ export function BizComparePage({ pageMode = "all" }: { pageMode?: BizComparePage
{runDetail && runIsActive ? (
<div className="bs-cmp-progress" role="status" aria-live="polite">
<strong>{t("bizCompare.runStatusRunning")}</strong>
{runEngine === "sql" || runEngine === "python" ? (
<span className="muted">
{runEngine === "sql"
? t("bizCompare.runEngineSql")
: t("bizCompare.runEnginePython")}
{runProgress.engine_note
? ` · ${t("bizCompare.runEngineNote", {
note: String(runProgress.engine_note),
})}`
: ""}
</span>
) : null}
<span className="muted">
{t("bizCompare.runProgress", {
phase: String(runProgress.phase || "…"),
@ -3253,10 +3281,15 @@ export function BizComparePage({ pageMode = "all" }: { pageMode?: BizComparePage
</span>
{Number(runProgress.rows_loaded || 0) > 0 ? (
<span className="muted">
{t("bizCompare.runRowsLoaded", {
side: String(runProgress.load_side || "—"),
n: String(runProgress.rows_loaded || 0),
})}
{runEngine === "sql"
? t("bizCompare.runRowsSqlCount", {
side: String(runProgress.load_side || "—"),
n: String(runProgress.rows_loaded || 0),
})
: t("bizCompare.runRowsLoaded", {
side: String(runProgress.load_side || "—"),
n: String(runProgress.rows_loaded || 0),
})}
</span>
) : null}
{runDetail.message ? (