fix(grid): unify DataGrid theme backgrounds

This commit is contained in:
lxk955 authored and GitHub committed 2026-10-03 23:26:15 +08:00
1 parent 4c7f8e8196
commit 233f7f7716
3 files changed
+61 -19

No files matched your search

+17 -18
View File
@@ -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 {
@@ -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)");