From 025c06f333ac26d397ba3ea1fb944e09323f11c1 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Fri, 25 Apr 2025 16:06:37 +0800
Subject: [PATCH] =?UTF-8?q?echarts=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/custom-echart-maps/index.vue   |  2 --
 src/components/custom-echart-pie-3d/index.vue |  9 ++++++---
 src/hooks/useEcharts.js                       | 19 ++++---------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/components/custom-echart-maps/index.vue b/src/components/custom-echart-maps/index.vue
index 04e8e58..d692cec 100644
--- a/src/components/custom-echart-maps/index.vue
+++ b/src/components/custom-echart-maps/index.vue
@@ -69,8 +69,6 @@ export default {
       setOptions(option);
 
       onMapClick(({ name, data }) => {
-        console.info('onMapClick点击区域:', name);
-        console.info('onMapClick关联数据:', data);
         emit('click', { name, data });
       });
       startAutoPlay({
diff --git a/src/components/custom-echart-pie-3d/index.vue b/src/components/custom-echart-pie-3d/index.vue
index 48bf218..11106d4 100644
--- a/src/components/custom-echart-pie-3d/index.vue
+++ b/src/components/custom-echart-pie-3d/index.vue
@@ -33,7 +33,7 @@ export default {
   emits: ['click'],
   setup(props, { emit }) {
     const chartRef = ref(null);
-    const { setOptions, getInstance, resize } = useEcharts(chartRef);
+    const { setOptions, getInstance, resize, onMapClick } = useEcharts(chartRef);
     const option = reactive({
       series: [],
     });
@@ -59,8 +59,11 @@ export default {
       option.series = props.chartData;
       setOptions(option);
       resize();
-      getInstance()?.off('click', onClick);
-      getInstance()?.on('click', onClick);
+      onMapClick(({ name, data }) => {
+        emit('click', { name, data });
+      });
+      // getInstance()?.off('click', onClick);
+      // getInstance()?.on('click', onClick);
     }
 
     function onClick(params) {
diff --git a/src/hooks/useEcharts.js b/src/hooks/useEcharts.js
index e327a32..e521323 100644
--- a/src/hooks/useEcharts.js
+++ b/src/hooks/useEcharts.js
@@ -111,21 +111,10 @@ export const useEcharts = (elRef, theme = 'default') => {
 
   function handleMapClick(params) {
     console.info('handleMapClick', params);
-    // 过滤非地图区域的点击事件
-    if (params.seriesType === 'map3D' || params.seriesType === 'map') {
-      // 获取点击区域信息
-      const mapName = params.name;
-      const regionData = params.data || {};
-      console.info('seriesType', params.seriesType);
-      // 执行注册的回调函数
-      if (typeof mapClickHandler === 'function') {
-        mapClickHandler({
-          name: mapName,
-          data: regionData,
-          coordinates: params.event?.event?.point,
-          // originalParams: params
-        });
-      }
+    console.info('seriesType', params.seriesType);
+    // 执行注册的回调函数
+    if (typeof mapClickHandler === 'function') {
+      mapClickHandler(params);
     }
   }