diff --git a/src/packages/components/Charts/Mores/Funnel/config.ts b/src/packages/components/Charts/Mores/Funnel/config.ts index d34bce3e..40be9e29 100644 --- a/src/packages/components/Charts/Mores/Funnel/config.ts +++ b/src/packages/components/Charts/Mores/Funnel/config.ts @@ -19,7 +19,7 @@ export const FunnelLabelPositionEnumList = [ { label: '内部右侧', value: 'insideRight' } ] -const option = { +export const option = { tooltip: {}, legend: {}, dataset: { ...dataJson }, diff --git a/src/packages/components/Charts/Mores/Funnel/config.vue b/src/packages/components/Charts/Mores/Funnel/config.vue index 6586f9b9..0a2581a2 100644 --- a/src/packages/components/Charts/Mores/Funnel/config.vue +++ b/src/packages/components/Charts/Mores/Funnel/config.vue @@ -8,6 +8,7 @@ + @@ -19,6 +20,7 @@ + 标签 @@ -40,11 +42,11 @@ import { PropType, computed } from 'vue' import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting' import { GlobalThemeJsonType } from '@/settings/chartThemes/index' -import { FunnelOrderEnumList, FunnelLabelPositionEnumList } from './config' +import { option, FunnelOrderEnumList, FunnelLabelPositionEnumList } from './config' const props = defineProps({ optionData: { - type: Object as PropType, + type: Object as PropType, required: true } }) diff --git a/src/packages/components/Charts/Mores/Funnel/data.json b/src/packages/components/Charts/Mores/Funnel/data.json index 3aba79d9..ec6e1d65 100644 --- a/src/packages/components/Charts/Mores/Funnel/data.json +++ b/src/packages/components/Charts/Mores/Funnel/data.json @@ -1,10 +1,10 @@ { - "dimensions": ["product", "2015"], + "dimensions": ["product", "category"], "source": [ - { "product": "Matcha Latte", "2015": 20 }, - { "product": "Milk Tea", "2015": 40 }, - { "product": "Cheese Cocoa", "2015": 60 }, - { "product": "Walnut Brownie", "2015": 80 }, - { "product": "Walnut", "2015": 100 } + { "product": "data1", "category": 20 }, + { "product": "data2", "category": 40 }, + { "product": "data3", "category": 60 }, + { "product": "data4", "category": 80 }, + { "product": "data5", "category": 100 } ] } diff --git a/src/packages/components/Charts/Mores/Radar/index.vue b/src/packages/components/Charts/Mores/Radar/index.vue index d39e0fed..60ba34f9 100644 --- a/src/packages/components/Charts/Mores/Radar/index.vue +++ b/src/packages/components/Charts/Mores/Radar/index.vue @@ -38,7 +38,8 @@ const option = computed(() => { }) const dataSetHandle = (dataset: any) => { - if (props.chartConfig.option.legend && dataset.seriesData) { + if (dataset.seriesData) { + // @ts-ignore props.chartConfig.option.legend.data = dataset.seriesData.map((i: { name: string }) => i.name) } if (dataset.radarIndicator) { diff --git a/src/settings/chartThemes/global.theme.json b/src/settings/chartThemes/global.theme.json index 44245e3e..d7b2a61f 100644 --- a/src/settings/chartThemes/global.theme.json +++ b/src/settings/chartThemes/global.theme.json @@ -86,7 +86,6 @@ "top": "5%", "textStyle": { "color": "#B9B8CE" - }, - "data": [] + } } } \ No newline at end of file