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

fix: 修复3D地图城市点击没数据问题

See merge request yunteng/thingskit-view!197

 <script lang="ts" setup name="SelectCity">
 import { onMounted, reactive, nextTick, ref } from 'vue'
 import { getAreaList } from '@/api/external/common/index'
-import { areaEnum } from '../config'
+import { areaEnum, ifSpecialCity } from '../config'
 
 const props = defineProps({
   drillingIn: {
@@ -49,6 +49,7 @@ onMounted(async () => {
 })
 
 
+
 const disabledCity = ref<boolean>(false)//直辖市禁用下面省份选择
 const onHandleSelectProvince = async (value: number | string, options: Recordable) => {
    selectValues.cityValue = null
@@ -65,7 +66,7 @@ const onHandleSelectProvince = async (value: number | string, options: Recordabl
   selectOptions.cityOptions = cityOptions
   selectValues.levelStr = areaEnum.PROVINCE
   selectValues.areaName = options.label
-  if(value==110000 || value ==120000 || value ==500000 || value==310000 || value==810000 || value==820000){//直辖市的话就不能跟省份的逻辑一样了
+  if(ifSpecialCity(value)){//直辖市的话就不能跟省份的逻辑一样了
     selectOptions.cityOptions = cityOptions.map((item:any)=>({...item,value:item.parentId}))
     disabledCity.value = true
     return

@@ -4,6 +4,7 @@ import { chartInitConfig } from '@/settings/designSetting'
 import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
 import dataMaps from './data.json'
+import { getAreaList } from '@/api/external/common'
 
 //省市区枚举
 export const enum areaEnum {
@@ -102,7 +103,7 @@ export const option = {
   showIcon: false,
   iconDistanceRight: 20,
   iconDistanceTop: 20,
-  drillingIn: false,
+  drillingIn: true,
   dataset: dataMaps,
   isShowExecute:false,
   saveClickRegion: {
@@ -200,6 +201,41 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public option = echartOptionProfixHandle(option, includes)
 }
 
+export const ifSpecialCity = (value:string|number) => {
+  if(value==110000 || value ==120000 || value ==500000 || value==310000 || value==810000 || value==820000){//直辖市的话就不能跟省份的逻辑一样了
+    return true
+  }
+  return false
+}
+
+
+
+//循环获取直辖市下面得区县数据
+
+export const getAreaLists = async (level = areaEnum.PROVINCE as any, parentId = 1) => {
+  const resp = await getAreaList({
+    level,
+    parentId:(parentId as any)=='china'?1:parentId
+  })
+  if (!resp) return []
+  return resp.map((item: Recordable) => ({ label: item.name, value: item.name, adcode: item.code }))
+}
+
+export const allFetch = (arr:any,items:string) => {
+  return Promise.all(
+    arr.map(async(item:any)=>{
+      try{
+        const values = await getAreaLists(areaEnum.COUNTY, item[items] as any)
+        return {...values}
+      }catch(err){
+        console.log(err,'err')
+        return 
+      }
+    })
+  )
+}
+
+
 // 缩放配置文件
 export const setScale = (adcode: string | number) => {
   switch (adcode) {

@@ -167,9 +167,9 @@ import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/Ch
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 import { GlobalSetting } from '@/components/Pages/ChartItemSetting'
 import SelectCity from './components/SelectCity.vue'
-import { regionInfo } from './config'
+import { allFetch, getAreaLists, ifSpecialCity, regionInfo } from './config'
 import { cloneDeep } from 'lodash'
-import { getAreaList } from '@/api/external/common/index'
+
 import { areaEnum } from '../../../Decorates/Mores/Weather/config'
 import { unref } from 'vue'
 
@@ -202,22 +202,22 @@ const STATIC_SCATTER_CONFIG = {
 
 const SelectCityRef = ref<InstanceType<typeof SelectCity>>()
 
-const getAreaLists = async (level = areaEnum.PROVINCE, parentId = 1) => {
-  const resp = await getAreaList({
-    level,
-    parentId:(parentId as any)=='china'?1:parentId
-  })
-  if (!resp) return []
-  return resp.map((item: Recordable) => ({ label: item.name, value: item.name, adcode: item.code }))
-}
+
 
 onMounted(async () => {
   const {saveSelect} = unref(mapRegionCache) || {}
   const {levelStr} = saveSelect || {}
   datasetMap3DList.value.forEach(async (item: Recordable) => {
     item.provinceOptions = await getAreaLists()
-    item.cityOptions = await getAreaLists(levelStr===areaEnum.CITY?areaEnum.COUNTY:areaEnum.CITY, !item.adcode ? mapRegionCache.value.adcode : item.adcode)
-    item.adcode = !item.adcode ? mapRegionCache.value.adcode : item.adcode
+    const adcode = !item.adcode ? mapRegionCache.value.adcode : item.adcode
+    const cityOptions = await getAreaLists(levelStr===areaEnum.CITY?areaEnum.COUNTY:areaEnum.CITY, adcode )
+    item.adcode = adcode
+    if(ifSpecialCity(adcode)){//直辖市获取区县配置的数据不一样
+      const values = await allFetch(cityOptions,'adcode') || []
+      item.cityOptions = values.flatMap((obj:any) => Object.values(obj))
+      return
+    }
+    item.cityOptions = cityOptions
   })
 })
 
@@ -277,20 +277,6 @@ 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 { adcode, areaName,saveSelect } = unref(mapRegionCache) || {}
@@ -302,7 +288,7 @@ const setDatasetArea = async () => {
   }
   mdutcgValues.value = cityOptions
   if(adcode==110000 || adcode==120000 || adcode==500000 || adcode==310000 || adcode==810000 || adcode==820000){//直辖市
-    const values = await allFetch(cityOptions) || []
+    const values = await allFetch(cityOptions,'adcode') || []
     mdutcgValues.value = values.flatMap((obj:any) => Object.values(obj))//讲获取到的多维转换成单一纬度
   }
   // 循环 push 城市数据

@@ -248,8 +248,7 @@
           d="M399 222.392M399 222.392Q399 233.784 388.988 244.137Q379.458 253.992 362.171 261.578Q325.76 277.556 274.62 277.556Q223.493 277.556 187.299 261.649Q170.106 254.093 160.639 244.256Q150.7 233.928 150.7 222.534L152.7 222.534Q152.7 233.122 162.08 242.869Q171.273 252.421 188.104 259.818Q223.913 275.556 274.62 275.556Q325.341 275.556 361.367 259.747Q378.294 252.319 387.55 242.747Q397 232.975 397 222.392L399 222.392Z"
         />
         <g opacity="1" transform="translate(47 157)">
-          <div>
-            <text>
+          <text style="text-align: center;">
             <tspan
               :x="fontConfig.x1"
               :y="fontConfig.y1"
@@ -264,7 +263,6 @@
                 {{ unitStr }}
             </tspan>
           </text>
-          </div>
           <animateMotion
             v-if="openAnim"
             path="M0,0 L0,2 L0 9 L0 12 L0 -12 L0 -9 L0 -2 Z"