feat(src/packages): 图表地图 点击切换 标点还存在

@@ -64,6 +64,17 @@ const onHandleSelectCity = async (value: number) => {
 const onHandleSubmit = () => {
 const onHandleSubmit = () => {
   emits('submit', selectValues)
   emits('submit', selectValues)
 }
 }
+const resetValue = () => {
+  selectValues.provinceValue = 'china'
+  selectValues.cityValue = null
+  selectValues.countyValue = null
+  selectValues.levelStr = areaEnum.COUNTRY
+  selectOptions.cityOptions = []
+  selectOptions.countryOptions = []
+}
+defineExpose({
+  resetValue
+})
 </script>
 </script>
 
 
 <template>
 <template>

@@ -4,7 +4,7 @@
   <CollapseItem name="地图" :expanded="true">
   <CollapseItem name="地图" :expanded="true">
     <SettingItemBox name="开启下钻">
     <SettingItemBox name="开启下钻">
       <SettingItem name="">
       <SettingItem name="">
-        <n-switch v-model:value="optionData.drillingIn" size="small"></n-switch>
+        <n-switch @change="handleChangeDrillingIn" v-model:value="optionData.drillingIn" size="small"></n-switch>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="返回图标">
     <SettingItemBox name="返回图标">
@@ -35,7 +35,12 @@
         ></n-input-number>
         ></n-input-number>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
-    <SelectCity :optionData="optionData" :drillingIn="optionData.drillingIn" @submit="onHandleSelectValues" />
+    <SelectCity
+      ref="SelectCityRef"
+      :optionData="optionData"
+      :drillingIn="optionData.drillingIn"
+      @submit="onHandleSelectValues"
+    />
     <SettingItemBox name="颜色">
     <SettingItemBox name="颜色">
       <SettingItem name="区域颜色">
       <SettingItem name="区域颜色">
         <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
         <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
@@ -181,6 +186,8 @@ const symbolOption = ref([
   }
   }
 ])
 ])
 
 
+const SelectCityRef = ref<typeof SelectCity>()
+
 const onHandleSelectValues = (values: any) => {
 const onHandleSelectValues = (values: any) => {
   const { cityValue, countyValue, provinceValue } = values
   const { cityValue, countyValue, provinceValue } = values
   props.optionData.mapRegion.saveSelect = values
   props.optionData.mapRegion.saveSelect = values
@@ -192,4 +199,8 @@ const onHandleSelectValues = (values: any) => {
     ? 'china'
     ? 'china'
     : provinceValue
     : provinceValue
 }
 }
+
+const handleChangeDrillingIn = () => {
+  SelectCityRef.value?.resetValue()
+}
 </script>
 </script>

@@ -64,6 +64,18 @@ const onHandleSelectCity = async (value: number) => {
 const onHandleSubmit = () => {
 const onHandleSubmit = () => {
   emits('submit', selectValues)
   emits('submit', selectValues)
 }
 }
+
+const resetValue = () => {
+  selectValues.provinceValue = 'china'
+  selectValues.cityValue = null
+  selectValues.countyValue = null
+  selectValues.levelStr = areaEnum.COUNTRY
+  selectOptions.cityOptions = []
+  selectOptions.countryOptions = []
+}
+defineExpose({
+  resetValue
+})
 </script>
 </script>
 
 
 <template>
 <template>

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

@@ -4,7 +4,7 @@
   <CollapseItem name="地图" :expanded="true">
   <CollapseItem name="地图" :expanded="true">
     <SettingItemBox name="开启下钻">
     <SettingItemBox name="开启下钻">
       <SettingItem name="">
       <SettingItem name="">
-        <n-switch v-model:value="optionData.drillingIn" size="small"></n-switch>
+        <n-switch @change="handleChangeDrillingIn" v-model:value="optionData.drillingIn" size="small"></n-switch>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="返回图标">
     <SettingItemBox name="返回图标">
@@ -14,11 +14,7 @@
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="图标颜色">
     <SettingItemBox name="图标颜色">
       <SettingItem name="">
       <SettingItem name="">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="optionData.iconColor"
-        ></n-color-picker>
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.iconColor"></n-color-picker>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="图标距离">
     <SettingItemBox name="图标距离">
@@ -39,7 +35,12 @@
         ></n-input-number>
         ></n-input-number>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
-    <SelectCity :optionData="optionData" :drillingIn="optionData.drillingIn" @submit="onHandleSelectValues" />
+    <SelectCity
+      ref="SelectCityRef"
+      :optionData="optionData"
+      :drillingIn="optionData.drillingIn"
+      @submit="onHandleSelectValues"
+    />
     <SettingItemBox name="区域颜色">
     <SettingItemBox name="区域颜色">
       <SettingItem name="0%处颜色">
       <SettingItem name="0%处颜色">
         <n-color-picker
         <n-color-picker
@@ -281,6 +282,8 @@ const props = defineProps({
   }
   }
 })
 })
 
 
+const SelectCityRef = ref<typeof SelectCity>()
+
 const initMapRegionOptions = () => {
 const initMapRegionOptions = () => {
   mapChinaJson.features.forEach((element: any) => {
   mapChinaJson.features.forEach((element: any) => {
     if (element.properties.name) {
     if (element.properties.name) {
@@ -309,4 +312,8 @@ const onHandleSelectValues = (values: any) => {
     ? 'china'
     ? 'china'
     : provinceValue
     : provinceValue
 }
 }
+
+const handleChangeDrillingIn = () => {
+  SelectCityRef.value?.resetValue()
+}
 </script>
 </script>

@@ -142,6 +142,7 @@ const getGeojson = async (regionId: any) => {
     )
     )
     const { geoJson, name, code, level } = data
     const { geoJson, name, code, level } = data
     const geoJsonFile = JSON.parse(geoJson)
     const geoJsonFile = JSON.parse(geoJson)
+    if (!geoJsonFile) return
     saveGeojson.value = geoJsonFile
     saveGeojson.value = geoJsonFile
     registerMap(level === areaEnum.COUNTRY ? name : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
     registerMap(level === areaEnum.COUNTRY ? name : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
     loading.value = false
     loading.value = false
@@ -199,16 +200,16 @@ const hainanLandsHandle = async (newData: boolean) => {
 }
 }
 
 
 //监听 dataset 数据发生变化
 //监听 dataset 数据发生变化
-watch(
-  () => props.chartConfig.option.dataset,
-  newData => {
-    dataSetHandle(newData)
-  },
-  {
-    immediate: true,
-    deep: false
-  }
-)
+// watch(
+//   () => props.chartConfig.option.dataset,
+//   newData => {
+//     dataSetHandle(newData)
+//   },
+//   {
+//     immediate: true,
+//     deep: false
+//   }
+// )
 
 
 //监听是否显示南海群岛
 //监听是否显示南海群岛
 watch(
 watch(