fix: dashboard polish

This commit is contained in:
qixinbo
2026-03-15 18:04:23 +08:00
parent 4f46f3f8d5
commit e60d8c0658
3 changed files with 42 additions and 15 deletions
+28 -7
View File
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { VegaEmbed } from 'react-vega';
import type { ChartSpec } from '@/store/visualizationStore';
@@ -8,17 +8,38 @@ interface VegaChartProps {
}
export const VegaChart: React.FC<VegaChartProps> = ({ data, spec }) => {
const vegaSpec: any = {
const containerRef = useRef<HTMLDivElement>(null);
const [size, setSize] = useState({ width: 0, height: 0 });
useEffect(() => {
const node = containerRef.current;
if (!node) return;
const observer = new ResizeObserver((entries) => {
const entry = entries[0];
if (!entry) return;
const nextWidth = Math.max(0, Math.floor(entry.contentRect.width));
const nextHeight = Math.max(0, Math.floor(entry.contentRect.height));
setSize((prev) => (
prev.width === nextWidth && prev.height === nextHeight
? prev
: { width: nextWidth, height: nextHeight }
));
});
observer.observe(node);
return () => observer.disconnect();
}, []);
const vegaSpec: any = useMemo(() => ({
$schema: typeof spec.$schema === 'string' ? spec.$schema : 'https://vega.github.io/schema/vega-lite/v5.json',
...spec,
width: "container",
height: "container",
width: size.width > 0 ? size.width : "container",
height: size.height > 0 ? size.height : "container",
data: { values: data },
autosize: { type: "fit", contains: "padding" },
};
autosize: { type: "fit", contains: "padding", resize: true },
}), [data, size.height, size.width, spec]);
return (
<div className="w-full h-full">
<div className="w-full h-full" ref={containerRef}>
<VegaEmbed
spec={vegaSpec}
options={{ actions: false }}
+11 -5
View File
@@ -39,7 +39,7 @@ function inferChartKeys(data: Record<string, unknown>[]) {
}
export function Dashboard() {
const { charts, removeChart } = useDashboardStore();
const { charts, removeChart, updateLayout } = useDashboardStore();
const ResponsiveGridLayout = useMemo(
() => WidthProvider(Responsive as any) as any,
[]
@@ -49,10 +49,16 @@ export function Dashboard() {
lg: charts.map((c) => c.layout)
}), [charts]);
const onLayoutChange = (_currentLayout: any, _allLayouts: any) => {
// updateLayout(currentLayout); // This might cause infinite loops if not handled carefully
// For simplicity, we just log it or update it if needed.
// In a real app, we would debounce this and save to backend.
const onLayoutChange = (currentLayout: any[]) => {
updateLayout(
currentLayout.map((item) => ({
i: item.i,
x: item.x,
y: item.y,
w: item.w,
h: item.h,
}))
);
};
if (charts.length === 0) {
+3 -3
View File
@@ -26,10 +26,10 @@ export const useDashboardStore = create<DashboardState>((set) => ({
addChart: (chart) => set((state) => {
const newLayout: GridLayout = {
i: chart.id,
x: (state.charts.length * 6) % 12,
x: (state.charts.length * 4) % 12,
y: Infinity,
w: 6,
h: 8,
w: 4,
h: 4,
};
return { charts: [...state.charts, { ...chart, layout: newLayout }] };
}),