huweili-cesium 1.2.22 → 1.2.24

package/index.vue

@@ -28,7 +28,7 @@ const {
 
 const mapStore = useMapStore()
 const { on: onEvent, off: offEvent } = useEventBus()
-const emit = defineEmits(['onload'])
+const emit = defineEmits(['onload', 'rightClick', 'leftClick'])
 const props = defineProps({
   options: {
     type: Object,
@@ -239,7 +239,10 @@ const initCesium = async () => {
       })
     }
 
-    mouseController(map, props.mapId) // 初始化鼠标控制器
+    mouseController(map, props.mapId, {
+      onRightClick: (position) => emit('rightClick', position),
+      onLeftClick: (event) => emit('leftClick', event),
+    }) // 初始化鼠标控制器
 
     mapStore.setMapInfo(
       'center',

package/js/basis.js

@@ -120,7 +120,7 @@ export function basicConfig() {
    * 处理地图上的鼠标事件，包括点击、拖动、缩放等、
    * @param map - 地图实例
    */
-  const mouseController = (map, _mapId) => {
+  const mouseController = (map, _mapId, callbacks = {}) => {
     // 添加右键点击事件监听
     map.screenSpaceEventHandler.setInputAction((click) => {
       // 获取点击位置的笛卡尔坐标
@@ -132,12 +132,17 @@ export function basicConfig() {
         const lng = Cesium.Math.toDegrees(cartographic.longitude);
         const lat = Cesium.Math.toDegrees(cartographic.latitude);
         const height = cartographic.height;
-
-        console.log('点击位置:', {
+        const position = {
           lng: Number(lng),
           lat: Number(lat),
-          height: Number(height)
-        });
+          height: Number(height),
+          mapId: _mapId,
+          screenPosition: click.position,
+          cartesian,
+        };
+
+        console.log('点击位置:', position);
+        callbacks.onRightClick?.(position);
 
         // 弹出alert显示坐标信息
         // alert(`点击位置坐标：\n经度：${Number(lng).toFixed(6)}\n纬度：${Number(lat).toFixed(6)}\n高度：${Number(height).toFixed(2)}米`);
@@ -145,8 +150,9 @@ export function basicConfig() {
     }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
 
     // 添加左键点击事件，用于隐藏弹窗
-    map.screenSpaceEventHandler.setInputAction(() => {
+    map.screenSpaceEventHandler.setInputAction((click) => {
       console.log('左键点击事件触发')
+      callbacks.onLeftClick?.({ mapId: _mapId, screenPosition: click.position });
     }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
   }
 

package/js/labelDiv.js

@@ -34,6 +34,9 @@ export function labelDiv() {
       labelDiv.style.setProperty('--drone-label-bg-color', statusConfig.labelBgColor);
     }
 
+    // 机巢无人机只展示头顶标签，不允许点击标签弹出可拖拽详情面板
+    const isMachineNestDrone = status === DroneStatus.MACHINE_NEST;
+
     // 存储无人机详情面板的位置坐标，用于拖拽功能
     let new_detailDivLeft = null;
     let new_detailDivTop = null;
@@ -313,8 +316,8 @@ export function labelDiv() {
       }
     };
 
-    // 通过无人机id绑定并触发详情面板打开逻辑
-    const unbindDetailClick = bindDroneLabelDetailHandler({
+    // 通过无人机id绑定并触发详情面板打开逻辑（机巢无人机不绑定详情弹窗）
+    const unbindDetailClick = isMachineNestDrone ? () => {} : bindDroneLabelDetailHandler({
       id: labelItem.id,
       labelEl: labelDiv,
       openDetail: () => {
@@ -323,11 +326,6 @@ export function labelDiv() {
           return; // 如果已存在，直接返回，不创建新的
         }
 
-        // 机巢无人机不允许打开详情面板和拖拽
-        if (status === DroneStatus.MACHINE_NEST) {
-          return;
-        }
-
         new_detailDivLeft = null;
         new_detailDivTop = null;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huweili-cesium",
-  "version": "1.2.22",
+  "version": "1.2.24",
   "description": "基于 Cesium 的地图工具库（无人机态势、轨迹、围栏、工具栏等）",
   "type": "module",
   "main": "./index.js",