vis-core 0.30.0-beta.59 → 0.30.0-beta.60

package/dist/index.module.js

@@ -63,7 +63,7 @@ import { continentsCountriesIso2 } from "geojson-cn";
 Array.prototype.at || (Array.prototype.at = function(V) {
   return V < 0 && (V = this.length + V), this[V];
 });
-const version = "0.30.0-beta.59", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.30.0-beta.60", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -57345,7 +57345,10 @@ class Qs {
       enabled: !1,
       throttleTime: 16,
       // ~60fps
-      viewportMargin: 50
+      viewportMargin: 50,
+      stabilityBonus: 50,
+      // 当前显示的标签获得 +50 优先级加成
+      fadeTime: 200
     }, e);
   }
   /**
@@ -57409,23 +57412,28 @@ class Qs {
   }
   performCollisionDetection() {
     const { padding: e, viewportMargin: n } = this.options, T = window.innerWidth, I = window.innerHeight, he = [];
-    this.labels.forEach((ve) => {
-      const ze = ve.node.element;
-      if (!ze) return;
-      const Fe = ze.firstElementChild;
+    this.labels.forEach((ze) => {
+      const Fe = ze.node.element;
       if (!Fe) return;
-      const ke = Fe.style.opacity === "0";
-      ke && (Fe.style.visibility = "hidden", Fe.style.opacity = "1");
-      const Oe = Fe.getBoundingClientRect();
-      ke && (Fe.style.opacity = "0", Fe.style.visibility = ""), !(Oe.width === 0 || Oe.height === 0) && (Oe.right >= -n && Oe.left <= T + n && Oe.bottom >= -n && Oe.top <= I + n ? (ve.bounds = Oe, he.push(ve)) : (this.setNodeVisibility(ve.node, !1), ve.visible = !1));
-    }), he.sort((ve, ze) => ze.priority - ve.priority);
-    const fe = [];
-    for (const ve of he)
-      ve.bounds && (this.checkCollision(
-        ve.bounds,
-        fe,
+      const ke = Fe.firstElementChild;
+      if (!ke) return;
+      const Oe = ke.style.opacity === "0";
+      Oe && (ke.style.visibility = "hidden", ke.style.opacity = "1");
+      const nt = ke.getBoundingClientRect();
+      Oe && (ke.style.opacity = "0", ke.style.visibility = ""), !(nt.width === 0 || nt.height === 0) && (nt.right >= -n && nt.left <= T + n && nt.bottom >= -n && nt.top <= I + n ? (ze.bounds = nt, he.push(ze)) : (this.setNodeVisibility(ze.node, !1), ze.visible = !1));
+    });
+    const { stabilityBonus: fe } = this.options;
+    he.sort((ze, Fe) => {
+      const ke = ze.priority + (ze.visible ? fe : 0);
+      return Fe.priority + (Fe.visible ? fe : 0) - ke;
+    });
+    const ve = [];
+    for (const ze of he)
+      ze.bounds && (this.checkCollision(
+        ze.bounds,
+        ve,
         e
-      ) ? (this.setNodeVisibility(ve.node, !1), ve.visible = !1) : (this.setNodeVisibility(ve.node, !0), ve.visible = !0, fe.push(ve.bounds)));
+      ) ? (this.setNodeVisibility(ze.node, !1), ze.visible = !1) : (this.setNodeVisibility(ze.node, !0), ze.visible = !0, ve.push(ze.bounds)));
   }
   /**
    * 检测矩形是否与已占用区域碰撞
@@ -57443,13 +57451,15 @@ class Qs {
     return !(e.right + T < n.left || e.left - T > n.right || e.bottom + T < n.top || e.top - T > n.bottom);
   }
   /**
-   * 设置节点可见性（操作子元素）
+   * 设置节点可见性（操作子元素，带淡入淡出）
    */
   setNodeVisibility(e, n) {
     const T = e.element;
     if (!T) return;
     const I = T.firstElementChild;
-    I && (n ? I.style.opacity = "1" : I.style.opacity = "0");
+    if (!I) return;
+    const { fadeTime: he } = this.options;
+    he > 0 && !I.style.transition && (I.style.transition = `opacity ${he}ms ease-out`), n ? I.style.opacity = "1" : I.style.opacity = "0";
   }
   /**
    * 获取当前可见的标签数量
@@ -145648,6 +145658,7 @@ class MapManager {
     C0(this, "mapPadding");
     C0(this, "isInitializing", !1);
     C0(this, "rmTemplateIdentifier");
+    C0(this, "geojsonExtensions", {});
     // 分组管理
     C0(this, "groups", {});
     // 事件处理器
@@ -145655,7 +145666,13 @@ class MapManager {
     // 定时器管理
     C0(this, "areaCloseTimer", null);
     var n;
-    this.container = e.container, this.controlsContainer = e.controlsContainer || e.container, this.assetsPrefix = e.assetsPrefix, this.fixConfig = e.fixConfig, this.raycasterPointsThreshold = e.raycasterPointsThreshold || 5e-3, this.mapPadding = e.mapPadding || [0, 0, 0, 0], this.rmTemplateIdentifier = (n = e.rmTemplateIdentifier) != null ? n : !1;
+    this.container = e.container, this.controlsContainer = e.controlsContainer || e.container, this.assetsPrefix = e.assetsPrefix, this.fixConfig = e.fixConfig, this.raycasterPointsThreshold = e.raycasterPointsThreshold || 5e-3, this.mapPadding = e.mapPadding || [0, 0, 0, 0], this.rmTemplateIdentifier = (n = e.rmTemplateIdentifier) != null ? n : !1, e.geojsonExtensions && Object.entries(e.geojsonExtensions).forEach(([T, I]) => {
+      this.geojsonExtensions[T] = [], I.forEach((he) => {
+        extendsAdcodeAll((fe) => {
+          fe[he.adcode] = he, fe[T].c.push(he.adcode), this.geojsonExtensions[T].push(he.adcode);
+        });
+      });
+    });
   }
   /**
    * 设置事件处理器
@@ -145692,7 +145709,7 @@ class MapManager {
       const T = e.at(-1) || e.at(-2);
       if (!T) return null;
       try {
-        return this.isInitializing = !0, yield this.createMapInstance(T, n);
+        this.isInitializing = !0, yield this.createMapInstance(T, n);
       } finally {
         this.isInitializing = !1;
       }
@@ -145730,7 +145747,7 @@ class MapManager {
               nt.h.u[0].visOptions,
               nt.h.i
             );
-            he != null && he.c.length && (at.showBuilding = !1), nt.h.u[0].visOptions = at;
+            this.geojsonExtensions && (at.geojsonExtensions = this.geojsonExtensions), he != null && he.c.length && (at.showBuilding = !1), nt.h.u[0].visOptions = at;
           }
           return nt;
         }),
@@ -145765,39 +145782,42 @@ class MapManager {
    * 绑定区域交互事件
    */
   bindAreaEvents(e) {
-    const n = {};
-    e.mapArea.forEach((T) => {
-      var fe;
-      T.lead.enableCursor(T);
-      const I = T.userData.adcode, he = e.cityVis.length === 1 ? e.cityVis[0] : e.cityVis.find((ve) => ve.options.adcode === I);
-      if (he) {
-        const ve = (fe = n[he.options.adcode]) != null ? fe : he.group.getSize().max.z;
-        n[he.options.adcode] = ve;
-      }
-      T.onPointerEnter(({ mouseEvent: ve }) => {
-        if (this.clearAreaCloseTimer(), T.useMListByName("顶面高亮", 0), he && (T.position.z = n[he.options.adcode] - e.mapObj.depth), !(T.userData.centroid || T.userData.center)) return;
-        const { max: Fe, center: ke } = T.getSize(), Oe = e.getScreenPosition(
-          ke.x,
-          ke.y,
-          Fe.z
+    const n = {}, T = e.options.geojsonExtensions && Object.values(e.options.geojsonExtensions).flat();
+    T && e.map.groupArr.forEach((I) => {
+      T.includes(I.userData.adcode) && (I.position.z += 1e-3);
+    }), e.mapArea.forEach((I) => {
+      var ve;
+      const he = I.userData.adcode;
+      I.lead.enableCursor(I);
+      const fe = e.cityVis.length === 1 ? e.cityVis[0] : e.cityVis.find((ze) => ze.options.adcode === he);
+      if (fe) {
+        const ze = (ve = n[fe.options.adcode]) != null ? ve : fe.group.getSize().max.z;
+        n[fe.options.adcode] = ze;
+      }
+      I.onPointerEnter(({ mouseEvent: ze }) => {
+        if (this.clearAreaCloseTimer(), I.useMListByName("顶面高亮", 0), fe && (I.position.z = n[fe.options.adcode] - e.mapObj.depth), !(I.userData.centroid || I.userData.center)) return;
+        const { max: ke, center: Oe } = I.getSize(), nt = e.getScreenPosition(
+          Oe.x,
+          Oe.y,
+          ke.z
         );
         this.emit("areaHover", {
-          areaName: T.userData.name,
-          x: Oe.x,
-          y: Oe.y,
-          mouseLeft: ve.clientX,
-          mouseTop: ve.clientY
+          areaName: I.userData.name,
+          x: nt.x,
+          y: nt.y,
+          mouseLeft: ze.clientX,
+          mouseTop: ze.clientY
         });
-      }), T.onPointerMove(() => {
+      }), I.onPointerMove(() => {
         this.clearAreaCloseTimer();
-      }), T.onPointerLeave(() => {
-        T.useMListByName("顶面", 0), he && (T.position.z = 0), this.triggerAreaLeave({
-          areaName: T.userData.name
+      }), I.onPointerLeave(() => {
+        I.useMListByName("顶面", 0), fe && (I.position.z = 0), this.triggerAreaLeave({
+          areaName: I.userData.name
         });
-      }), T.onClick(() => {
-        T.useMListByName("顶面", 0), he && (T.position.z = 0), this.emit("areaClick", {
-          areaName: T.userData.name,
-          adcode: T.userData.adcode
+      }), I.onClick(() => {
+        I.useMListByName("顶面", 0), fe && (I.position.z = 0), this.emit("areaClick", {
+          areaName: I.userData.name,
+          adcode: I.userData.adcode
         });
       });
     });
@@ -145869,7 +145889,7 @@ class MapManager {
     }), this.mapInstances = {}, this.currentMap = null, Editor.clearUrlCache();
   }
 }
-C0(MapManager, "findAdcodeInfoByName", findAdcodeInfoByName), C0(MapManager, "getAdcodeShowLevel", getAdcodeShowLevel), C0(MapManager, "findAdcodeInfo", findAdcodeInfo), C0(MapManager, "extendsAdcodeAll", extendsAdcodeAll);
+C0(MapManager, "findAdcodeInfoByName", findAdcodeInfoByName), C0(MapManager, "getAdcodeShowLevel", getAdcodeShowLevel), C0(MapManager, "findAdcodeInfo", findAdcodeInfo);
 const access = {
   set token(V) {
     accessToken.token = V;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.30.0-beta.59";
+declare const _default: "0.30.0-beta.60";
 export default _default;

package/dist/vis/map/MapManager.d.ts

@@ -13,6 +13,7 @@ export interface MapManagerConfig {
     raycasterPointsThreshold?: number;
     mapPadding?: [number, number, number, number];
     rmTemplateIdentifier?: boolean;
+    geojsonExtensions?: Record<string, any[]>;
 }
 export interface MapEventHandlers {
     [key: string]: (...args: any[]) => void;
@@ -36,6 +37,7 @@ export declare class MapManager {
     private mapPadding;
     private isInitializing;
     private rmTemplateIdentifier;
+    private geojsonExtensions;
     private groups;
     private eventHandlers;
     private areaCloseTimer;
@@ -60,7 +62,6 @@ export declare class MapManager {
         c: number[];
         b: number[];
     } | undefined;
-    static extendsAdcodeAll: (cb: any) => void;
     constructor(config: MapManagerConfig);
     /**
      * 设置事件处理器
@@ -81,7 +82,7 @@ export declare class MapManager {
     /**
      * 初始化地图
      */
-    initMap(adcodeArr: number[], fixedAdcode?: boolean): Promise<Map | null>;
+    initMap(adcodeArr: number[], fixedAdcode?: boolean): Promise<Map | null | undefined>;
     /**
      * 创建地图实例
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.30.0-beta.59",
+  "version": "0.30.0-beta.60",
   "scripts": {
     "start": "npm run version && PORT=5174 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",
@@ -64,7 +64,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.2.5",
-    "gl-draw": "0.17.0-beta.42",
+    "gl-draw": "0.17.0-beta.43",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },