github/dbx
4
0
Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-10-29 00:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(data): show table loading immediately (#34)

Browse Source
This commit is contained in:
Sugar
2026-04-30 17:48:13 +08:00
committed by GitHub
parent 2b4cd311b3
commit 3867e7908f
2 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/sidebar/TreeItem.vue
+32 -24
View File
@@ -152,34 +152,42 @@ function onClick() {
async function openData() {
const node = props.node;
if (!(node.type === "table" || node.type === "view") || !node.connectionId || !node.database) return;
await connectionStore.ensureConnected(node.connectionId);
const config = connectionStore.getConfig(node.connectionId);
const qualifiedName = (config?.db_type === "postgres" || config?.db_type === "oracle" || config?.db_type === "sqlserver") && node.schema
? `${quoteIdent(node.schema)}.${quoteIdent(node.label)}`
: quoteIdent(node.label);
const tabId = queryStore.createTab(node.connectionId, node.database, node.label, "data");
queryStore.setExecuting(tabId, true);
const querySchema = node.schema || node.database;
const columns = await api.getColumns(node.connectionId, node.database, querySchema, node.label);
const pks = columns.filter((c) => c.is_primary_key).map((c) => c.name);
const order = pks.length ? ` ORDER BY ${pks.map((pk) => `${quoteIdent(pk)} ASC`).join(", ")}` : "";
let sql: string;
if (config?.db_type === "oracle") {
sql = `SELECT * FROM ${qualifiedName}${order} FETCH FIRST 100 ROWS ONLY`;
} else if (config?.db_type === "sqlserver") {
sql = `SELECT TOP 100 * FROM ${qualifiedName}${order}`;
} else {
sql = `SELECT * FROM ${qualifiedName}${order} LIMIT 100;`;
try {
await connectionStore.ensureConnected(node.connectionId);
if (!config) throw new Error("Connection config not found");
const qualifiedName = (config.db_type === "postgres" || config.db_type === "oracle" || config.db_type === "sqlserver") && node.schema
? `${quoteIdent(node.schema)}.${quoteIdent(node.label)}`
: quoteIdent(node.label);
const querySchema = node.schema || node.database;
const columns = await api.getColumns(node.connectionId, node.database, querySchema, node.label);
const pks = columns.filter((c) => c.is_primary_key).map((c) => c.name);
const order = pks.length ? ` ORDER BY ${pks.map((pk) => `${quoteIdent(pk)} ASC`).join(", ")}` : "";
let sql: string;
if (config.db_type === "oracle") {
sql = `SELECT * FROM ${qualifiedName}${order} FETCH FIRST 100 ROWS ONLY`;
} else if (config.db_type === "sqlserver") {
sql = `SELECT TOP 100 * FROM ${qualifiedName}${order}`;
} else {
sql = `SELECT * FROM ${qualifiedName}${order} LIMIT 100;`;
}
queryStore.updateSql(tabId, sql);
queryStore.setTableMeta(tabId, {
schema: node.schema,
tableName: node.label,
columns,
primaryKeys: pks,
});
await queryStore.executeTabSql(tabId, sql);
} catch (e: any) {
queryStore.setErrorResult(tabId, e);
}
queryStore.updateSql(tabId, sql);
queryStore.setTableMeta(tabId, {
schema: node.schema,
tableName: node.label,
columns,
primaryKeys: pks,
});
queryStore.executeCurrentTab();
}
async function newQuery() {
src/stores/queryStore.ts
+31 -7
View File
@@ -95,6 +95,27 @@ export const useQueryStore = defineStore("query", () => {
if (tab) tab.tableMeta = meta;
}
function setExecuting(id: string, isExecuting: boolean) {
const tab = tabs.value.find((t) => t.id === id);
if (tab) tab.isExecuting = isExecuting;
}
function toErrorResult(e: any): NonNullable<QueryTab["result"]> {
return {
columns: ["Error"],
rows: [[String(e)]],
affected_rows: 0,
execution_time_ms: 0,
};
}
function setErrorResult(id: string, e: any) {
const tab = tabs.value.find((t) => t.id === id);
if (!tab) return;
tab.result = toErrorResult(e);
tab.isExecuting = false;
}
async function executeCurrentTab() {
const tab = tabs.value.find((t) => t.id === activeTabId.value);
if (!tab || !tab.sql.trim()) return;
@@ -103,7 +124,12 @@ export const useQueryStore = defineStore("query", () => {
}
async function executeCurrentSql(sql: string) {
const tab = tabs.value.find((t) => t.id === activeTabId.value);
if (!activeTabId.value) return;
await executeTabSql(activeTabId.value, sql);
}
async function executeTabSql(id: string, sql: string) {
const tab = tabs.value.find((t) => t.id === id);
if (!tab || !sql.trim()) return;
tab.isExecuting = true;
@@ -111,12 +137,7 @@ export const useQueryStore = defineStore("query", () => {
try {
tab.result = await api.executeQuery(tab.connectionId, tab.database, sql);
} catch (e: any) {
tab.result = {
columns: ["Error"],
rows: [[String(e)]],
affected_rows: 0,
execution_time_ms: 0,
};
tab.result = toErrorResult(e);
} finally {
tab.isExecuting = false;
}
@@ -143,7 +164,10 @@ export const useQueryStore = defineStore("query", () => {
updateDatabase,
updateConnection,
setTableMeta,
setExecuting,
setErrorResult,
executeCurrentTab,
executeCurrentSql,
executeTabSql,
};
});