fix: rebase main

This commit is contained in:
jialin
2026-04-24 14:28:30 +08:00
committed by jialin
parent 16449613e0
commit 597a86562a
28 changed files with 88 additions and 56 deletions
+2 -4
View File
@@ -1,7 +1,5 @@
import CardWrapper from '@/components/card-wrapper';
import MixLineBar from '@/components/echarts/mix-line-bar';
import BaseSelect from '@/components/seal-form/base/select';
import { baseColorMap } from '@/pages/dashboard/config';
import { BaseSelect, CardWrapper, MixLineBarChart } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { Segmented } from 'antd';
import dayjs from 'dayjs';
@@ -172,7 +170,7 @@ const DailyUsage: React.FC<DailyUsageProps> = (props) => {
onChange={onGranularityChange}
></Segmented>
</ControlsWrapper>
<MixLineBar
<MixLineBarChart
chartData={chartData}
seriesData={[]}
xAxisData={xAxisData}