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

perf: 3D地图添加区县凸起

See merge request yunteng/thingskit-view!192

@@ -105,8 +105,8 @@
             @change="(v: number, o: Recordable, w: Recordable, s1: number) => onHandleSelectProvince(v, o, item, map3DIndex)"
             @change="(v: number, o: Recordable, w: Recordable, s1: number) => onHandleSelectProvince(v, o, item, map3DIndex)"
             placeholder="请选择省份" v-model:value="item.name" :options="item.provinceOptions" />
             placeholder="请选择省份" v-model:value="item.name" :options="item.provinceOptions" />
         </setting-item>
         </setting-item>
-        <setting-item name="城市名称">
-          <n-select placeholder="请选择城市" v-model:value="item.city_name" :options="item.cityOptions" />
+        <setting-item name="市/区/县名称">
+          <n-select placeholder="请选择市/区/县" v-model:value="item.city_name" :options="item.cityOptions" />
         </setting-item>
         </setting-item>
         <setting-item name="区块厚度">
         <setting-item name="区块厚度">
           <n-input-number v-model:value="item.height"> </n-input-number>
           <n-input-number v-model:value="item.height"> </n-input-number>
@@ -212,9 +212,11 @@ const getAreaLists = async (level = areaEnum.PROVINCE, parentId = 1) => {
 }
 }
 
 
 onMounted(async () => {
 onMounted(async () => {
+  const {saveSelect} = unref(mapRegionCache) || {}
+  const {levelStr} = saveSelect || {}
   datasetMap3DList.value.forEach(async (item: Recordable) => {
   datasetMap3DList.value.forEach(async (item: Recordable) => {
     item.provinceOptions = await getAreaLists()
     item.provinceOptions = await getAreaLists()
-    item.cityOptions = await getAreaLists(areaEnum.CITY, !item.adcode ? mapRegionCache.value.adcode : item.adcode)
+    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
     item.adcode = !item.adcode ? mapRegionCache.value.adcode : item.adcode
   })
   })
 })
 })
@@ -229,11 +231,11 @@ const onHandleSelectProvince = async (value: number, option: Recordable, item: R
 const handleAddRegion =async () => {
 const handleAddRegion =async () => {
   props.optionData.dataset.map3D.push(cloneDeep(STATIC_SCATTER_CONFIG))
   props.optionData.dataset.map3D.push(cloneDeep(STATIC_SCATTER_CONFIG))
   if (mapRegionCache.value.adcode !== 'china') {
   if (mapRegionCache.value.adcode !== 'china') {
-    const { adcode, areaName } = unref(mapRegionCache) || {}
-    const cityOptions = await getAreaLists(areaEnum.CITY, adcode)
+    const { adcode, areaName,saveSelect } = unref(mapRegionCache) || {}
+  const {levelStr} = saveSelect || {}
+    const cityOptions = await getAreaLists(levelStr===areaEnum.CITY?areaEnum.COUNTY:areaEnum.CITY, adcode)
     // 循环 push 城市数据
     // 循环 push 城市数据
     datasetMap3DList.value.forEach((item: any) => {
     datasetMap3DList.value.forEach((item: any) => {
-      
       item.name = areaName
       item.name = areaName
       item.value = null
       item.value = null
       item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }]
       item.cityOptions = cityOptions && cityOptions.length ? cityOptions : [{ adcode, label: areaName, value: areaName }]
@@ -274,8 +276,9 @@ const onHandleSelectValues = async (values: regionInfo) => {
 }
 }
 
 
 const setDatasetArea = async () => {
 const setDatasetArea = async () => {
-  const { adcode, areaName } = unref(mapRegionCache) || {}
-  const cityOptions = await getAreaLists(areaEnum.CITY, adcode)
+  const { adcode, areaName,saveSelect } = unref(mapRegionCache) || {}
+  const {levelStr} = saveSelect || {}
+  const cityOptions = await getAreaLists(levelStr===areaEnum.CITY?areaEnum.COUNTY:areaEnum.CITY, adcode)
   // 循环 push 城市数据
   // 循环 push 城市数据
   datasetMap3DList.value.forEach((item: any) => {
   datasetMap3DList.value.forEach((item: any) => {
     item.name = areaName
     item.name = areaName

@@ -248,7 +248,8 @@
           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"
           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)">
         <g opacity="1" transform="translate(47 157)">
-          <text>
+          <div>
+            <text>
             <tspan
             <tspan
               :x="fontConfig.x1"
               :x="fontConfig.x1"
               :y="fontConfig.y1"
               :y="fontConfig.y1"
@@ -260,9 +261,10 @@
               font-weight="Regular"
               font-weight="Regular"
               letter-spacing="0"
               letter-spacing="0"
             >
             >
-              {{ unitStr }}
+                {{ unitStr }}
             </tspan>
             </tspan>
           </text>
           </text>
+          </div>
           <animateMotion
           <animateMotion
             v-if="openAnim"
             v-if="openAnim"
             path="M0,0 L0,2 L0 9 L0 12 L0 -12 L0 -9 L0 -2 Z"
             path="M0,0 L0,2 L0 9 L0 12 L0 -12 L0 -9 L0 -2 Z"