feat(grid): improve save error feedback and dirty cell highlighting
This commit is contained in:
1 parent
a2e1128670
commit
27d72f8776
15 files changed
+130
-17
No files matched your search
@@ -66,6 +66,8 @@ describe("data grid paint theme", () => {
|
||||
expect(light.cellSelected).toBe("rgb(239, 246, 255)");
|
||||
expect(light.cellSelectedBorder).toBe("rgb(59, 130, 246)");
|
||||
expect(light.cellSelectedSingle).toBe("rgb(191, 219, 254)");
|
||||
expect(light.cellSelectedDirty).toBe("rgb(235, 224, 184)");
|
||||
expect(light.cellDirty).toBe("rgb(166, 210, 255)");
|
||||
expect(light.rowNumberTextNew).toBe("rgb(0, 122, 85)");
|
||||
expect(light.rowNumberTextEdited).toBe("rgb(187, 77, 0)");
|
||||
expect(contrastRatio(light.cellSelectedBorder, light.cellSelected)).toBeGreaterThanOrEqual(3);
|
||||
@@ -73,6 +75,8 @@ describe("data grid paint theme", () => {
|
||||
expect(dark.cellSelected).toBe("rgb(20, 40, 60)");
|
||||
expect(dark.cellSelectedBorder).toBe("rgb(96, 165, 250)");
|
||||
expect(dark.cellSelectedSingle).toBe("rgb(30, 64, 96)");
|
||||
expect(dark.cellSelectedDirty).toBe("rgb(76, 66, 38)");
|
||||
expect(dark.cellDirty).toBe("rgb(33, 66, 131)");
|
||||
});
|
||||
|
||||
it("honors an explicit --data-grid-cell-selected-border token when provided in light mode", () => {
|
||||
@@ -95,6 +99,19 @@ describe("data grid paint theme", () => {
|
||||
|
||||
expect(theme.cellSelectedBorder).toBe("rgb(37, 99, 235)");
|
||||
});
|
||||
|
||||
it("honors explicit --data-grid-cell-dirty-bg token in dark mode when save error occurs", () => {
|
||||
const vars: Record<string, string> = {
|
||||
"--data-grid-cell-dirty-bg": "rgb(94, 56, 57)",
|
||||
};
|
||||
|
||||
const theme = resolveDataGridPaintTheme({
|
||||
getVar: (name) => vars[name] ?? "",
|
||||
isDark: true,
|
||||
});
|
||||
|
||||
expect(theme.cellDirty).toBe("rgb(94, 56, 57)");
|
||||
});
|
||||
});
|
||||
|
||||
describe("dbx-control-chrome cascade contract", () => {
|
||||
|
||||
@@ -3,7 +3,33 @@ import { join } from "node:path";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { createDataGridRuntimeScope } from "@/lib/dataGrid/dataGridRuntime";
|
||||
|
||||
const dataGridSource = readFileSync(new URL("../../../components/grid/DataGrid.vue", import.meta.url), "utf8");
|
||||
|
||||
function extractFunction(name: string): string {
|
||||
const start = dataGridSource.indexOf(`async function ${name}(`);
|
||||
if (start < 0) throw new Error(`Missing DataGrid function: ${name}`);
|
||||
const bodyStart = dataGridSource.indexOf("{", start);
|
||||
let depth = 0;
|
||||
for (let index = bodyStart; index < dataGridSource.length; index++) {
|
||||
const character = dataGridSource[index];
|
||||
if (character === "{") depth++;
|
||||
if (character === "}" && --depth === 0) return dataGridSource.slice(start, index + 1);
|
||||
}
|
||||
throw new Error(`Unterminated DataGrid function: ${name}`);
|
||||
}
|
||||
|
||||
describe("dataGridRuntime", () => {
|
||||
it("keeps WHERE and ORDER BY execution errors separate from save errors", () => {
|
||||
for (const name of ["applyWhereFilter", "applyOrderBySearch"]) {
|
||||
const source = extractFunction(name);
|
||||
expect(source).toContain('queryControlError.value = ""');
|
||||
expect(source).toContain("queryControlError.value = String(e?.message || e)");
|
||||
expect(source).not.toContain("saveError.value");
|
||||
}
|
||||
expect(dataGridSource).toContain('v-if="queryControlError"');
|
||||
expect(dataGridSource).toContain(":title=\"t('grid.queryError')\"");
|
||||
});
|
||||
|
||||
it("disposes registered resources in reverse order and only once", () => {
|
||||
const scope = createDataGridRuntimeScope();
|
||||
const calls: string[] = [];
|
||||
|
||||
@@ -251,7 +251,7 @@ export function resolveDataGridPaintTheme(options: { getVar: (name: string) => s
|
||||
const rowNew = isDark ? "rgb(51, 51, 55)" : "rgb(243, 243, 243)";
|
||||
const rowDeleted = isDark ? "rgb(55, 31, 32)" : "rgb(255, 244, 244)";
|
||||
const cellActive = activeSurface;
|
||||
const cellDirty = isDark ? "rgb(94, 75, 26)" : "rgb(255, 248, 230)";
|
||||
const cellDirty = isDark ? "rgb(33, 66, 131)" : "rgb(166, 210, 255)";
|
||||
const cellSelected = isDark ? "rgb(20, 40, 60)" : "rgb(239, 246, 255)";
|
||||
const cellSelectedDirty = isDark ? "rgb(76, 66, 38)" : "rgb(235, 224, 184)";
|
||||
const cellSelectedBorder = isDark ? "rgb(96, 165, 250)" : "rgb(59, 130, 246)";
|
||||
@@ -277,9 +277,9 @@ export function resolveDataGridPaintTheme(options: { getVar: (name: string) => s
|
||||
rowNew: isDark ? rowNew : paintToken(getVar, "--data-grid-row-new-bg", rowNew),
|
||||
rowDeleted: isDark ? rowDeleted : paintToken(getVar, "--data-grid-row-deleted-bg", rowDeleted),
|
||||
cellActive: isDark ? cellActive : paintToken(getVar, "--data-grid-cell-active-bg", cellActive),
|
||||
cellDirty: isDark ? cellDirty : paintToken(getVar, "--data-grid-cell-dirty-bg", cellDirty),
|
||||
cellDirty: paintToken(getVar, "--data-grid-cell-dirty-bg", cellDirty),
|
||||
cellSelected: isDark ? cellSelected : paintToken(getVar, "--data-grid-cell-selected-bg", cellSelected),
|
||||
cellSelectedDirty: isDark ? cellSelectedDirty : paintToken(getVar, "--data-grid-cell-selected-dirty-bg", cellSelectedDirty),
|
||||
cellSelectedDirty: paintToken(getVar, "--data-grid-cell-selected-dirty-bg", cellSelectedDirty),
|
||||
cellSelectedBorder: isDark ? cellSelectedBorder : paintToken(getVar, "--data-grid-cell-selected-border", cellSelectedBorder),
|
||||
cellSelectedSingle: isDark ? cellSelectedSingle : paintToken(getVar, "--data-grid-cell-selected-single-bg", cellSelectedSingle),
|
||||
cellSelectedSingleBorder: isDark ? primary : paintToken(getVar, "--data-grid-cell-selected-single-border", primary),
|
||||
|
||||
Reference in new issue
Block a user