github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-15 14:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(grid): dim null cells consistently without type colors

Browse Source
This commit is contained in:
zipg authored and GitHub committed 2026-09-13 19:46:12 +08:00
1 parent 45ed1047a8
commit a33768ef6e
2 files changed
+15 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/desktop/src/components/grid/DataGrid.vue
+6 -6
View File
@@ -2018,14 +2018,14 @@ const columnAligns = computed<("left" | "right")[]>(() => {
function gridCellTextColorClass(item: RowItem, actualColIdx: number, visibleColIdx: number): string {
const value = item.data[actualColIdx];
const isMongoDocumentNull = props.mongoCollectionGrid === true && value === MONGO_DOCUMENT_GRID_NULL;
if (isMongoDocumentNull) return "text-muted-foreground italic";
const isGridNull = value === null || (props.mongoCollectionGrid === true && value === MONGO_DOCUMENT_GRID_NULL);
if (isGridNull) return "text-muted-foreground italic";
if (!colorizeDataGridCellTypes.value) return "text-foreground";
const checkbox = booleanCellsUseCheckbox.value && isBooleanGridCell(item, actualColIdx) && value !== null;
return dataGridCellTextClass({
colorizeTypes: colorizeDataGridCellTypes.value,
typeKind: allColumnTypeVisualKinds.value[actualColIdx] ?? "unknown",
isNull: value === null,
isNull: isGridNull,
isDraft: item.isDraft && value === null,
isEditing: editingCell.value?.rowId === item.id && editingCell.value.col === actualColIdx,
isControl: checkbox,
@@ -2041,13 +2041,13 @@ function transposeCellTextColorClass(recordIndex: number, actualColIdx: number):
const item = displayItems.value[recordIndex];
if (!item) return "text-foreground";
const value = item.data[actualColIdx];
const isMongoDocumentNull = props.mongoCollectionGrid === true && value === MONGO_DOCUMENT_GRID_NULL;
if (isMongoDocumentNull) return "text-muted-foreground italic";
const isGridNull = value === null || (props.mongoCollectionGrid === true && value === MONGO_DOCUMENT_GRID_NULL);
if (isGridNull) return "text-muted-foreground italic";
if (!colorizeDataGridCellTypes.value) return "text-foreground";
return dataGridCellTextClass({
colorizeTypes: colorizeDataGridCellTypes.value,
typeKind: allColumnTypeVisualKinds.value[actualColIdx] ?? "unknown",
isNull: value === null,
isNull: isGridNull,
isDraft: item.isDraft && value === null,
isEditing: editingCell.value?.rowId === item.id && editingCell.value.col === actualColIdx,
isControl: booleanCellsUseCheckbox.value && isBooleanGridCell(item, actualColIdx) && value !== null,