From 228a0098f1b4aa35fce0fcb9711a1977d47f2b0e Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Sun, 14 Jun 2026 15:26:26 +0800 Subject: [PATCH] fix(ui): increase toast z-index to appear above dialogs --- apps/desktop/src/App.vue | 60 +++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index 5142e4ba4..54e9481b1 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -262,7 +262,10 @@ const saveSqlFolders = computed(() => { } return parts.join(" / "); }; - return savedSqlStore.allFoldersTreeOrder.map((folder) => ({ ...folder, displayName: pathForFolder(folder.id) || folder.name })); + return savedSqlStore.allFoldersTreeOrder.map((folder) => ({ + ...folder, + displayName: pathForFolder(folder.id) || folder.name, + })); }); async function applyUiScale(scale: number) { @@ -307,7 +310,11 @@ watch( () => queryStore.activeTabId, (id, previousId) => { if (previousId && previousId !== id && typeof window !== "undefined") { - window.dispatchEvent(new CustomEvent("dbx:before-tab-switch", { detail: { tabId: id, fromTabId: previousId } })); + window.dispatchEvent( + new CustomEvent("dbx:before-tab-switch", { + detail: { tabId: id, fromTabId: previousId }, + }), + ); } if (id) newQueryContextSource.value = "tab"; selectedSql.value = ""; @@ -513,7 +520,10 @@ async function openSqlFile() { try { if (isTauriRuntime()) { const { open } = await import("@tauri-apps/plugin-dialog"); - const path = await open({ filters: [{ name: "SQL", extensions: ["sql"] }], multiple: false }); + const path = await open({ + filters: [{ name: "SQL", extensions: ["sql"] }], + multiple: false, + }); if (path) { const content = await api.readExternalSqlFile(path as string); queryStore.updateSql(tab.id, content); @@ -660,7 +670,12 @@ async function openConnectionDeepLink(url: string) { connectionDialogPrefill.value = draft; showConnectionDialog.value = true; } catch (e: any) { - toast(t("connection.parseConnectionUrlFailed", { message: e?.message || String(e) }), 5000); + toast( + t("connection.parseConnectionUrlFailed", { + message: e?.message || String(e), + }), + 5000, + ); } } @@ -701,7 +716,12 @@ async function newQuery() { queryStore.updateDatabase(tabId, resolveDefaultDatabase(conn, options)); } } catch (e: any) { - toast(t("connection.connectFailed", { message: translateBackendError(t, e?.message || String(e)) }), 5000); + toast( + t("connection.connectFailed", { + message: translateBackendError(t, e?.message || String(e)), + }), + 5000, + ); } } @@ -715,7 +735,12 @@ async function openConnectionQuery(connectionId: string) { const options = await getDatabaseOptions(connectionId); queryStore.updateDatabase(tabId, resolveDefaultDatabase(connection, options)); } catch (e: any) { - toast(t("connection.connectFailed", { message: translateBackendError(t, e?.message || String(e)) }), 5000); + toast( + t("connection.connectFailed", { + message: translateBackendError(t, e?.message || String(e)), + }), + 5000, + ); } } @@ -761,7 +786,12 @@ async function changeActiveConnection(connectionId: string) { const options = await getDatabaseOptions(connectionId); queryStore.updateDatabase(tab.id, resolveDefaultDatabase(connection, options)); } catch (e: any) { - toast(t("connection.connectFailed", { message: translateBackendError(t, e?.message || String(e)) }), 5000); + toast( + t("connection.connectFailed", { + message: translateBackendError(t, e?.message || String(e)), + }), + 5000, + ); } } @@ -1277,7 +1307,15 @@ onUnmounted(() => { @danger-confirm="onDangerConfirm" @connect-started="(name: string) => toast(t('connection.connecting', { name }), 30000)" @connect-succeeded="(name: string) => toast(t('connection.connectSuccess', { name }), 2000)" - @connect-failed="(msg: string) => toast(t('connection.connectFailed', { message: translateBackendError(t, msg) }), 5000)" + @connect-failed=" + (msg: string) => + toast( + t('connection.connectFailed', { + message: translateBackendError(t, msg), + }), + 5000, + ) + " @open-driver-store=" setConnectionDialogOpen(false); showDriverStore = true; @@ -1297,12 +1335,14 @@ onUnmounted(() => { @download-and-install="downloadAndInstallUpdate" @restart="restartApp" /> + + -
+
{{ toastMessage }}
-
+