Skip to content

upd: BCharts组件支持series更多配置项 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nancyzhan merged 1 commit into from
Feb 21, 2025
Merged

upd: BCharts组件支持series更多配置项 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/.vitepress/components/BCharts/use.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const chartConfig = {
itemStyle: {
color: '#FEEEEE',
borderColor: '#FF4D4F'
}
},
},
{
field: 'major',
Expand Down
11 changes: 7 additions & 4 deletions packages/traction-widget/components/Charts/Charts.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import { ref, onMounted, onUnmounted, watch, markRaw } from 'vue';
import { FDatePicker, FButton } from '@fesjs/fes-design';
import { ReloadOutlined } from '@fesjs/fes-design/icon';
import type { EChartsOption, TooltipComponentFormatterCallback } from 'echarts';
import type { EChartsOption, TooltipComponentFormatterCallback, BarSeriesOption } from 'echarts';
import echarts from './useEcharts';
import {
getYear, getMonth, getDate, subDays, differenceInDays,
Expand All @@ -47,11 +47,11 @@ interface BarStyle {

interface ChartConfig {
title: string;
series: {
series: (Pick<BarSeriesOption, Exclude<keyof BarSeriesOption, 'type' | 'name' | 'data' | 'itemStyle'>> & {
field: string;
name: string;
itemStyle: BarStyle;
}[];
})[];
fetchData: (startTime: number, endTime: number) => Promise<any[]>;
xAxisField: string;
tooltipFormatter?: (params: any[]) => string;
Expand Down Expand Up @@ -151,7 +151,10 @@ const transformData = (data: any[]) => {
itemStyle: item.itemStyle,
emphasis: {
focus: 'series' as const
}
},
...Object.entries(item)
.filter(([key]) => !['field', 'name', 'itemStyle'].includes(key))
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
}));

return {
Expand Down
Loading