fix(grid): mask loading only on executing result run

This commit is contained in:
jearhe authored and GitHub committed 2026-09-01 14:09:42 +08:00
1 parent 1aa9f06719
commit f19439ad7a
9 files changed
+115 -8

No files matched your search

@@ -45,6 +45,7 @@ describe("queryStore cancel timeout recovery", () => {
isExecuting: false,
isCancelling: false,
executionId: undefined,
executingResultRunId: undefined,
});
expect(store.tabs[0]?.result?.rows[0]?.[0]).toContain("Cancel request timed out");
}, 15_000);
@@ -84,6 +85,7 @@ describe("queryStore cancel timeout recovery", () => {
isExecuting: false,
isCancelling: false,
executionId: undefined,
executingResultRunId: undefined,
batchSqlExecution: {
finishedAt: expect.any(Number),
items: [{ status: "cancelled" }, { status: "skipped" }],
@@ -1,4 +1,5 @@
import { createPinia, setActivePinia } from "pinia";
import { isActiveResultLoading } from "@/lib/sql/queryExecutionState";
import { beforeEach, describe, expect, it, vi } from "vitest";
const mocks = vi.hoisted(() => ({
@@ -978,8 +979,7 @@ describe("queryStore multi-statement errors", () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const tabId = store.createTab("mysql-1", "app", "Query");
await store.executeCurrentSql("SELECT 1 AS value");
store.toggleResultAutoSave(tabId);
await store.executeCurrentSql("SELECT 1 AS value", { openInNewResultTab: true });
const tab = store.tabs.find((item) => item.id === tabId)!;
const retainedRunId = tab.activeResultRunId!;
const retainedRunCacheKey = tab.resultRuns?.find((run) => run.id === retainedRunId)?.resultCacheKey;
@@ -987,11 +987,16 @@ describe("queryStore multi-statement errors", () => {
const execution = store.executeCurrentSql("SELECT 2 AS value", { openInNewResultTab: true });
await vi.waitFor(() => expect(mocks.executeMulti).toHaveBeenCalledTimes(2));
expect(tab.executingResultRunId).toBeNull();
expect(isActiveResultLoading(tab)).toBe(true);
expect(await store.setActiveResultRun(tabId, retainedRunId)).toBe(true);
expect(tab.batchSqlExecution?.submittedSql).toBe("SELECT 1 AS value");
expect(isActiveResultLoading(tab)).toBe(false);
pendingExecution.resolve([{ columns: ["value"], rows: [[2]], affected_rows: 0, execution_time_ms: 1 }]);
await execution;
expect(tab.executingResultRunId).toBeUndefined();
expect(isActiveResultLoading(tab)).toBe(false);
expect(tab.resultRuns).toHaveLength(2);
expect(tab.activeResultRunId).not.toBe(retainedRunId);
expect(tab.result).toMatchObject({ rows: [[2]] });
@@ -1016,6 +1021,28 @@ describe("queryStore multi-statement errors", () => {
expect(tab.batchSqlExecution?.submittedSql).toBe("SELECT 1 AS value");
});
it("keeps loading scoped to the result run being rerun", async () => {
const pendingExecution = deferred<Array<{ columns: string[]; rows: number[][]; affected_rows: number; execution_time_ms: number }>>();
mocks.executeMulti.mockResolvedValueOnce([{ columns: ["value"], rows: [[1]], affected_rows: 0, execution_time_ms: 1 }]).mockImplementationOnce(() => pendingExecution.promise);
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const tabId = store.createTab("mysql-1", "app", "Query");
await store.executeCurrentSql("SELECT 1 AS value", { openInNewResultTab: true });
const tab = store.tabs.find((item) => item.id === tabId)!;
const executingRunId = tab.activeResultRunId!;
const execution = store.executeCurrentSql("SELECT 2 AS value");
await vi.waitFor(() => expect(mocks.executeMulti).toHaveBeenCalledTimes(2));
expect(tab.executingResultRunId).toBe(executingRunId);
expect(isActiveResultLoading(tab)).toBe(true);
pendingExecution.resolve([{ columns: ["value"], rows: [[2]], affected_rows: 0, execution_time_ms: 1 }]);
await execution;
expect(tab.executingResultRunId).toBeUndefined();
expect(isActiveResultLoading(tab)).toBe(false);
});
it("restores the retained result when a new-result execution returns no result", async () => {
mocks.executeMulti.mockResolvedValueOnce([{ columns: ["value"], rows: [[1]], affected_rows: 0, execution_time_ms: 1 }]).mockResolvedValueOnce([]);
const { useQueryStore } = await import("@/stores/queryStore");
+15 -4
View File
@@ -861,6 +861,7 @@ export const useQueryStore = defineStore("query", () => {
isExecuting: false,
isCancelling: false,
executionId: undefined,
executingResultRunId: undefined,
queryExecutionStartedAt: undefined,
batchSqlExecution: undefined,
cancelRequestCount: 0,
@@ -1903,6 +1904,7 @@ export const useQueryStore = defineStore("query", () => {
tab.isExecuting = false;
tab.isCancelling = false;
tab.executionId = undefined;
tab.executingResultRunId = undefined;
tab.queryExecutionStartedAt = undefined;
if (tab.result) touchResult(tab);
return id;
@@ -3003,6 +3005,7 @@ export const useQueryStore = defineStore("query", () => {
editorViewport: undefined,
editorSelection: undefined,
executionId: undefined,
executingResultRunId: undefined,
isExplaining: false,
explainExecutionId: undefined,
mode: original.mode,
@@ -3687,6 +3690,7 @@ export const useQueryStore = defineStore("query", () => {
const tab = tabs.value.find((t) => t.id === id);
if (!tab) return;
tab.isExecuting = isExecuting;
tab.executingResultRunId = isExecuting ? null : undefined;
tab.queryExecutionStartedAt = isExecuting ? Date.now() : undefined;
if (!isExecuting) {
tab.isCancelling = false;
@@ -3698,6 +3702,7 @@ export const useQueryStore = defineStore("query", () => {
const tab = tabs.value.find((t) => t.id === id);
if (!tab) return;
tab.isExecuting = true;
tab.executingResultRunId = null;
tab.executionId = executionId;
tab.isCancelling = false;
tab.queryExecutionStartedAt = Date.now();
@@ -3743,6 +3748,7 @@ export const useQueryStore = defineStore("query", () => {
tab.isCancelling = false;
tab.queryExecutionStartedAt = undefined;
tab.executionId = undefined;
tab.executingResultRunId = undefined;
touchResult(tab);
}
@@ -3757,6 +3763,7 @@ export const useQueryStore = defineStore("query", () => {
current.isExecuting = false;
current.isCancelling = false;
current.executionId = undefined;
current.executingResultRunId = undefined;
current.queryExecutionStartedAt = undefined;
if (!restorePendingResultRun(current, executionId)) {
current.result = toErrorResult(new Error("Query canceled"));
@@ -4617,7 +4624,12 @@ export const useQueryStore = defineStore("query", () => {
const traceId = executionId.slice(0, 8);
const startedAt = performance.now();
const elapsed = () => `${Math.round(performance.now() - startedAt)}ms`;
const batchResume = options?.batchResume;
const continueOnBatchError = batchResume?.continueOnError ?? settingsStore.editorSettings.continueOnErrorOnBatch;
const preserveResultDuringExecution = batchResume !== undefined || options?.preserveResultDuringExecution === true || captureAutoSavedResultRun || (tab.mode === "query" && !!tab.activeResultRunId && !tab.resultAutoSave && !captureResultRun);
const updateActiveResultRun = !!tab.activeResultRunId && preserveResultDuringExecution;
tab.isExecuting = true;
tab.executingResultRunId = !captureResultRun && updateActiveResultRun ? tab.activeResultRunId : null;
options?.onExecutionStarted?.();
tab.isCancelling = false;
if (!tab.queryExecutionStartedAt) {
@@ -4638,8 +4650,6 @@ export const useQueryStore = defineStore("query", () => {
if (captureResultRun && tab.activeResultRunId) {
pendingResultRunRestores.set(executionId, tab.activeResultRunId);
}
const batchResume = options?.batchResume;
const continueOnBatchError = batchResume?.continueOnError ?? settingsStore.editorSettings.continueOnErrorOnBatch;
if (batchResume) {
tab.batchSqlExecution = prepareBatchSqlRecovery(batchResume.batch, executionId, batchResume.startStatementIndex);
liveBatchSqlExecutions.set(tab, tab.batchSqlExecution);
@@ -4647,8 +4657,6 @@ export const useQueryStore = defineStore("query", () => {
tab.batchSqlExecution = undefined;
liveBatchSqlExecutions.delete(tab);
}
const preserveResultDuringExecution = batchResume !== undefined || options?.preserveResultDuringExecution === true || captureAutoSavedResultRun || (tab.mode === "query" && !!tab.activeResultRunId && !tab.resultAutoSave && !captureResultRun);
const updateActiveResultRun = !!tab.activeResultRunId && preserveResultDuringExecution;
if (!updateActiveResultRun) {
tab.activeResultRunId = undefined;
}
@@ -5754,6 +5762,7 @@ export const useQueryStore = defineStore("query", () => {
current.isCancelling = false;
current.queryExecutionStartedAt = undefined;
current.executionId = undefined;
current.executingResultRunId = undefined;
clearLiveBatchSqlExecution(current, executionId);
queryExecutionLog("info", "finish", { traceId, elapsed: elapsed() });
} else {
@@ -6165,6 +6174,7 @@ export const useQueryStore = defineStore("query", () => {
current.isExecuting = false;
current.isCancelling = false;
current.executionId = undefined;
current.executingResultRunId = undefined;
current.queryExecutionStartedAt = undefined;
clearLiveBatchSqlExecution(current, executionId);
}
@@ -6182,6 +6192,7 @@ export const useQueryStore = defineStore("query", () => {
current.isCancelling = false;
current.queryExecutionStartedAt = undefined;
current.executionId = undefined;
current.executingResultRunId = undefined;
} else {
// 复用 setErrorResult 的完整清理:分组结果不清空的话,错误结果不会展示,
// 估算值也会继续按旧的 results 计算