Merge branch 'ft' into 'main_dev'

fix(src/packages): 图表下的地图 3d地图下钻方式修改成和普通地图一样的

See merge request yunteng/thingskit-view!122

@@ -2,6 +2,7 @@
   {
     "name": "四川省",
     "value": [104.10068024609373, 30.580525329665175, 20000],
+    "adcode": 510000,
     "height": 5,
     "itemStyle": {
       "color": "pink",
@@ -13,6 +14,7 @@
   {
     "name": "湖南省",
     "value": [111.73068512890623, 27.86754509366569, 20000],
+    "adcode": 430000,
     "height": 4,
     "itemStyle": {
       "color": "blue",
@@ -24,6 +26,7 @@
   {
     "name": "吉林省",
     "value": [126.45236481640623, 43.7943407914815, 20000],
+    "adcode": 220000,
     "height": 5,
     "itemStyle": {
       "color": "yellow",
@@ -35,6 +38,7 @@
   {
     "name": "山东省",
     "value": [118.67404450390623, 36.16387465872037, 20000],
+    "adcode": 370000,
     "height": 6,
     "itemStyle": {
       "color": "orange",

@@ -14,6 +14,7 @@ import { registerMap } from 'echarts/core'
 import 'echarts-gl'
 import config, { areaEnum } from './config'
 import { getGeoJsonMap } from '@/api/external/common'
+import dataMaps from './data.json'
 
 const props = defineProps({
   chartConfig: {
@@ -73,16 +74,22 @@ props.chartConfig.option = {
 //地图点击返回
 const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
+    let saveAdcode: any = saveLevelStr.parentInfo.adcode
     saveLevelStr.level = saveLevelStr.parentInfo.level
-    await getGeojson(saveLevelStr.parentInfo.adcode)
-    props.chartConfig.option.geo3D.map =
-      saveLevelStr.parentInfo.adcode === 100000 ? 'china' : saveLevelStr.parentInfo.adcode
+    if (saveAdcode === 0) {
+      //
+      saveAdcode = 'china'
+      saveLevelStr.level = 'COUNTRY'
+    }
+    await getGeojson(saveAdcode)
+    const adcode = saveAdcode === 100000 ? 'china' : saveAdcode
+    props.chartConfig.option.geo3D.map = adcode
     props.chartConfig.option.series.forEach((item: any) => {
-      if (item.type === 'map3D')
-        item.map = saveLevelStr.parentInfo.adcode === 100000 ? 'china' : saveLevelStr.parentInfo.adcode
+      if (item.type === 'map3D') item.map = adcode
       item.data = props.chartConfig.option.dataset
     })
     handleSetOption(chartInstance.value, props.chartConfig.option)
+    handleDataPoint(adcode)
   }
 }
 
@@ -105,6 +112,7 @@ const handleMap3DClick = async (params: any) => {
         saveLevelStr.level = level
         saveLevelStr.parentInfo.adcode = item.properties.parent.adcode //保存上一级的地区编码
         saveLevelStr.parentInfo.level = (regionMapParentArea as any)[level] //保存上一级的行政级别
+        handleDataPoint(adcode)
       }
     })
   }
@@ -123,7 +131,7 @@ const saveLevelStr = reactive({
   }
 })
 
-//动态获取geojson文件进行注册地图
+//动态注册地图
 const getGeojson = (regionId: any) => {
   try {
     return new Promise<boolean>(resolve => {
@@ -134,14 +142,19 @@ const getGeojson = (regionId: any) => {
       ).then(res => {
         const { geoJson, name, code, level } = res.data
         const geoJsonFile = JSON.parse(geoJson)
+        if (!geoJsonFile) return
         saveGeojson.value = geoJsonFile
-        registerMap(level === areaEnum.COUNTRY ? name : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
+        const nameChina = name === '中国' ? 'china' : name
+        registerMap(level === areaEnum.COUNTRY ? nameChina : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
         show.value = false
         resolve(true)
       })
     })
   } catch (error) {
+    show.value = false
     console.error('注册地图出错', error)
+    //注册出错则注册空的，不然在选择正确的adcode，则视图无法更新
+    registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, specialAreas: {} })
   }
 }
 
@@ -182,6 +195,15 @@ onMounted(() => {
   initMap()
 })
 
+//处理数据标点
+const handleDataPoint = (newData: any) => {
+  if (newData === 'china') {
+    props.chartConfig.option.dataset = dataMaps
+  } else {
+    props.chartConfig.option.dataset = dataMaps.filter((item: any) => item.adcode === newData)
+  }
+}
+
 //监听地图展示区域发生变化
 watch(
   () => `${props.chartConfig.option.mapRegion.adcode}`,
@@ -196,6 +218,7 @@ watch(
         }
       })
       handleSetOption(chartInstance.value, props.chartConfig.option)
+      handleDataPoint(newData)
     } catch (error) {
       console.log('展示区域发生变化出错', error)
     }