@tplc/business 0.5.53 → 0.5.54

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.5.54](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/compare/v1.0.7...v0.5.54) (2025-11-21)
+
 ### [0.5.53](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/compare/v0.5.46...v0.5.53) (2025-11-20)
 
 

package/components/lcb-map/lcb-map.vue

@@ -3,15 +3,17 @@
   <view class="flex-col flex w-full" :style="{ height }" v-if="height">
     <view class="flex-1 h-0 relative">
       <map
+        id="map"
         :markers="info.covers"
         show-location
         show-compass
         show-scale
         :scale="mapScale"
         class="w-full h-full"
-        id="map"
         @regionchange="onRegionChange"
         @callouttap="onCalloutTap"
+        :latitude="mapLatLon.latitude"
+        :longitude="mapLatLon.longitude"
       />
       <image
         src="./images/2.png"
@@ -85,7 +87,17 @@
 
 <script lang="ts" setup>
 import { FORM_KEY } from '@tplc/business/constants'
-import { reactive, inject, ref, useAttrs, watch, getCurrentInstance, onUnmounted } from 'vue'
+import {
+  reactive,
+  inject,
+  ref,
+  useAttrs,
+  watch,
+  getCurrentInstance,
+  onUnmounted,
+  onMounted,
+  nextTick,
+} from 'vue'
 import { getJsonFromStr, transformValueUnit } from '../../utils/transform'
 import { MapItem, MapMarker } from './types'
 import useAutoHeight from '../../hooks/useAutoHeight'
@@ -94,6 +106,7 @@ import { LcbListInfo } from '@tplc/business/components/lcb-list/api'
 import { debounce } from '@tplc/wot/components/common/util'
 import useLocation from '../../hooks/useLocation'
 const { height } = useAutoHeight('pagingTop', 500)
+const mapReady = ref(false)
 defineOptions({
   name: 'LcbMap',
   options: {
@@ -134,6 +147,10 @@ const list = ref<MapItem[]>([])
 const mapScale = ref(14)
 const isConfig = ref(false)
 const currentScale = ref(14)
+const mapLatLon = ref({
+  latitude: 0,
+  longitude: 0,
+})
 
 const onTagClick = (value: string) => {
   if (props.mapTagMode === 'single') {
@@ -151,40 +168,58 @@ const onTagClick = (value: string) => {
   }
 }
 
-const getData = debounce(() => {
-  mapContext.value?.getRegion({
-    success({ southwest }) {
-      if (!southwest) return
-      mapContext.value?.getCenterLocation({
-        async success({ latitude, longitude }) {
-          isLoading.value = true
-          try {
-            const { data = [] } = (await uni.$lcb.http.post(
-              '/productInfoMap/list',
-              {
-                ...props.baseParam,
-                ...form?.value,
-                mapLatitude: latitude,
-                mapLongitude: longitude,
-                mapScale: currentScale.value,
-                mapCornerLongitude: southwest.longitude,
-                mapCornerLatitude: southwest.latitude,
-                productTypeList: selectedTag.value.length ? selectedTag.value : undefined,
-              },
-              true,
-            )) as {
-              data: MapItem[]
-            }
-            list.value = data as any
-            getCurrentData(data)
-          } finally {
-            isLoading.value = false
-          }
-        },
-      })
-    },
-  })
-}, 50)
+// 存储最新的地图区域信息
+const lastRegionInfo = ref<{
+  centerLocation: { latitude: number; longitude: number }
+  southwest?: { latitude: number; longitude: number }
+} | null>(null)
+
+const getDataCore = async () => {
+  // 安全检查：确保地图已就绪
+  if (!mapContext.value || !mapReady.value) {
+    return
+  }
+
+  // const region = await getMapRegion()
+  // lastRegionInfo.value = region
+  if (lastRegionInfo.value) {
+    await fetchMapData(lastRegionInfo.value)
+  }
+}
+
+// 请求地图数据
+const fetchMapData = async (regionInfo: {
+  centerLocation: { latitude: number; longitude: number }
+  southwest?: { latitude: number; longitude: number }
+}) => {
+  isLoading.value = true
+  try {
+    const { data = [] } = (await uni.$lcb.http.post(
+      '/productInfoMap/list',
+      {
+        ...props.baseParam,
+        ...form?.value,
+        mapLatitude: regionInfo.centerLocation.latitude,
+        mapLongitude: regionInfo.centerLocation.longitude,
+        mapScale: currentScale.value,
+        mapCornerLongitude: regionInfo.southwest?.longitude,
+        mapCornerLatitude: regionInfo.southwest?.latitude,
+        productTypeList: selectedTag.value.length ? selectedTag.value : undefined,
+      },
+      true,
+    )) as {
+      data: MapItem[]
+    }
+    list.value = data as any
+    getCurrentData(data)
+  } catch (error) {
+    console.error('地图数据请求失败:', error)
+  } finally {
+    isLoading.value = false
+  }
+}
+
+const getData = debounce(getDataCore, 50)
 watch(
   () => selectedTag.value,
   () => {
@@ -196,6 +231,21 @@ watch(
 )
 
 const getConfig = async () => {
+  // 等待地图就绪
+  if (!mapReady.value) {
+    await new Promise<void>((resolve) => {
+      const unwatch = watch(
+        () => mapReady.value,
+        (ready) => {
+          if (ready) {
+            unwatch()
+            resolve()
+          }
+        },
+      )
+    })
+  }
+
   isConfig.value = true
   const {
     data: { mapLatitude, mapLongitude, mapScale: scale },
@@ -208,28 +258,31 @@ const getConfig = async () => {
     ...form?.value,
     ...getJsonFromStr(props.mapConfigParams),
   })
-  mapContext.value = uni.createMapContext('map', proxy)
-  mapContext.value?.moveToLocation({
-    latitude: mapLatitude,
-    longitude: mapLongitude,
-  })
+
+  if (mapLatitude && `${mapLatitude}` !== '0') {
+    mapLatLon.value = {
+      latitude: mapLatitude,
+      longitude: mapLongitude,
+    }
+  }
+
   mapScale.value = scale
   currentScale.value = scale
-  getData()
 }
 
 watch(
   () => userLatLon.value,
   async (val, old) => {
     if (!val || JSON.stringify(val) === JSON.stringify(old)) return
-    mapContext.value?.moveToLocation({
-      latitude: val.latitude,
-      longitude: val.longitude,
-    })
     form.value.userLongitude = val.longitude
     form.value.userLatitude = val.latitude
     if (!isConfig.value) {
       getConfig()
+    } else {
+      mapLatLon.value = {
+        latitude: val.latitude,
+        longitude: val.longitude,
+      }
     }
   },
   {
@@ -246,16 +299,25 @@ const onRegionChange = (e: {
   detail: {
     causedBy: string
     scale: number
-    gesture: boolean
     centerLocation: {
       latitude: number
       longitude: number
     }
+    region: {
+      northeast: { latitude: number; longitude: number }
+      southwest: { latitude: number; longitude: number }
+    }
   }
 }) => {
+  // 更新当前缩放级别
+  currentScale.value = e.detail.scale
+
   if (e.type === 'end') {
+    lastRegionInfo.value = {
+      centerLocation: e.detail.centerLocation,
+      southwest: e.detail.region.southwest,
+    }
     getData()
-    currentScale.value = e.detail.scale
   }
 }
 const onCurrentChange = (p: number) => {
@@ -317,12 +379,26 @@ watch(
     deep: true,
   },
 )
-// onMounted(() => {
-//   mapContext.value = uni.createMapContext('map', proxy)
-// })
+onMounted(() => {
+  // 延迟创建 mapContext，确保 DOM 完全渲染
+  nextTick(() => {
+    setTimeout(() => {
+      try {
+        mapContext.value = uni.createMapContext('map', proxy)
+        if (mapContext.value) {
+          mapReady.value = true
+        }
+      } catch (error) {
+        console.error('地图初始化异常:', error)
+      }
+    }, 500)
+  })
+})
 
 onUnmounted(() => {
   mapContext.value = undefined
+  mapReady.value = false
+  lastRegionInfo.value = null
 })
 </script>
 <style lang="scss">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tplc/business",
-  "version": "0.5.53",
+  "version": "0.5.54",
   "keywords": [
     "业务组件"
   ],
@@ -11,7 +11,7 @@
   },
   "peerDependencies": {
     "vue": ">=3.2.47",
-    "@tplc/wot": "1.0.6"
+    "@tplc/wot": "1.0.7"
   },
   "engines": {
     "node": ">=18",