Merge branch 'ft' into 'main_dev'

fix(src/packages): 图表下的地图 地图下钻后返回不了，省会下钻到市则显示为空了

See merge request yunteng/thingskit-view!121

@@ -117,8 +117,10 @@ export const useChartDataFetch = (
      * 如果是分组并且绑定了ws
      */
     chartEditStore.componentList.forEach((item:CreateComponentType | CreateComponentGroupType)=>{
-      if(item.request.requestUrl?.includes('ws')){
-        initial(item, useChartEditStore, updateCallback)
+      if(item.isGroup){
+        if(item.request.requestUrl?.includes('ws')){
+          initial(item, useChartEditStore, updateCallback)
+        }
       }
     })
     //

@@ -3,7 +3,7 @@ import { OverrideMapBaseConfig } from './index'
 import { chartInitConfig } from '@/settings/designSetting'
 import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
-// import dataJson from './data.json'
+import dataJson from './data.json'
 
 //省市区枚举
 export const enum areaEnum {
@@ -21,7 +21,7 @@ export const option = {
   iconDistanceRight: 20,
   iconDistanceTop: 20,
   drillingIn: false,
-  // dataset: dataJson,
+  dataset: dataJson,
   mapRegion: {
     adcode: 'china',
     showHainanIsLands: true,

@@ -2,22 +2,27 @@
   "point": [
     {
       "name": "北京",
+      "adcode": 110000,
       "value": [116.405285, 39.904989, 200]
     },
     {
       "name": "郑州",
+      "adcode": 410000,
       "value": [113.665412, 34.757975, 888]
     },
     {
       "name": "青海",
+      "adcode": 630000,
       "value": [101.778916, 36.623178, 666]
     },
     {
       "name": "宁夏回族自治区",
+      "adcode": 640000,
       "value": [106.278179, 38.46637, 66]
     },
     {
       "name": "哈尔滨市",
+      "adcode": 230000,
       "value": [126.642464, 45.756967, 101]
     }
   ],

@@ -28,6 +28,7 @@ import { isPreview } from '@/utils'
 import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
 import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
 import { getGeoJsonMap } from '@/api/external/common'
+import dataJson from './data.json'
 
 const props = defineProps({
   themeSetting: {
@@ -106,15 +107,21 @@ props.chartConfig.option = {
 //地图点击返回 adcode=100000,名字必须是china
 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.geo.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.geo.map = adcode
     props.chartConfig.option.series.forEach((item: any) => {
-      if (item.type === 'map')
-        item.map = saveLevelStr.parentInfo.adcode === 100000 ? 'china' : saveLevelStr.parentInfo.adcode
+      if (item.type === 'map') item.map = adcode
     })
     vEchartsSetOption()
+    handleDataPoint(adcode)
   }
 }
 
@@ -145,7 +152,8 @@ const getGeojson = async (regionId: any) => {
     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: {} })
     loading.value = false
   } catch (error) {
     loading.value = false
@@ -200,17 +208,17 @@ const hainanLandsHandle = async (newData: boolean) => {
   }
 }
 
-//监听 dataset 数据发生变化
-// watch(
-//   () => props.chartConfig.option.dataset,
-//   newData => {
-//     dataSetHandle(newData)
-//   },
-//   {
-//     immediate: true,
-//     deep: false
-//   }
-// )
+// 监听 dataset 数据发生变化
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    dataSetHandle(newData)
+  },
+  {
+    immediate: true,
+    deep: false
+  }
+)
 
 //监听是否显示南海群岛
 watch(
@@ -228,6 +236,18 @@ watch(
   }
 )
 
+//处理数据标点
+const handleDataPoint = (newData: any) => {
+  if (newData === 'china') {
+    dataSetHandle(dataJson)
+  } else {
+    const filterPoint = dataJson.point.filter((item: any) => item.adcode === newData)
+    dataSetHandle({
+      point: filterPoint
+    })
+  }
+}
+
 //监听地图展示区域发生变化
 watch(
   () => props.chartConfig.option.mapRegion.adcode,
@@ -239,6 +259,7 @@ watch(
         if (item.type === 'map') item.map = newData
       })
       vEchartsSetOption()
+      handleDataPoint(newData)
     } catch (error) {
       console.log(error)
     }
@@ -272,6 +293,7 @@ const handleVChartClick = async (params: any) => {
         saveLevelStr.level = level
         saveLevelStr.parentInfo.adcode = item.properties.parent.adcode //保存上一级的地区编码
         saveLevelStr.parentInfo.level = (regionMapParentArea as any)[level] //保存上一级的行政级别
+        handleDataPoint(adcode)
       }
     })
   }

@@ -65,7 +65,13 @@ const onChange = (v: number | number[] | null) => {
       dateStart = v[0]
       dateEnd = v[1]
       daterange = `${v[0]}-${v[1]}`
+      //特殊处理 针对日期类型为日期范围的，控件是不带时间的，比如选择当天，[2023-09-08,2023-09-08]，传给服务端是没有返回的，服务端需要这种[2023-09-08:00:00:00,2023-09-08:23:59:59]
+      if (dateStart === dateEnd) {
+        const lastTs = dayjs(dateEnd).format('YYYY-MM-DD HH:mm:ss')
+        dateEnd = dayjs(lastTs).set('hour', 23).set('minute', 59).set('second', 59).valueOf()
+      }
     }
+    console.log(daterange)
     // 存储到联动数据
     useChartInteract(
       props.chartConfig,
@@ -146,7 +152,7 @@ watch(
             date.add(newData.differValue[0], newData.differUnit[0])
           ).valueOf()
         }
-      }else if (newData.defaultType === DefaultTypeEnum.STATIC) {
+      } else if (newData.defaultType === DefaultTypeEnum.STATIC) {
         option.dataset = props.chartConfig.option.dataset
       }
     }