From 233f7f771602211c181aa6a1e44230356fb6a692 Mon Sep 17 00:00:00 2001 From: lxk955 <164191365+lxk955@users.noreply.github.com> Date: Sat, 3 Oct 2026 23:26:15 +0800 Subject: [PATCH] fix(grid): unify DataGrid theme backgrounds --- apps/desktop/src/components/grid/DataGrid.vue | 35 ++++++++-------- .../src/lib/dataGrid/dataGridPaintTheme.ts | 4 +- .../dataGridBackgroundConsistency.test.ts | 41 +++++++++++++++++++ 3 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 packages/app-tests/dataGridBackgroundConsistency.test.ts diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 72824f0079..3523e4e7d8 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -7027,9 +7027,7 @@ function dataGridRowStyle(item: RowItem): CSSProperties { : "rgb(243, 243, 243)" : item.displayIndex % 2 === 1 ? `var(--data-grid-row-muted-bg, ${dark ? DATA_GRID_DARK_STRIPED_ROW_BG : DATA_GRID_LIGHT_STRIPED_ROW_BG})` - : dark - ? "rgb(19, 20, 22)" - : "rgb(255, 255, 255)"; + : "var(--data-grid-background)"; const rowNumberBg = item.status === "new" ? dark @@ -14911,6 +14909,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val @reference "../../styles/globals.css"; [data-grid-root] { + --data-grid-background: var(--background-solid, var(--background)); --data-grid-row-muted-bg: rgb(240, 240, 240); --data-grid-row-new-bg: rgb(243, 243, 243); --data-grid-row-deleted-bg: rgb(255, 244, 244); @@ -14935,7 +14934,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val --data-grid-scrollbar-thumb: color-mix(in oklch, var(--foreground) 30%, transparent); --data-grid-scrollbar-thumb-hover: color-mix(in oklch, var(--foreground) 48%, transparent); --data-grid-scrollbar-track: transparent; - background-color: rgb(255, 255, 255); + background-color: var(--data-grid-background); } [data-grid-root].data-grid--has-save-error { @@ -14969,7 +14968,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val --data-grid-scrollbar-thumb: rgb(82, 82, 91); --data-grid-scrollbar-thumb-hover: rgb(113, 113, 122); --data-grid-scrollbar-track: rgb(24, 24, 27); - background-color: rgb(19, 20, 22); + background-color: var(--data-grid-background); } [data-grid-root].data-grid--dark.data-grid--has-save-error, @@ -15081,7 +15080,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val /* 冻结列:不透明背景遮挡滚动的非冻结列;状态 class 的 !important 会覆盖此项 */ .data-grid-cell--frozen { - background-color: var(--data-grid-cell-bg, rgb(255, 255, 255)) !important; + background-color: var(--data-grid-cell-bg, var(--data-grid-background)) !important; } /* 冻结列分隔线:与 Canvas 模式和列头一致(2px 深色右边框) */ @@ -15206,21 +15205,21 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val .canvas-grid-scroller.has-horizontal-scrollbar { margin-bottom: 10px; - box-shadow: 0 10px 0 0 rgb(255, 255, 255); + box-shadow: 0 10px 0 0 var(--data-grid-background); } .canvas-grid-scroller { - background-color: rgb(255, 255, 255); + background-color: var(--data-grid-background); } [data-grid-root].data-grid--dark .canvas-grid-scroller, :global(.dark) [data-grid-root] .canvas-grid-scroller { - background-color: rgb(19, 20, 22) !important; + background-color: var(--data-grid-background) !important; } [data-grid-root].data-grid--dark .canvas-grid-scroller.has-horizontal-scrollbar, :global(.dark) [data-grid-root] .canvas-grid-scroller.has-horizontal-scrollbar { - box-shadow: 0 10px 0 0 rgb(19, 20, 22); + box-shadow: 0 10px 0 0 var(--data-grid-background); } .data-grid-scroller.has-horizontal-scrollbar:not(.canvas-grid-scroller) { @@ -15228,24 +15227,24 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val } .data-grid-scroller:not(.canvas-grid-scroller) { - background-color: rgb(255, 255, 255); + background-color: var(--data-grid-background); } [data-grid-root].data-grid--dark .data-grid-scroller:not(.canvas-grid-scroller), :global(.dark) [data-grid-root] .data-grid-scroller:not(.canvas-grid-scroller) { - background-color: rgb(19, 20, 22) !important; + background-color: var(--data-grid-background) !important; } .data-grid-scroller:not(.canvas-grid-scroller) :deep(.vue-recycle-scroller__item-wrapper), .data-grid-scroller:not(.canvas-grid-scroller) :deep(.vue-recycle-scroller__item-view) { - background-color: rgb(255, 255, 255); + background-color: var(--data-grid-background); } [data-grid-root].data-grid--dark .data-grid-scroller:not(.canvas-grid-scroller) :deep(.vue-recycle-scroller__item-wrapper), [data-grid-root].data-grid--dark .data-grid-scroller:not(.canvas-grid-scroller) :deep(.vue-recycle-scroller__item-view), :global(.dark) [data-grid-root] .data-grid-scroller:not(.canvas-grid-scroller) :deep(.vue-recycle-scroller__item-wrapper), :global(.dark) [data-grid-root] .data-grid-scroller:not(.canvas-grid-scroller) :deep(.vue-recycle-scroller__item-view) { - background-color: rgb(19, 20, 22) !important; + background-color: var(--data-grid-background) !important; } .data-grid-scroller :deep(.vue-recycle-scroller__item-wrapper) { @@ -15255,7 +15254,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val [data-grid-root].data-grid--dark .data-grid-scroller :deep(.vue-recycle-scroller__item-wrapper), [data-grid-root].data-grid--dark .data-grid-scroller :deep(.vue-recycle-scroller__item-view) { - background-color: rgb(19, 20, 22) !important; + background-color: var(--data-grid-background) !important; } .data-grid-scroller :deep(.vue-recycle-scroller__item-view) { @@ -15286,12 +15285,12 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val height: 10px; cursor: pointer; touch-action: none; - background-color: rgb(255, 255, 255); + background-color: var(--data-grid-background); } [data-grid-root].data-grid--dark .data-grid-horizontal-scrollbar, :global(.dark) [data-grid-root] .data-grid-horizontal-scrollbar { - background-color: rgb(19, 20, 22) !important; + background-color: var(--data-grid-background) !important; } .data-grid-horizontal-scrollbar::before { @@ -15359,7 +15358,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val } :global(.dark) [data-grid-root] .data-grid-vertical-scrollbar { - background-color: rgb(19, 20, 22); + background-color: var(--data-grid-background); } .data-grid-vertical-scrollbar__thumb { diff --git a/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts b/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts index 46af044c76..c2de1026dc 100644 --- a/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts +++ b/apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts @@ -260,7 +260,9 @@ function paintToken(getVar: (name: string) => string, name: string, fallback: st export function resolveDataGridPaintTheme(options: { getVar: (name: string) => string; isDark: boolean }): DataGridPaintTheme { const { getVar, isDark } = options; - const background = cssVarColor(getVar, "--background", isDark ? "rgb(19, 20, 22)" : "rgb(255, 255, 255)"); + const defaultBackground = isDark ? "rgb(19, 20, 22)" : "rgb(255, 255, 255)"; + const solidBackground = cssVarColor(getVar, "--background-solid", cssVarColor(getVar, "--background", defaultBackground)); + const background = paintToken(getVar, "--data-grid-background", solidBackground); const foreground = cssVarColor(getVar, "--foreground", isDark ? "rgb(215, 215, 219)" : "rgb(10, 10, 10)"); const mutedForeground = cssVarColor(getVar, "--muted-foreground", isDark ? "rgb(151, 152, 157)" : "rgb(115, 115, 115)"); const primary = cssVarColor(getVar, "--primary", isDark ? "rgb(208, 208, 214)" : "rgb(23, 23, 23)"); diff --git a/packages/app-tests/dataGridBackgroundConsistency.test.ts b/packages/app-tests/dataGridBackgroundConsistency.test.ts new file mode 100644 index 0000000000..3e4725bd39 --- /dev/null +++ b/packages/app-tests/dataGridBackgroundConsistency.test.ts @@ -0,0 +1,41 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import { test } from "vitest"; +import { resolveDataGridPaintTheme } from "../../apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts"; + +test("DataGrid DOM surfaces use one opaque theme background", () => { + const source = readFileSync("apps/desktop/src/components/grid/DataGrid.vue", "utf8"); + + assert.match(source, /\[data-grid-root\]\s*\{[^}]*--data-grid-background:\s*var\(--background-solid,\s*var\(--background\)\);[^}]*background-color:\s*var\(--data-grid-background\);/s); + assert.match(source, /\[data-grid-root\]\.data-grid--dark,\s*:global\(\.dark\)\s*\[data-grid-root\]\s*\{[^}]*background-color:\s*var\(--data-grid-background\);/s); + + assert.match(source, /\.canvas-grid-scroller\s*\{[^}]*background-color:\s*var\(--data-grid-background\);/s); + assert.match(source, /\.data-grid-scroller:not\(\.canvas-grid-scroller\)\s*\{[^}]*background-color:\s*var\(--data-grid-background\);/s); + assert.match(source, /\.data-grid-scroller:not\(\.canvas-grid-scroller\)\s+:deep\(\.vue-recycle-scroller__item-wrapper\),[^}]*background-color:\s*var\(--data-grid-background\);/s); + + assert.match(source, /\.data-grid-cell--frozen\s*\{[^}]*background-color:\s*var\(--data-grid-cell-bg,\s*var\(--data-grid-background\)\)\s*!important;/s); + assert.match(source, /\.data-grid-horizontal-scrollbar\s*\{[^}]*background-color:\s*var\(--data-grid-background\);/s); + assert.match(source, /:global\(\.dark\)\s*\[data-grid-root\]\s+\.data-grid-vertical-scrollbar\s*\{[^}]*background-color:\s*var\(--data-grid-background\);/s); + + assert.match(source, /item\.displayIndex % 2 === 1[\s\S]*?:\s*"var\(--data-grid-background\)";/); + + assert.doesNotMatch(source, /(?:canvas-grid-scroller|data-grid-scroller)[^}]*background-color:\s*var\(--background\)/s); +}); + +test("DataGrid canvas background stays opaque when the wallpaper background has alpha", () => { + const getThemeBackground = (varBackground: string, solidBackground: string, dataGridBackground: string, isDark: boolean) => { + return resolveDataGridPaintTheme({ + getVar: (name) => + ({ + "--background": varBackground, + "--background-solid": solidBackground, + "--data-grid-background": dataGridBackground, + })[name] ?? "", + isDark, + }).background; + }; + + assert.equal(getThemeBackground("rgb(43 43 43 / 0.05)", "rgb(43 43 43)", "rgb(43 43 43)", true), "rgb(43, 43, 43)"); + assert.equal(getThemeBackground("rgb(255 252 242 / 0.3)", "rgb(255 252 242)", "", false), "rgb(255, 252, 242)"); + assert.equal(getThemeBackground("rgb(30, 30, 30)", "", "", true), "rgb(30, 30, 30)"); +});