feat(grid): refine boolean editing and copy actions

This commit is contained in:
t8y2 committed 2026-08-05 14:22:52 +08:00
1 parent d65d712089
commit f67f02e107
16 files changed
+188 -279

No files matched your search

@@ -1,7 +1,6 @@
import { firstLineCellDisplayValue, type CellValue } from "@/lib/dataGrid/cellValue";
import type { RowStatus } from "@/lib/dataGrid/gridRowStatus";
import { DATA_GRID_DARK_SEARCH_COLORS, resolveDataGridPaintTheme, type DataGridPaintTheme } from "@/lib/dataGrid/dataGridPaintTheme";
import { BOOLEAN_CHECKBOX_SIZE, isBooleanCheckboxValue, normalizeBooleanCellValue } from "@/lib/dataGrid/dataGridBooleanColumn";
export const CANVAS_DATA_GRID_ROW_HEIGHT = 26;
@@ -73,7 +72,6 @@ export interface DrawCanvasDataGridOptions {
searchMatchKeys: ReadonlySet<number>;
currentSearchMatch: CanvasSearchMatch | null;
formatCell: (value: CellValue, columnIndex: number) => string;
columnIsBoolean?: (columnIndex: number) => boolean;
draftCellPlaceholder?: string;
isRowActive: (rowIndex: number) => boolean;
rowCellsUseSelectionVisual: (rowId: number) => boolean;
@@ -228,29 +226,6 @@ function alignCanvasPixel(value: number, dpr: number): number {
return Math.round(value * dpr) / dpr;
}
function drawBooleanCheckbox(ctx: CanvasRenderingContext2D, options: { drawX: number; y: number; colWidth: number; scaleX: number; scaleY: number; theme: DataGridPaintTheme; checked: boolean }): void {
const { drawX, y, colWidth, scaleX, scaleY, theme, checked } = options;
const size = BOOLEAN_CHECKBOX_SIZE;
const boxX = alignCanvasPixel(drawX + (colWidth - size) / 2, scaleX);
const boxY = alignCanvasPixel(y + (CANVAS_DATA_GRID_ROW_HEIGHT - size) / 2, scaleY);
ctx.lineWidth = 1;
if (checked) {
ctx.fillStyle = theme.primary;
ctx.fillRect(boxX, boxY, size, size);
ctx.strokeStyle = theme.background;
ctx.lineWidth = 2;
ctx.beginPath();
ctx.moveTo(boxX + 3, boxY + size / 2);
ctx.lineTo(boxX + size / 2 - 0.5, boxY + size - 3.5);
ctx.lineTo(boxX + size - 2.5, boxY + 3);
ctx.stroke();
ctx.lineWidth = 1;
} else {
ctx.strokeStyle = theme.mutedForeground;
ctx.strokeRect(boxX + 0.5, boxY + 0.5, size - 1, size - 1);
}
}
function crispCanvasLine(value: number, dpr: number): number {
return alignCanvasPixel(value, dpr) + 0.5 / dpr;
}
@@ -335,7 +310,6 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions) {
frozenColumnCount = 0,
columnAligns,
rightAlignedActionCell,
columnIsBoolean,
} = options;
const fallbackRatio = Math.max(1, options.pixelRatio ?? window.devicePixelRatio ?? 1);
const { pixelWidth, pixelHeight, scaleX, scaleY } = resolveCanvasBackingStoreMetrics({
@@ -502,43 +476,26 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions) {
ctx.rect(clippedX, y, Math.min(cellPaintWidth, width - clippedX), CANVAS_DATA_GRID_ROW_HEIGHT);
ctx.clip();
const value = item.data[actualColIdx];
const isBooleanCell = columnIsBoolean?.(actualColIdx) === true && isBooleanCheckboxValue(value);
const isRightAlign = columnAligns?.[visibleColIdx] === "right";
const isEditingThisCell = editingCell?.rowId === item.id && editingCell.col === actualColIdx;
const isBooleanNullCell = isBooleanCell && value === null && !isEditingThisCell;
ctx.textAlign = isBooleanNullCell ? "center" : isRightAlign ? "right" : "left";
ctx.textAlign = isRightAlign ? "right" : "left";
ctx.fillStyle = value === null ? theme.mutedForeground : theme.foreground;
ctx.font = value === null ? italicFont : tabularFont;
setCanvasNumericVariant(ctx, value === null ? "normal" : "tabular-nums");
const reservedWidth = rightAlignedActionCell?.rowIndex === item.displayIndex && rightAlignedActionCell.visibleColIdx === visibleColIdx ? rightAlignedActionCell.reservedWidth : 0;
const { textAnchorX, maxWidth: cellMaxWidth } = resolveCanvasCellTextLayout({ drawX, colWidth, dpr: scaleX, isRightAlign, reservedWidth });
if (isBooleanCell && value !== null && !isEditingThisCell) {
drawBooleanCheckbox(ctx, { drawX, y, colWidth, scaleX, scaleY, theme, checked: normalizeBooleanCellValue(value) === true });
if (item.isDeleted) {
const boxX = alignCanvasPixel(drawX + (colWidth - BOOLEAN_CHECKBOX_SIZE) / 2, scaleX);
const strikeY = alignCanvasPixel(y + CANVAS_DATA_GRID_ROW_HEIGHT / 2, scaleY);
ctx.strokeStyle = theme.foreground;
ctx.lineWidth = 1;
ctx.beginPath();
ctx.moveTo(boxX - 1, strikeY);
ctx.lineTo(alignCanvasPixel(boxX + BOOLEAN_CHECKBOX_SIZE + 1, scaleX), strikeY);
ctx.stroke();
}
} else {
const rawDisplayText = item.isDraft && value === null ? (draftCellPlaceholder ?? "") : formatCell(value, actualColIdx);
const displayText = isEditingThisCell ? "" : firstLineCellDisplayValue(rawDisplayText);
const text = isEditingThisCell ? displayText : fitCanvasText(ctx, displayText, cellMaxWidth, isBooleanNullCell ? "left" : isRightAlign ? "right" : "left");
const anchorX = isBooleanNullCell ? alignCanvasPixel(drawX + colWidth / 2, scaleX) : textAnchorX;
ctx.fillText(text, anchorX, textY);
if (item.isDeleted && text) {
const textWidth = ctx.measureText(text).width;
const lineStartX = isBooleanNullCell ? anchorX - textWidth / 2 : isRightAlign ? textAnchorX - textWidth : textAnchorX;
ctx.strokeStyle = theme.foreground;
ctx.beginPath();
ctx.moveTo(lineStartX, textY);
ctx.lineTo(alignCanvasPixel(lineStartX + textWidth, scaleX), textY);
ctx.stroke();
}
const rawDisplayText = item.isDraft && value === null ? (draftCellPlaceholder ?? "") : formatCell(value, actualColIdx);
const displayText = isEditingThisCell ? "" : firstLineCellDisplayValue(rawDisplayText);
const text = isEditingThisCell ? displayText : fitCanvasText(ctx, displayText, cellMaxWidth, isRightAlign ? "right" : "left");
ctx.fillText(text, textAnchorX, textY);
if (item.isDeleted && text) {
const textWidth = ctx.measureText(text).width;
const lineStartX = isRightAlign ? textAnchorX - textWidth : textAnchorX;
ctx.strokeStyle = theme.foreground;
ctx.beginPath();
ctx.moveTo(lineStartX, textY);
ctx.lineTo(alignCanvasPixel(lineStartX + textWidth, scaleX), textY);
ctx.stroke();
}
ctx.restore();
setCanvasNumericVariant(ctx, "normal");
@@ -1,15 +1,12 @@
import type { DatabaseType } from "@/types/database";
export const BOOLEAN_CHECKBOX_SIZE = 13;
const MYSQL_BIT_BOOLEAN_DATABASE_TYPES = new Set<DatabaseType>(["mysql"]);
export const BOOLEAN_CELL_EDITOR_VALUES = ["true", "false"];
export function isBooleanColumnType(dataType: string | undefined, databaseType?: DatabaseType): boolean {
if (!dataType) return false;
const normalized = dataType.trim().toLowerCase();
if (normalized === "boolean" || normalized === "bool") return true;
if (databaseType === "sqlserver") return normalized === "bit";
if (databaseType && MYSQL_BIT_BOOLEAN_DATABASE_TYPES.has(databaseType)) return normalized === "bit" || normalized === "bit(1)";
return false;
}
@@ -26,26 +23,20 @@ export function normalizeBooleanCellValue(value: unknown): boolean | null {
return null;
}
export function isBooleanCheckboxValue(value: unknown): boolean {
export function isBooleanCellValue(value: unknown): boolean {
return value === null || normalizeBooleanCellValue(value) !== null;
}
export function nextBooleanCellValue(current: unknown, nullable: boolean): boolean | null {
const normalized = normalizeBooleanCellValue(current);
if (normalized === true) return false;
if (normalized === false) return nullable ? null : true;
return true;
export function booleanCellEditorValue(value: unknown): string {
const normalized = normalizeBooleanCellValue(value);
if (normalized === true) return "true";
if (normalized === false) return "false";
return "";
}
export function booleanCheckboxRect(cell: { left: number; top: number; width: number; height: number }): { left: number; top: number; size: number } {
return {
left: cell.left + (cell.width - BOOLEAN_CHECKBOX_SIZE) / 2,
top: cell.top + (cell.height - BOOLEAN_CHECKBOX_SIZE) / 2,
size: BOOLEAN_CHECKBOX_SIZE,
};
}
export function isPointInBooleanCheckbox(point: { x: number; y: number }, cell: { left: number; top: number; width: number; height: number }): boolean {
const rect = booleanCheckboxRect(cell);
return point.x >= rect.left && point.x <= rect.left + rect.size && point.y >= rect.top && point.y <= rect.top + rect.size;
export function parseBooleanCellEditorValue(value: string | null): boolean | null | undefined {
if (value === null) return null;
if (value === "true") return true;
if (value === "false") return false;
return undefined;
}