diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index ca61c398b9..a6c9cd7d0c 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -1450,6 +1450,7 @@ async function updateAllAvailable() { } } const hasSqlFileConnections = computed(() => connectionStore.connections.some((c) => supportsSqlFileExecution(c.db_type))); +const welcomePageMode = computed(() => (settingsStore.isEditorSettingsLoaded ? settingsStore.editorSettings.welcomePageMode : "intro")); const queryEditorDdlDatabaseType = computed(() => { if (!queryEditorDdlTarget.value?.connectionId) return undefined; return effectiveDatabaseTypeForConnection(connectionStore.getConfig(queryEditorDdlTarget.value.connectionId)); @@ -1464,11 +1465,11 @@ const queryEditorObjectSourceDatabaseType = computed(() => { const queryEditorObjectSourceDialect = computed(() => codeMirrorSqlDialect(queryEditorObjectSourceDatabaseType.value)); const queryEditorObjectSourceFormatDialect = computed(() => sqlFormatDialectForDbType(queryEditorObjectSourceDatabaseType.value)); const connectionStats = computed(() => ({ - total: connectionStore.connections.length, - connected: connectionStore.connectedIds.size, - types: new Set(connectionStore.connections.map((c) => c.driver_profile || c.db_type)).size, + total: welcomePageMode.value === "workspace" ? connectionStore.connections.length : 0, + connected: welcomePageMode.value === "workspace" ? connectionStore.connectedIds.size : 0, + types: welcomePageMode.value === "workspace" ? new Set(connectionStore.connections.map((c) => c.driver_profile || c.db_type)).size : 0, })); -const recentConnections = computed(() => rankRecentConnections(connectionStore.connections, recentConnectionIds.value)); +const recentConnections = computed(() => (welcomePageMode.value === "workspace" ? rankRecentConnections(connectionStore.connections, recentConnectionIds.value) : [])); function rememberRecentConnection(connectionId: string | null) { if (!connectionId) return; @@ -1481,6 +1482,7 @@ function rememberRecentConnection(connectionId: string | null) { watch(() => connectionStore.activeConnectionId, rememberRecentConnection); const savedSqlHistoryItems = computed(() => { + if (welcomePageMode.value !== "workspace") return []; const folderById = new Map(savedSqlStore.allFolders.map((folder) => [folder.id, folder])); const folderPath = (folderId?: string): string | undefined => { if (!folderId) return undefined; @@ -3246,6 +3248,9 @@ function openGitHub() { function openMcpGuide() { openUrl("https://dbxio.com/cn/docs/mcp"); } +function openDbxWebsite() { + openUrl("https://dbxio.com"); +} function setSidebarOpen(open: boolean) { sidebarOpen.value = open; @@ -4656,6 +4661,7 @@ onUnmounted(() => { :connection-stats="connectionStats" :recent-connections="recentConnections" :saved-sql-history-items="savedSqlHistoryItems" + :welcome-page-mode="welcomePageMode" :app-version="appVersion" :can-new-query="canCreateNewQuery" @open-connection-query="openConnectionQuery" @@ -4666,6 +4672,8 @@ onUnmounted(() => { @import-config="dialogs.onImportClick" @open-github="openGitHub" @open-mcp-guide="openMcpGuide" + @open-website="openDbxWebsite" + @open-settings="openSettings('appearance', 'welcome-page-settings')" /> diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue index 2240e99367..3af4abc1b9 100644 --- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue +++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue @@ -102,6 +102,7 @@ import { type TabGroupMode, type TabPlacement, type TabSortMode, + type WelcomePageMode, type UpdateDownloadSource, type CsvQuoteMode, type CsvNullMode, @@ -711,6 +712,7 @@ const editContinueOnErrorOnBatch = ref(settingsStore.editorSettings.continueOnEr const editConfirmUnsavedSqlClose = ref(settingsStore.editorSettings.confirmUnsavedSqlClose); const editAppCloseUnsavedTabsMode = ref(settingsStore.editorSettings.appCloseUnsavedTabsMode); const editSavedSqlOpenTargetMode = ref(settingsStore.editorSettings.savedSqlOpenTargetMode); +const editWelcomePageMode = ref(settingsStore.editorSettings.welcomePageMode); const editAppLayout = ref(settingsStore.editorSettings.appLayout); const editTabLayout = ref(settingsStore.editorSettings.tabLayout); const editTabPlacement = ref(settingsStore.editorSettings.tabPlacement); @@ -1081,6 +1083,7 @@ function currentEditorSettingsDraft(): EditorSettingsDraft { confirmUnsavedSqlClose: editConfirmUnsavedSqlClose.value, appCloseUnsavedTabsMode: editAppCloseUnsavedTabsMode.value, savedSqlOpenTargetMode: editSavedSqlOpenTargetMode.value, + welcomePageMode: editWelcomePageMode.value, appLayout: editAppLayout.value, tabLayout: editTabLayout.value, tabPlacement: editTabPlacement.value, @@ -1752,6 +1755,7 @@ function syncEditorSettingsDraftFromStore() { editConfirmUnsavedSqlClose.value = settingsStore.editorSettings.confirmUnsavedSqlClose; editAppCloseUnsavedTabsMode.value = settingsStore.editorSettings.appCloseUnsavedTabsMode; editSavedSqlOpenTargetMode.value = settingsStore.editorSettings.savedSqlOpenTargetMode; + editWelcomePageMode.value = settingsStore.editorSettings.welcomePageMode; editAppLayout.value = settingsStore.editorSettings.appLayout; editTabLayout.value = settingsStore.editorSettings.tabLayout; editTabPlacement.value = settingsStore.editorSettings.tabPlacement; @@ -1898,6 +1902,7 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = { confirmUnsavedSqlClose: editConfirmUnsavedSqlClose, appCloseUnsavedTabsMode: editAppCloseUnsavedTabsMode, savedSqlOpenTargetMode: editSavedSqlOpenTargetMode, + welcomePageMode: editWelcomePageMode, appLayout: editAppLayout, tabLayout: editTabLayout, tabPlacement: editTabPlacement, @@ -2439,6 +2444,7 @@ function resetDefaultsForTab(tab: SettingsCategory) { editTheme.value = DEFAULT_EDITOR_SETTINGS.theme; editCustomThemes.value = [...DEFAULT_EDITOR_SETTINGS.customThemes]; editActiveCustomThemeId.value = DEFAULT_EDITOR_SETTINGS.activeCustomThemeId; + editWelcomePageMode.value = DEFAULT_EDITOR_SETTINGS.welcomePageMode; editAppLayout.value = DEFAULT_EDITOR_SETTINGS.appLayout; editTabLayout.value = DEFAULT_EDITOR_SETTINGS.tabLayout; editTabPlacement.value = DEFAULT_EDITOR_SETTINGS.tabPlacement; @@ -2592,6 +2598,7 @@ function resetAllDefaults() { editSavedSqlOpenTargetMode.value = DEFAULT_EDITOR_SETTINGS.savedSqlOpenTargetMode; editSqlVariableSubstitutionEnabled.value = DEFAULT_EDITOR_SETTINGS.sqlVariableSubstitutionEnabled; editSqlVariableSyntaxOverrides.value = normalizeSqlVariableSyntaxOverrides(DEFAULT_EDITOR_SETTINGS.sqlVariableSyntaxOverrides); + editWelcomePageMode.value = DEFAULT_EDITOR_SETTINGS.welcomePageMode; editAppLayout.value = DEFAULT_EDITOR_SETTINGS.appLayout; editShowTrayIcon.value = DEFAULT_DESKTOP_SETTINGS.show_tray_icon; editQuitOnClose.value = DEFAULT_DESKTOP_SETTINGS.quit_on_close; @@ -4875,7 +4882,9 @@ const changingPassword = ref(false); async function scrollToInitialSettingsSection() { await nextTick(); - if (props.initialSection === "tableColumnTemplates") { + if (props.initialSection === "welcome-page-settings") { + await revealSettingsSearchTarget({ id: "appearance-welcome-page", category: "appearance", title: t("settings.welcomePage"), description: t("settings.welcomePageDescription"), categoryLabel: t("settings.appearanceTab"), targetId: "welcome-page-settings" }); + } else if (props.initialSection === "tableColumnTemplates") { tableColumnTemplateSectionRef.value?.scrollIntoView({ block: "center", behavior: "smooth", @@ -7424,6 +7433,45 @@ onUnmounted(() => { +
+
+ + +

{{ t("settings.welcomePageDescription") }}

+
+
+
+ + +
+
+ + +
diff --git a/apps/desktop/src/components/layout/WelcomeScreen.vue b/apps/desktop/src/components/layout/WelcomeScreen.vue index 368d479727..f170810a63 100644 --- a/apps/desktop/src/components/layout/WelcomeScreen.vue +++ b/apps/desktop/src/components/layout/WelcomeScreen.vue @@ -1,9 +1,11 @@