diff --git a/src/packages/components/Charts/Maps/MapBase/index.vue b/src/packages/components/Charts/Maps/MapBase/index.vue index 05f200ce..f043af61 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.vue +++ b/src/packages/components/Charts/Maps/MapBase/index.vue @@ -296,7 +296,7 @@ watch(() => customData.value.dataMap, () => { let obj = dataMap.value as any props.chartConfig.option.series[1].tooltip.formatter = (v: any) => { let value: any - if(obj && JSON.stringify(obj) !== '{}') value = obj[v.name].value || '-' + if(JSON.stringify(obj) !== '{}') value = obj[v.name]?.value || '-' else value = !isNaN(v.value) ? v.value : '-' let str = `
${v.name}${value}
` return str diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue index 0291b927..d437f042 100644 --- a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue @@ -75,6 +75,7 @@ const finallyLink = computed(() => { return targetData.value.customEvent.click.linkHead + (targetData.value as any).customEvent.click.link }) const handleClick = () => { + if(!finallyLink.value) return if(targetData.value.customEvent.click.isBlank) postMessageToParent({ type: 'windowOpen', url: finallyLink.value, diff --git a/src/views/preview/hooks/useCustomEvent.hook.ts b/src/views/preview/hooks/useCustomEvent.hook.ts index fb2a749b..b31e38b2 100644 --- a/src/views/preview/hooks/useCustomEvent.hook.ts +++ b/src/views/preview/hooks/useCustomEvent.hook.ts @@ -6,6 +6,7 @@ const bindEvent = (item:any) => { let {linkHead, link, isBlank} = item.customEvent.click obj = { click: () => { + if(!link) return if(isBlank) postMessageToParent({ type: 'windowOpen', url: `${linkHead}${link}`,