Merge branch 'fix/3D-map-select-city-county' into 'main_dev'

fix: 修改3D地图选择问题

See merge request yunteng/thingskit-view!193

 <script lang="ts" setup name="SelectCity">
 <script lang="ts" setup name="SelectCity">
-import { onMounted, reactive, nextTick } from 'vue'
+import { onMounted, reactive, nextTick, ref } from 'vue'
 import { getAreaList } from '@/api/external/common/index'
 import { getAreaList } from '@/api/external/common/index'
 import { areaEnum } from '../config'
 import { areaEnum } from '../config'
 
 
@@ -32,10 +32,10 @@ const selectValues = reactive({
 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.code }))
+  return resp.map((item: Recordable) => ({ label: item.name, value: item.code,parentId:item.parentId }))
 }
 }
 
 
 onMounted(async () => {
 onMounted(async () => {
@@ -48,16 +48,22 @@ onMounted(async () => {
   for (let i in selectValues) Reflect.set(selectValues, i, props.optionData?.mapRegion.saveSelect[i])
   for (let i in selectValues) Reflect.set(selectValues, i, props.optionData?.mapRegion.saveSelect[i])
 })
 })
 
 
+
+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(props.drillingIn){
-  //   emits('handleSelectArea',{value,options})
-  // }
   if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
   if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
-  selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value as number)
+  const cityOptions = await getAreaLists(areaEnum.CITY, value as number)
+  selectOptions.cityOptions = cityOptions
   selectValues.levelStr = areaEnum.PROVINCE
   selectValues.levelStr = areaEnum.PROVINCE
   selectValues.areaName = options.label
   selectValues.areaName = options.label
+  if(value==110000 || value ==120000 || value ==500000 || value==310000 || value==810000 || value==820000){//直辖市的话就不能跟省份的逻辑一样了
+    selectOptions.cityOptions = cityOptions.map((item:any)=>({...item,value:item.parentId}))
+    disabledCity.value = true
+    return
+  }
+  disabledCity.value = false
 }
 }
 
 
 const onHandleSelectCity = async (value: number, options: Recordable) => {
 const onHandleSelectCity = async (value: number, options: Recordable) => {
@@ -96,6 +102,7 @@ defineExpose({
     />
     />
     <n-select
     <n-select
       v-if="!props.drillingIn"
       v-if="!props.drillingIn"
+      :disabled="disabledCity"
       @change="onHandleSelectCity"
       @change="onHandleSelectCity"
       placeholder="请选择城市"
       placeholder="请选择城市"
       v-model:value="selectValues.cityValue"
       v-model:value="selectValues.cityValue"

@@ -275,17 +275,39 @@ const onHandleSelectValues = async (values: regionInfo) => {
   }
   }
 }
 }
 
 
+
+const mdutcgValues = ref<any>([])//直辖市的区县数据
+//循环获取直辖市下面得区县数据
+const allFetch = (arr:any) => {
+  return Promise.all(
+    arr.map(async(item:any)=>{
+      try{
+        const values = await getAreaLists(areaEnum.COUNTY, item.adcode as any)
+        return {...values}
+      }catch(err){
+        console.log(err,'err')
+        return 
+      }
+    })
+  )
+}
+
 const setDatasetArea = async () => {
 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)
+  mdutcgValues.value = cityOptions
+  if(adcode==110000 || adcode==120000 || adcode==500000 || adcode==310000 || adcode==810000 || adcode==820000){//直辖市
+    const values = await allFetch(cityOptions) || []
+    mdutcgValues.value = values.flatMap((obj:any) => Object.values(obj))
+  }
   // 循环 push 城市数据
   // 循环 push 城市数据
   datasetMap3DList.value.forEach((item: any) => {
   datasetMap3DList.value.forEach((item: any) => {
     item.name = areaName
     item.name = areaName
     item.city_name = null
     item.city_name = null
     item.adcode = null,
     item.adcode = null,
     item.value = null
     item.value = null
-    item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }]
+    item.cityOptions = unref(mdutcgValues) && unref(mdutcgValues).length ? unref(mdutcgValues) : [{ adcode, label: areaName, value: areaName }]
   })
   })
 }
 }