Skip to content

Commit 3604369

Browse files
authored
Merge pull request #60 from mayinrain/master
upd: BCharts组件支持series更多配置项
2 parents f206868 + 6850e8d commit 3604369

File tree

2 files changed

+8
-5
lines changed
  • docs/.vitepress/components/BCharts
  • packages/traction-widget/components/Charts

2 files changed

+8
-5
lines changed

docs/.vitepress/components/BCharts/use.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const chartConfig = {
2020
itemStyle: {
2121
color: '#FEEEEE',
2222
borderColor: '#FF4D4F'
23-
}
23+
},
2424
},
2525
{
2626
field: 'major',

packages/traction-widget/components/Charts/Charts.vue

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import { ref, onMounted, onUnmounted, watch, markRaw } from 'vue';
3030
import { FDatePicker, FButton } from '@fesjs/fes-design';
3131
import { ReloadOutlined } from '@fesjs/fes-design/icon';
32-
import type { EChartsOption, TooltipComponentFormatterCallback } from 'echarts';
32+
import type { EChartsOption, TooltipComponentFormatterCallback, BarSeriesOption } from 'echarts';
3333
import echarts from './useEcharts';
3434
import {
3535
getYear, getMonth, getDate, subDays, differenceInDays,
@@ -47,11 +47,11 @@ interface BarStyle {
4747
4848
interface ChartConfig {
4949
title: string;
50-
series: {
50+
series: (Pick<BarSeriesOption, Exclude<keyof BarSeriesOption, 'type' | 'name' | 'data' | 'itemStyle'>> & {
5151
field: string;
5252
name: string;
5353
itemStyle: BarStyle;
54-
}[];
54+
})[];
5555
fetchData: (startTime: number, endTime: number) => Promise<any[]>;
5656
xAxisField: string;
5757
tooltipFormatter?: (params: any[]) => string;
@@ -151,7 +151,10 @@ const transformData = (data: any[]) => {
151151
itemStyle: item.itemStyle,
152152
emphasis: {
153153
focus: 'series' as const
154-
}
154+
},
155+
...Object.entries(item)
156+
.filter(([key]) => !['field', 'name', 'itemStyle'].includes(key))
157+
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
155158
}));
156159
157160
return {

0 commit comments

Comments
 (0)