blackteay/go-view
1
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-10-14 22:42:10 +08:00
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !101 from lastbee1204/master

Browse Source
This commit is contained in:
lastbee1204 2022-12-16 02:04:41 +00:00 committed by Gitee
commit 2e4dad85e1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/packages/components/Charts/Bars/BarCommon/index.vue
View File

@ -46,6 +46,9 @@ use([DatasetComponent, CanvasRenderer, BarChart, GridComponent, TooltipComponent
const replaceMergeArr = ref<string[]>() const replaceMergeArr = ref<string[]>()
const option = computed(() => { const option = computed(() => {
if(!('dimensions' in props.chartConfig.option.dataset)) {
return window['$message'].error('数据格式不正确！')
}
return mergeTheme(props.chartConfig.option, props.themeSetting, includes) return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
}) })

3
src/packages/components/Charts/Bars/BarCrossrange/index.vue
View File

@ -45,6 +45,9 @@ use([DatasetComponent, CanvasRenderer, BarChart, GridComponent, TooltipComponent
const replaceMergeArr = ref<string[]>() const replaceMergeArr = ref<string[]>()
const option = computed(() => { const option = computed(() => {
if(!('dimensions' in props.chartConfig.option.dataset)) {
return window['$message'].error('数据格式不正确！')
}
return mergeTheme(props.chartConfig.option, props.themeSetting, includes) return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
}) })

5
src/packages/components/Charts/Lines/LineCommon/index.vue
View File

@ -44,8 +44,11 @@ const props = defineProps({
use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent]) use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
const replaceMergeArr = ref<string[]>() const replaceMergeArr = ref<string[]>()
// 当使用动态数据时，option 的格式不满足 echarts 的数据格式会报错，修改 filter 也没用
const option = computed(() => { const option = computed(() => {
if(!('dimensions' in props.chartConfig.option.dataset)) {
return window['$message'].error('数据格式不正确！')
}
return mergeTheme(props.chartConfig.option, props.themeSetting, includes) return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
}) })