Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(grid): show load time with one decimal in all states

zipg403da04d1f4b
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridBusyOverlay.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridBusyOverlay.spec.ts
index b2ec1660dd..1a9ef42c24 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridBusyOverlay.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridBusyOverlay.spec.ts
@@ -19,16 +19,16 @@ describe("DataGridBusyOverlay", () => {
it("shows the elapsed seconds without a stop action by default", () => {
const mounted = mountComponent(DataGridBusyOverlay, { elapsedMs: 12_340 });
- expect(hostText(mounted.root)).toContain("12.34s");
+ expect(hostText(mounted.root)).toContain("12.3s");
expect(findCancelButton(mounted.root)).toHaveLength(0);
});
it("formats long waits and guards non-finite elapsed values", async () => {
const mounted = mountComponent(DataGridBusyOverlay, { elapsedMs: 312_450 });
- expect(hostText(mounted.root)).toContain("312.45s");
+ expect(hostText(mounted.root)).toContain("312.4s");
await mounted.setProps({ elapsedMs: Number.NaN });
- expect(hostText(mounted.root)).toContain("0.00s");
+ expect(hostText(mounted.root)).toContain("0.0s");
});
it("stops the running load from the elapsed pill", () => {
@@ -70,7 +70,7 @@ describe("DataGridBusyOverlay", () => {
expect(hostText(mounted.root)).toContain("grid.pageJumpLoading");
expect(hostText(mounted.root)).toContain("grid.pageJumpProgress");
- expect(hostText(mounted.root)).toContain("45.00s");
+ expect(hostText(mounted.root)).toContain("45.0s");
const progressbar = findOne(mounted.root, (node) => node.props.role === "progressbar");
expect(progressbar.props["aria-valuenow"]).toBe(3);
expect(progressbar.props["aria-valuemax"]).toBe(12);
diff --git a/apps/desktop/src/lib/__tests__/common/elapsedTime.spec.ts b/apps/desktop/src/lib/__tests__/common/elapsedTime.spec.ts
index e6e648829c..9e35c65d77 100644
--- a/apps/desktop/src/lib/__tests__/common/elapsedTime.spec.ts
+++ b/apps/desktop/src/lib/__tests__/common/elapsedTime.spec.ts
@@ -2,14 +2,15 @@ import { describe, expect, it } from "vitest";
import { formatElapsedSeconds } from "@/lib/common/elapsedTime";
describe("formatElapsedSeconds", () => {
- it("formats elapsed milliseconds with two fractional second digits", () => {
- expect(formatElapsedSeconds(1234)).toBe("1.23");
- expect(formatElapsedSeconds(5)).toBe("0.01");
- expect(formatElapsedSeconds(0)).toBe("0.00");
+ it("formats elapsed milliseconds with one fractional second digit", () => {
+ expect(formatElapsedSeconds(1234)).toBe("1.2");
+ expect(formatElapsedSeconds(1250)).toBe("1.3");
+ expect(formatElapsedSeconds(5)).toBe("0.0");
+ expect(formatElapsedSeconds(0)).toBe("0.0");
});
it("clamps invalid elapsed values to zero", () => {
- expect(formatElapsedSeconds(-100)).toBe("0.00");
- expect(formatElapsedSeconds(Number.NaN)).toBe("0.00");
+ expect(formatElapsedSeconds(-100)).toBe("0.0");
+ expect(formatElapsedSeconds(Number.NaN)).toBe("0.0");
});
});
diff --git a/apps/desktop/src/lib/common/elapsedTime.ts b/apps/desktop/src/lib/common/elapsedTime.ts
index e814a7bba8..5fb39896f4 100644
--- a/apps/desktop/src/lib/common/elapsedTime.ts
+++ b/apps/desktop/src/lib/common/elapsedTime.ts
@@ -1,3 +1,11 @@
+/**
+ * Elapsed seconds for the running-load hints (the full-area loader, the in-grid
+ * busy pill, ...).
+ *
+ * One decimal on purpose: the grid footer renders a finished run through
+ * `formatQueryDuration` ("2.2 s"), so a two-decimal counter here made the same
+ * value jump between formats while loading and after it finished (#10439/#10441).
+ */
export function formatElapsedSeconds(ms: number): string {
- return (Math.max(0, Number.isFinite(ms) ? ms : 0) / 1000).toFixed(2);
+ return (Math.max(0, Number.isFinite(ms) ? ms : 0) / 1000).toFixed(1);
}