huweili-cesium 1.2.29 → 1.2.31

package/js/basis.js

@@ -126,8 +126,17 @@ export function basicConfig() {
       e.preventDefault();
     });
 
+    // 获取现有的事件处理器（如果有）
+    const existingLeftClickHandler = map.screenSpaceEventHandler.getInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    const existingRightClickHandler = map.screenSpaceEventHandler.getInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+
     // 添加右键点击事件监听
     map.screenSpaceEventHandler.setInputAction((click) => {
+      // 先调用已有的处理器（如果有）
+      if (existingRightClickHandler) {
+        existingRightClickHandler(click);
+      }
+      
       // 获取点击位置的笛卡尔坐标
       const cartesian = map.camera.pickEllipsoid(click.position, map.scene.globe.ellipsoid);
       if (cartesian) {
@@ -145,12 +154,23 @@ export function basicConfig() {
           cartesian,
         };
 
-        console.log('右键点击事件触发，点击位置:', position);
+        console.log('右键点击位置:', position);
+        callbacks.onRightClick?.(position);
+      } else {
+        callbacks.onRightClick?.({
+          mapId: _mapId,
+          screenPosition: click.position,
+        });
       }
     }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
 
     // 添加左键点击事件，用于隐藏弹窗
     map.screenSpaceEventHandler.setInputAction((click) => {
+      // 先调用已有的处理器（如果有）
+      if (existingLeftClickHandler) {
+        existingLeftClickHandler(click);
+      }
+  
       // 获取点击位置的笛卡尔坐标
       const cartesian = map.camera.pickEllipsoid(click.position, map.scene.globe.ellipsoid);
       if (cartesian) {
@@ -160,7 +180,7 @@ export function basicConfig() {
         const lat = Cesium.Math.toDegrees(cartographic.latitude);
         const height = cartographic.height;
 
-        console.log('左键点击事件触发，点击位置:', {
+        console.log('左键点击位置:', {
           lng: Number(lng),
           lat: Number(lat),
           height: Number(height)
@@ -168,7 +188,15 @@ export function basicConfig() {
         callbacks.onLeftClick?.({
           lng: Number(lng),
           lat: Number(lat),
-          height: Number(height)
+          height: Number(height),
+          mapId: _mapId,
+          screenPosition: click.position,
+          cartesian,
+        });
+      } else {
+        callbacks.onLeftClick?.({
+          mapId: _mapId,
+          screenPosition: click.position,
         });
       }
     }, Cesium.ScreenSpaceEventType.LEFT_CLICK);

package/js/clickHandler.js

@@ -218,17 +218,40 @@ export class ClickHandler {
    */
   ensureMapHandler(map, mapId) {
     if (!this.handlers.has(mapId) && map) {
-      const handler = new Cesium.ScreenSpaceEventHandler(map.scene.canvas)
-
-      handler.setInputAction((click) => {
-        this.handleClick(map, mapId, click, 'left')
-      }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
-      handler.setInputAction((click) => {
-        this.handleClick(map, mapId, click, 'right')
-      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
-
-      this.handlers.set(mapId, handler)
+      // 使用地图自带的 screenSpaceEventHandler 而不是创建新的
+      // 这样可以避免与 basis.js 中的 mouseController 冲突
+      const handler = map.screenSpaceEventHandler
+      
+      // 获取已有的事件处理器（如果有）
+      const existingLeftClickHandler = handler.getInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+      const existingRightClickHandler = handler.getInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      
+      // 存储需要清理的事件回调引用
+      const cleanupCallbacks = {
+        leftClick: null,
+        rightClick: null
+      }
+      
+      cleanupCallbacks.leftClick = (click) => {
+        // 先调用已有的处理器（如果有）
+        if (existingLeftClickHandler) {
+          existingLeftClickHandler(click);
+        }
+        this.handleClick(map, mapId, click, 'left');
+      }
+      
+      cleanupCallbacks.rightClick = (click) => {
+        // 先调用已有的处理器（如果有）
+        if (existingRightClickHandler) {
+          existingRightClickHandler(click);
+        }
+        this.handleClick(map, mapId, click, 'right');
+      }
+      
+      handler.setInputAction(cleanupCallbacks.leftClick, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+      handler.setInputAction(cleanupCallbacks.rightClick, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      
+      this.handlers.set(mapId, { handler, cleanupCallbacks });
     }
   }
 
@@ -280,9 +303,16 @@ export class ClickHandler {
       }
     })
 
-    const handler = this.handlers.get(mapId)
-    if (handler) {
-      handler.destroy()
+    const handlerData = this.handlers.get(mapId)
+    if (handlerData) {
+      // 只移除我们添加的事件监听器，不要销毁 map.screenSpaceEventHandler
+      const { handler, cleanupCallbacks } = handlerData
+      if (cleanupCallbacks.leftClick) {
+        handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
+      }
+      if (cleanupCallbacks.rightClick) {
+        handler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+      }
       this.handlers.delete(mapId)
     }
   }

package/package.json

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