hn-map 1.1.18 → 1.1.19

package/src/base/cesium_popup.ts

@@ -178,11 +178,18 @@ export default (hnMap: any) => {
 
     // 隐藏弹窗
     public hide(): void {
-      if (this.popupContainer) {
-        this.popupContainer.style.display = "none";
+      if (this.popupContainer && this.popupContainer.parentNode) {
+        // 移除点击外部关闭的监听器
+        document.removeEventListener("click", this.handleOutsideClick);
+
+        // 从 DOM 中彻底移除容器
+        this.popupContainer.parentNode.removeChild(this.popupContainer);
+
+        // 重置引用
+        this.popupContainer = null;
+        this.popupElement = null;
         this.isPopupVisible = false;
         this.currentEntity = null;
-        document.removeEventListener("click", this.handleOutsideClick);
       }
     }
 
@@ -192,6 +199,7 @@ export default (hnMap: any) => {
         this.popupElement &&
         !this.popupElement.contains(event.target as Node)
       ) {
+        console.log(1111111111111)
         this.hide();
       }
     };

package/src/map.ts

@@ -1,4 +1,5 @@
 import { deepMerge, getHeightToLevel, getLevelMiddleHeight } from "./util";
+import CesiumEntity from "./base/cesium_entity";
 
 export default (hnMap: any) => {
   const defaultOption = {
@@ -475,6 +476,9 @@ export default (hnMap: any) => {
     layerList: any = [];
     event: any = {};
     level: any = null;
+    private globalClickHandler: any = null;
+    // 新增：点击回调注册表 存储 { entityGraphic => clickHandler }
+    private entityClickHandlers = new Map<any, Array<(movement: any) => void>>();
     // 数据源集合
     // dataSources: any = new Cesium.CustomDataSource("hnMap_dataSources");
     //  // 数据源集合 - 改为初始化为数组
@@ -537,7 +541,11 @@ export default (hnMap: any) => {
       setTimeout(() => {
         this.addMars3dStyleRoadNetwork();
       }, 100);
+
+      // 初始化后设置全局点击监听
+      this.setupGlobalClickHandler();
     }
+
     static async create(id: string, option: any) {
       const instance = new cesium_map(id, option);
 
@@ -598,9 +606,26 @@ export default (hnMap: any) => {
       return config;
     }
 
+    private setupGlobalClickHandler() {
+      // 销毁旧的（防止重复）
+      if (this.globalClickHandler) {
+        this.globalClickHandler.destroy();
+      }
+
+      this.globalClickHandler = new Cesium.ScreenSpaceEventHandler(this.map.canvas);
+      this.globalClickHandler.setInputAction((movement: any) => {
+        const pickedObject = this.map.scene.pick(movement.position);
+        if (pickedObject && pickedObject.id) {
+          const handlers = this.entityClickHandlers.get(pickedObject.id);
+          if (handlers && handlers.length > 0) {
+            handlers.forEach(handler => handler(movement));
+          }
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    }
+
     // 模仿Mars3D的方式添加路网
     private addMars3dStyleRoadNetwork() {
-      // console.log("添加Mars3D风格的路网...");
 
       // 方案0：使用GeoJSON数据（如果可用）
       if (this.option.roadNetworkGeoJSON) {