From 772101921832916b94ae11fba5812a0921dc31c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Thu, 1 Oct 2026 01:04:20 +0800 Subject: [PATCH] feat(grid): improve production watermark and sql formatting --- .../components/common/ProductionWatermark.vue | 37 ++ apps/desktop/src/components/grid/DataGrid.vue | 557 +++++++++--------- .../src/components/hbase/HBaseBrowser.vue | 2 + .../src/components/layout/ContentArea.vue | 30 +- .../src/components/vector/VectorBrowser.vue | 2 +- .../lib/__tests__/sql/sqlFormatter.spec.ts | 18 +- .../src/lib/__tests__/sql/sqlLayout.spec.ts | 63 +- apps/desktop/src/lib/sql/layout/primitives.ts | 102 +++- apps/desktop/src/lib/sql/layout/printer.ts | 38 +- packages/app-tests/sqlFormatter.test.ts | 11 +- 10 files changed, 525 insertions(+), 335 deletions(-) create mode 100644 apps/desktop/src/components/common/ProductionWatermark.vue diff --git a/apps/desktop/src/components/common/ProductionWatermark.vue b/apps/desktop/src/components/common/ProductionWatermark.vue new file mode 100644 index 0000000000..7a7226df7c --- /dev/null +++ b/apps/desktop/src/components/common/ProductionWatermark.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 5fd259d7b4..5b96f8ded3 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -66,6 +66,7 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigge import { Input } from "@/components/ui/input"; import QueryLoadingState from "@/components/common/QueryLoadingState.vue"; import DataGridBusyOverlay from "@/components/grid/DataGridBusyOverlay.vue"; +import ProductionWatermark from "@/components/common/ProductionWatermark.vue"; import CustomContextMenu, { type ContextMenuItem } from "@/components/ui/CustomContextMenu.vue"; import LightDropdownMenu from "@/components/ui/LightDropdownMenu.vue"; import LightTooltip from "@/components/ui/LightTooltip.vue"; @@ -249,6 +250,7 @@ import { dataGridPreviewLabelKey, dataGridSaveActionMode, dataGridSaveToolbarSta import { buildDataGridSavedRowRefreshPlan, dataGridSavedRowRefreshPatches } from "@/lib/dataGrid/dataGridSavedRowRefresh"; import type { QueryEditabilityReason } from "@/lib/sql/sqlAnalysis"; import { sqlWithoutCommentsForCopy } from "@/lib/sql/sqlWithoutCommentsForCopy"; +import { productionContextForDatabase } from "@/lib/database/productionSafety"; import { EDITOR_FONT_FAMILY_CSS_VAR } from "@/lib/editor/editorThemes"; import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage"; import { @@ -755,6 +757,7 @@ const columnTypeMap = computed(() => { }); const resolvedConnectionConfig = computed(() => connectionStore.getConfig(props.connectionId ?? "")); const resolvedDatabaseType = computed(() => props.databaseType ?? effectiveDatabaseTypeForConnection(resolvedConnectionConfig.value)); +const productionContext = computed(() => productionContextForDatabase(resolvedConnectionConfig.value, props.database)); // The collection grid and Mongo query-result grids share the document-grid value // encoding (BSON null sentinel + JSON-prefixed containers), so every display, // editor and clipboard path must decode it whenever MongoDB values are on screen. @@ -12757,294 +12760,301 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val - - -