Merge branch 'fix/DEFECT-1935' into 'main_dev'

fix: 修复3D地图选择其他省份在选回中国 点击地图会报错 并且之前选择的省份会保留数据

See merge request yunteng/thingskit-view!195

@@ -49,11 +49,18 @@ onMounted(async () => {
 })
 })
 
 
 
 
-const disabledCity = ref<boolean>(false)//直辖市禁用
+const disabledCity = ref<boolean>(false)//直辖市禁用下面省份选择
 const onHandleSelectProvince = async (value: number | string, options: Recordable) => {
 const onHandleSelectProvince = async (value: number | string, options: Recordable) => {
    selectValues.cityValue = null
    selectValues.cityValue = null
   selectValues.countyValue = null
   selectValues.countyValue = null
-  if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
+  if (value === 'china') {
+    disabledCity.value = false
+    selectValues.provinceValue = 'china'
+    selectOptions.cityOptions = []
+    selectValues.areaName = ''
+    selectValues.levelStr= areaEnum.COUNTRY
+    return 
+  }
   const cityOptions = await getAreaLists(areaEnum.CITY, value as number)
   const cityOptions = await getAreaLists(areaEnum.CITY, value as number)
   selectOptions.cityOptions = cityOptions
   selectOptions.cityOptions = cityOptions
   selectValues.levelStr = areaEnum.PROVINCE
   selectValues.levelStr = areaEnum.PROVINCE

@@ -205,7 +205,7 @@ const SelectCityRef = ref<InstanceType<typeof SelectCity>>()
 const getAreaLists = async (level = areaEnum.PROVINCE, parentId = 1) => {
 const getAreaLists = async (level = areaEnum.PROVINCE, parentId = 1) => {
   const resp = await getAreaList({
   const resp = await getAreaList({
     level,
     level,
-    parentId
+    parentId:(parentId as any)=='china'?1:parentId
   })
   })
   if (!resp) return []
   if (!resp) return []
   return resp.map((item: Recordable) => ({ label: item.name, value: item.name, adcode: item.code }))
   return resp.map((item: Recordable) => ({ label: item.name, value: item.name, adcode: item.code }))
@@ -267,12 +267,12 @@ const onHandleSelectValues = async (values: regionInfo) => {
         ? 'china'
         ? 'china'
         : provinceValue
         : provinceValue
   props.optionData.mapRegion = mapRegionCache.value
   props.optionData.mapRegion = mapRegionCache.value
-  if (mapRegionCache.value.adcode !== 'china') {
+  // if (mapRegionCache.value.adcode !== 'china') {
     //清空区块配置和柱状配置
     //清空区块配置和柱状配置
     props.optionData.dataset.map3D = [cloneDeep(STATIC_SCATTER_CONFIG)]
     props.optionData.dataset.map3D = [cloneDeep(STATIC_SCATTER_CONFIG)]
     props.optionData.dataset.bar3D = [cloneDeep(STATIC_SCATTER_CONFIG)]
     props.optionData.dataset.bar3D = [cloneDeep(STATIC_SCATTER_CONFIG)]
     setDatasetArea()
     setDatasetArea()
-  }
+  // }
 }
 }
 
 
 
 
@@ -296,10 +296,14 @@ const setDatasetArea = async () => {
   const { adcode, areaName,saveSelect } = unref(mapRegionCache) || {}
   const { adcode, areaName,saveSelect } = unref(mapRegionCache) || {}
   const {levelStr} = saveSelect || {}
   const {levelStr} = saveSelect || {}
   const cityOptions = await getAreaLists(levelStr===areaEnum.CITY?areaEnum.COUNTY:areaEnum.CITY, adcode)
   const cityOptions = await getAreaLists(levelStr===areaEnum.CITY?areaEnum.COUNTY:areaEnum.CITY, adcode)
+  let provinceOptions:any = []
+  if(adcode==='china'){
+    provinceOptions = await getAreaLists()
+  }
   mdutcgValues.value = cityOptions
   mdutcgValues.value = cityOptions
   if(adcode==110000 || adcode==120000 || adcode==500000 || adcode==310000 || adcode==810000 || adcode==820000){//直辖市
   if(adcode==110000 || adcode==120000 || adcode==500000 || adcode==310000 || adcode==810000 || adcode==820000){//直辖市
     const values = await allFetch(cityOptions) || []
     const values = await allFetch(cityOptions) || []
-    mdutcgValues.value = values.flatMap((obj:any) => Object.values(obj))
+    mdutcgValues.value = values.flatMap((obj:any) => Object.values(obj))//讲获取到的多维转换成单一纬度
   }
   }
   // 循环 push 城市数据
   // 循环 push 城市数据
   datasetMap3DList.value.forEach((item: any) => {
   datasetMap3DList.value.forEach((item: any) => {
@@ -307,10 +311,10 @@ const setDatasetArea = async () => {
     item.city_name = null
     item.city_name = null
     item.adcode = null,
     item.adcode = null,
     item.value = null
     item.value = null
+    item.provinceOptions=provinceOptions
     item.cityOptions = unref(mdutcgValues) && unref(mdutcgValues).length ? unref(mdutcgValues) : [{ adcode, label: areaName, value: areaName }]
     item.cityOptions = unref(mdutcgValues) && unref(mdutcgValues).length ? unref(mdutcgValues) : [{ adcode, label: areaName, value: areaName }]
   })
   })
 }
 }
-
 const handleChangeDrillingIn = () => {
 const handleChangeDrillingIn = () => {
   SelectCityRef.value?.resetValue()
   SelectCityRef.value?.resetValue()
   props.optionData.mapRegion.adcode = 'china'
   props.optionData.mapRegion.adcode = 'china'