From 9c23e3198bae91b1135fd78f9bad749d69d80709 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Sun, 27 Sep 2026 11:48:25 +0000 Subject: [PATCH] feat(redis): add command-line query result mode Closes #10099 --- .../src/components/layout/ContentArea.vue | 23 +++- .../layout/QueryResultViewSwitcher.vue | 40 ++++++- .../__tests__/QueryResultViewSwitcher.spec.ts | 81 +++++++++++++ .../src/components/redis/RedisKeyBrowser.vue | 2 +- .../redis/RedisQueryConsoleOutput.spec.ts | 37 ++++++ .../redis/RedisQueryConsoleOutput.vue | 39 ++++++ .../__tests__/useSqlExecution.spec.ts | 24 ++++ .../src/composables/useSqlExecution.ts | 3 +- .../__tests__/app/openTabsPersistence.spec.ts | 4 +- .../lib/__tests__/tabs/tabResultCache.spec.ts | 13 ++ .../src/lib/__tests__/tabs/tabUiState.spec.ts | 6 + .../src/lib/app/openTabsPersistence.ts | 2 + .../src/lib/redis/redisQueryResult.spec.ts | 66 ++++++++++- .../desktop/src/lib/redis/redisQueryResult.ts | 52 ++++---- .../src/lib/redis/redisValuePresentation.ts | 111 +++++++++++++++++- apps/desktop/src/lib/tabs/tabResultCache.ts | 4 + apps/desktop/src/lib/tabs/tabUiState.ts | 1 + apps/desktop/src/stores/queryStore.ts | 15 ++- apps/desktop/src/types/database.ts | 6 + 19 files changed, 488 insertions(+), 41 deletions(-) create mode 100644 apps/desktop/src/components/layout/__tests__/QueryResultViewSwitcher.spec.ts create mode 100644 apps/desktop/src/components/redis/RedisQueryConsoleOutput.spec.ts create mode 100644 apps/desktop/src/components/redis/RedisQueryConsoleOutput.vue diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue index 1219f68f03..9e30c8af08 100644 --- a/apps/desktop/src/components/layout/ContentArea.vue +++ b/apps/desktop/src/components/layout/ContentArea.vue @@ -96,6 +96,7 @@ function preloadDataGridComponent() { const QueryEditor = defineAsyncComponent({ loader: () => import("@/components/editor/QueryEditor.vue"), loadingComponent: QueryLoadingState, delay: 0 }); const DataGrid = defineAsyncComponent(loadDataGridComponent); const RedisKeyBrowser = defineAsyncComponent(() => import("@/components/redis/RedisKeyBrowser.vue")); +const RedisQueryConsoleOutput = defineAsyncComponent(() => import("@/components/redis/RedisQueryConsoleOutput.vue")); const RedisDashboard = defineAsyncComponent(() => import("@/components/redis/RedisDashboard.vue")); const EtcdKeyBrowser = defineAsyncComponent(() => import("@/components/etcd/EtcdKeyBrowser.vue")); const EtcdDashboard = defineAsyncComponent(() => import("@/components/etcd/EtcdDashboard.vue")); @@ -186,7 +187,7 @@ import { loadObjectDdl } from "@/lib/metadata/objectDdlCache"; import { formatDdlForDisplay } from "@/lib/sql/ddlDisplay"; import { sqlObjectNavigationTypeFromTableType } from "@/lib/sql/sqlNavigation"; import type { CustomSaveHandler } from "@/composables/useDataGridEditor"; -import type { QueryMessage, QueryTab, TableInfoTab, TreeNode, VectorCollectionMeta } from "@/types/database"; +import type { QueryMessage, QueryTab, RedisResultViewMode, TableInfoTab, TreeNode, VectorCollectionMeta } from "@/types/database"; import type { SqlObjectNavigationTarget } from "@/lib/sql/sqlNavigation"; import { sqlFormatDialectForDbType, type SqlFormatDialect } from "@/lib/sql/sqlFormatter"; import { productionContextForDatabase } from "@/lib/database/productionSafety"; @@ -613,6 +614,9 @@ const hasTabularResult = computed(() => { if (props.activeTab.result?.columns.length && props.activeTab.result.server_message !== true) return true; return visibleResultItems.value.length > 0; }); +const redisConsoleResults = computed(() => (props.activeTab.results?.length ? props.activeTab.results : props.activeTab.result ? [props.activeTab.result] : [])); +const canShowRedisConsoleOutput = computed(() => activeEffectiveDatabaseType.value === "redis" && (props.activeTab.isExecuting || redisConsoleResults.value.some((result) => result.execution_error === true || typeof result.redis_console_output === "string"))); +const redisResultViewMode = computed(() => (activeEffectiveDatabaseType.value === "redis" ? (props.activeTab.uiState?.redisResultViewMode ?? "grid") : "grid")); const canShowResultOutput = computed(() => hasTabularResult.value || props.activeTab.isExecuting); const canShowExplainOutput = computed(() => !!props.activeTab.explainPlan || !!props.activeTab.explainError || !!props.activeTab.explainTableResult || !!props.activeTab.explainTableError || props.activeTab.isExplaining === true); // A batch can attach server messages to more than one statement result (for @@ -626,7 +630,7 @@ const resultMessages = computed(() => { }); const resultMessageCount = computed(() => resultMessages.value.length); const canShowMessagesOutput = computed(() => resultMessageCount.value > 0); -const showStandaloneResultToolbar = computed(() => activeElasticsearchJsonResponse.value || props.activeOutputView !== "result" || !props.activeTab.result || !hasTabularResult.value); +const showStandaloneResultToolbar = computed(() => activeElasticsearchJsonResponse.value || props.activeOutputView !== "result" || (redisResultViewMode.value === "console" && canShowRedisConsoleOutput.value) || !props.activeTab.result || !hasTabularResult.value); const standaloneResultToolbarCompact = computed(() => isDataGridToolbarCompact(standaloneResultToolbarWidth.value, standaloneResultToolbarViewportWidth.value)); let standaloneResultToolbarResizeObserver: ResizeObserver | undefined; @@ -635,6 +639,11 @@ function updateStandaloneResultToolbarDimensions() { standaloneResultToolbarViewportWidth.value = typeof window === "undefined" ? 0 : window.innerWidth; } +function setRedisResultViewMode(mode: RedisResultViewMode) { + if (activeEffectiveDatabaseType.value !== "redis") return; + queryStore.updateTabUiState(props.activeTab.id, { redisResultViewMode: mode }); +} + function observeStandaloneResultToolbar() { standaloneResultToolbarResizeObserver?.disconnect(); standaloneResultToolbarResizeObserver = undefined; @@ -1817,7 +1826,7 @@ defineExpose({
- +
+ +