From a041c6cd202a83f219bfc3264c9ef0d418f27f52 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Mon, 8 Jul 2024 16:39:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/Maps/MapBase/index.vue           | 2 +-
 .../chart/ContentConfigurations/components/ChartEvent/index.vue | 1 +
 src/views/preview/hooks/useCustomEvent.hook.ts                  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

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 = `<div style="display: flex;align-items: center"><span style="margin-right: 20px;">${v.name}</span><span>${value}</span></div>`
     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}`,