leiting-bim 2.1.165 → 2.1.171

package/plugins/cesium-vue/dist/components/marker-manage.js

@@ -1,12 +1,12 @@
-import { w as Ne } from "../create-DynflqE1.js";
-import { h as x, markRaw as I, render as O, defineComponent as ke, inject as Be, onMounted as We, watch as te, onUnmounted as Fe, renderSlot as $e, unref as ze } from "vue";
+import { w as Re } from "../create-DynflqE1.js";
+import { h as x, markRaw as I, render as O, defineComponent as Ne, inject as ke, onMounted as We, watch as te, onUnmounted as Fe, renderSlot as $e, unref as ze } from "vue";
 import { M as G, H as ie, a as V } from "../HtmlOverlayLabelPool-CbiNlyAM.js";
 import { CxCardCarousel as re } from "./card-carousel.js";
 import { CxMarkerBubbleLine as Ve, CxMarkerBubble as Ke } from "./marker-bubble.js";
 import { CxMarkerDefault as ae } from "./marker-default.js";
 import { CxMarkerHtml as Xe } from "./marker-html.js";
 import { CxMarkerText as Ye } from "./marker-text.js";
-import { i as q, b as ce, a as P, S as R, d as ne, c as j, e as ge, f as Ue, g as de, M as ue, h as K, j as qe, k as je, l as Ze, m as fe, n as me, o as Je, p as Qe, q as et, r as tt, s as it, t as pe, u as rt, v as at, w as nt, x as ot } from "../index-McKGafjp.js";
+import { i as q, b as ce, a as P, S as B, d as ne, c as j, e as de, f as Ue, g as ge, M as ue, h as K, j as qe, k as je, l as Ze, m as fe, n as me, o as Je, p as Qe, q as et, r as tt, s as it, t as pe, u as rt, v as at, w as nt, x as ot } from "../index-McKGafjp.js";
 const st = {
   id: { type: String, default: "marker" },
   Cesium: { type: Object },
@@ -108,6 +108,15 @@ class lt {
       this._addPointToGrid(i);
     t && this._scheduleUpdate();
   }
+  _getCurrentBillboard(e) {
+    return e?.__currentBillboard || e?.billboard?.[0];
+  }
+  _getBillboardTheme(e) {
+    return this._getCurrentBillboard(e)?.theme;
+  }
+  _shouldSkipAggregation(e) {
+    return this._getCurrentBillboard(e)?.skipAggregation;
+  }
   _scheduleUpdate() {
     this._updateTimer !== null && clearTimeout(this._updateTimer), this._updateTimer = window.setTimeout(() => {
       this._update(), this._cameraDirty = !0, this._updateTimer = null;
@@ -120,23 +129,23 @@ class lt {
     for (const n of this.levels) {
       const o = n.level, s = this.gridLayers.get(o);
       if (!s) continue;
-      const h = this.Cesium.Cartographic.fromDegrees(i.lon, i.lat), g = this.tilingScheme.positionToTileXY(
+      const h = this.Cesium.Cartographic.fromDegrees(i.lon, i.lat), d = this.tilingScheme.positionToTileXY(
         h,
         o,
         new this.Cesium.Cartesian2()
       );
-      if (!g) continue;
-      const l = `${g.x}_${g.y}`, c = s.get(l);
+      if (!d) continue;
+      const l = `${d.x}_${d.y}`, c = s.get(l);
       if (c) {
-        const d = c.allPoints.findIndex((f) => f.id === e.id);
-        if (d !== -1 && c.allPoints.splice(d, 1), i.data?.billboard?.[0]?.skipAggregation) {
+        const g = c.allPoints.findIndex((f) => f.id === e.id);
+        if (g !== -1 && c.allPoints.splice(g, 1), this._shouldSkipAggregation(i.data)) {
           const f = c.skipPoints.findIndex((u) => u.id === e.id);
           f !== -1 && c.skipPoints.splice(f, 1);
         } else {
-          const f = this.groupByTheme ? i.data?.theme : this.clusterTheme, u = c.groups.get(f);
+          const f = this.groupByTheme ? this._getBillboardTheme(i.data) : this.clusterTheme, u = c.groups.get(f);
           if (u) {
-            const m = u.findIndex((b) => b.id === e.id);
-            m !== -1 && u.splice(m, 1), u.length === 0 && c.groups.delete(f);
+            const v = u.findIndex((p) => p.id === e.id);
+            v !== -1 && u.splice(v, 1), u.length === 0 && c.groups.delete(f);
           }
         }
       }
@@ -153,8 +162,8 @@ class lt {
         for (const [n, o] of r.entries()) {
           o.allPoints = o.allPoints.filter((s) => !t.has(s.id)), o.skipPoints = o.skipPoints.filter((s) => !t.has(s.id));
           for (const [s, h] of o.groups.entries()) {
-            const g = h.filter((l) => !t.has(l.id));
-            g.length === 0 ? o.groups.delete(s) : o.groups.set(s, g);
+            const d = h.filter((l) => !t.has(l.id));
+            d.length === 0 ? o.groups.delete(s) : o.groups.set(s, d);
           }
           o.allPoints.length === 0 && r.delete(n);
         }
@@ -184,11 +193,11 @@ class lt {
         allPoints: [],
         groups: /* @__PURE__ */ new Map(),
         skipPoints: []
-      }, r.set(s, h)), h.allPoints.push(e), e.data?.billboard?.[0]?.skipAggregation)
+      }, r.set(s, h)), h.allPoints.push(e), this._shouldSkipAggregation(e.data))
         h.skipPoints.push(e);
       else {
-        const g = this.groupByTheme ? e.data?.billboard?.[0]?.theme : this.clusterTheme;
-        h.groups.has(g) || h.groups.set(g, []), h.groups.get(g).push(e);
+        const d = this.groupByTheme ? this._getBillboardTheme(e.data) : this.clusterTheme;
+        h.groups.has(d) || h.groups.set(d, []), h.groups.get(d).push(e);
       }
     }
   }
@@ -248,7 +257,7 @@ class lt {
         lon: t.lon,
         lat: t.lat,
         height: t.height,
-        theme: t.data?.billboard?.[0]?.theme || this.pointTheme,
+        theme: this._getBillboardTheme(t.data) || this.pointTheme,
         style: t.style
       }), e++);
     }
@@ -283,41 +292,41 @@ class lt {
     return t;
   }
   _processTiles(e, t) {
-    const i = /* @__PURE__ */ new Set(), r = !this._isTerrainEnabled(), n = this.viewer.scene, o = n && n.globe, s = o && o.ellipsoid, h = s && n.camera.computeViewRectangle(s), g = (l, c, d) => {
+    const i = /* @__PURE__ */ new Set(), r = !this._isTerrainEnabled(), n = this.viewer.scene, o = n && n.globe, s = o && o.ellipsoid, h = s && n.camera.computeViewRectangle(s), d = (l, c, g) => {
       if (!r || !h) return !0;
-      const f = this.tilingScheme.tileXYToRectangle(l, c, d);
+      const f = this.tilingScheme.tileXYToRectangle(l, c, g);
       return !(!f || f.east <= h.west || f.west >= h.east || f.north <= h.south || f.south >= h.north);
     };
     for (const l of e) {
-      const c = l.rectangle, d = l._level ?? l.level;
-      if (!c || typeof d != "number") continue;
-      const f = this._getGridRefLevel(d), u = this._resolveLevelIndex(f);
+      const c = l.rectangle, g = l._level ?? l.level;
+      if (!c || typeof g != "number") continue;
+      const f = this._getGridRefLevel(g), u = this._resolveLevelIndex(f);
       if (u === void 0) continue;
-      const m = this.levels[u].level, b = l._x ?? l.x, _ = l._y ?? l.y;
-      if (typeof b == "number" && typeof _ == "number") {
-        const L = d - m;
+      const v = this.levels[u].level, p = l._x ?? l.x, C = l._y ?? l.y;
+      if (typeof p == "number" && typeof C == "number") {
+        const L = g - v;
         if (L >= 0) {
-          const T = 1 << L, M = Math.floor(b / T), D = Math.floor(_ / T), A = `${m}_${M}_${D}`;
+          const T = 1 << L, M = Math.floor(p / T), D = Math.floor(C / T), A = `${v}_${M}_${D}`;
           if (i.has(A)) continue;
-          i.add(A), t(u, M, D, d);
+          i.add(A), t(u, M, D, g);
         } else {
-          const M = 1 << Math.min(-L, this.maxRefineLevels), D = b * M, A = _ * M;
+          const M = 1 << Math.min(-L, this.maxRefineLevels), D = p * M, A = C * M;
           for (let W = 0; W < M; W++)
             for (let F = 0; F < M; F++) {
               const $ = D + W, z = A + F;
-              if (!g($, z, m)) continue;
-              const ee = `${m}_${$}_${z}`;
-              i.has(ee) || (i.add(ee), t(u, $, z, d));
+              if (!d($, z, v)) continue;
+              const ee = `${v}_${$}_${z}`;
+              i.has(ee) || (i.add(ee), t(u, $, z, g));
             }
         }
         continue;
       }
-      const p = this.levels[u].size, S = this.Cesium.Math.toDegrees(c.west), k = this.Cesium.Math.toDegrees(c.east), E = this.Cesium.Math.toDegrees(c.south), B = this.Cesium.Math.toDegrees(c.north), Oe = Math.floor((S - -180) / p), Ge = Math.floor((k - -180) / p), He = Math.floor((E - -90) / p), Re = Math.floor((B - -90) / p);
+      const m = this.levels[u].size, S = this.Cesium.Math.toDegrees(c.west), N = this.Cesium.Math.toDegrees(c.east), E = this.Cesium.Math.toDegrees(c.south), k = this.Cesium.Math.toDegrees(c.north), Oe = Math.floor((S - -180) / m), Ge = Math.floor((N - -180) / m), He = Math.floor((E - -90) / m), Be = Math.floor((k - -90) / m);
       for (let L = Oe; L <= Ge; L++)
-        for (let T = He; T <= Re; T++) {
-          if (!g(L, T, m)) continue;
-          const M = `${m}_${L}_${T}`;
-          i.has(M) || (i.add(M), t(u, L, T, d));
+        for (let T = He; T <= Be; T++) {
+          if (!d(L, T, v)) continue;
+          const M = `${v}_${L}_${T}`;
+          i.has(M) || (i.add(M), t(u, L, T, g));
         }
     }
   }
@@ -330,23 +339,23 @@ class lt {
   _getCellContext(e, t, i, r) {
     const o = this.levels[e].level, s = this.gridLayers.get(o);
     if (!s) return null;
-    const h = `${t}_${i}`, g = s.get(h);
-    if (!g) return null;
-    const l = this.tilingScheme.tileXYToRectangle(t, i, o), c = this.Cesium.Math.toDegrees(l.west), d = this.Cesium.Math.toDegrees(l.south), f = this.Cesium.Math.toDegrees(l.east), u = this.Cesium.Math.toDegrees(l.north), m = (c + f) / 2, b = (d + u) / 2;
+    const h = `${t}_${i}`, d = s.get(h);
+    if (!d) return null;
+    const l = this.tilingScheme.tileXYToRectangle(t, i, o), c = this.Cesium.Math.toDegrees(l.west), g = this.Cesium.Math.toDegrees(l.south), f = this.Cesium.Math.toDegrees(l.east), u = this.Cesium.Math.toDegrees(l.north), v = (c + f) / 2, p = (g + u) / 2;
     return {
       levelIdx: e,
       tileLevel: o,
       lonIdx: t,
       latIdx: i,
       key: h,
-      cell: g,
+      cell: d,
       rect: l,
       west: c,
-      south: d,
+      south: g,
       east: f,
       north: u,
-      centerLon: m,
-      centerLat: b,
+      centerLon: v,
+      centerLat: p,
       viewTileLevel: r
     };
   }
@@ -360,7 +369,7 @@ class lt {
           lon: o.lon,
           lat: o.lat,
           height: o.height,
-          theme: o.data?.billboard?.[0]?.theme || this.pointTheme,
+          theme: this._getBillboardTheme(o.data) || this.pointTheme,
           style: o.style
         }), t++);
       }
@@ -373,46 +382,46 @@ class lt {
       latIdx: o,
       cell: s,
       centerLon: h,
-      centerLat: g,
+      centerLat: d,
       viewTileLevel: l
     } = e, c = l;
-    for (const [d, f] of s.groups) {
-      const u = f.filter((p) => p.data?.show !== !1);
+    for (const [g, f] of s.groups) {
+      const u = f.filter((m) => m.data?.show !== !1);
       if (u.length === 0) continue;
-      let m = h, b = g, _ = u[0]?.height || 0;
-      if (this.centralPointMode == "firstPoint" && (m = u[0]?.lon || 0, b = u[0]?.lat || 0, _ = u[0]?.height || 0), r === this.levels.length - 1 || u.length < t)
-        for (const p of u) {
+      let v = h, p = d, C = u[0]?.height || 0;
+      if (this.centralPointMode == "firstPoint" && (v = u[0]?.lon || 0, p = u[0]?.lat || 0, C = u[0]?.height || 0), r === this.levels.length - 1 || u.length < t)
+        for (const m of u) {
           if (i >= this.displayLimit) break;
-          this._isVisibleAtLevel(p, c) && (this.labelPool.add(p.data, {
-            id: `point-${p.id}`,
-            lon: p.lon,
-            lat: p.lat,
-            height: p.height,
-            theme: p.data?.billboard?.[0]?.theme || this.pointTheme,
-            style: p.style
+          this._isVisibleAtLevel(m, c) && (this.labelPool.add(m.data, {
+            id: `point-${m.id}`,
+            lon: m.lon,
+            lat: m.lat,
+            height: m.height,
+            theme: this._getBillboardTheme(m.data) || this.pointTheme,
+            style: m.style
           }), i++);
         }
       else {
         if (i >= this.displayLimit)
           return i;
-        const p = c == null ? u : u.filter((B) => this._isVisibleAtLevel(B, c));
-        if (!p.length) return i;
-        const k = p[0]?.data?.billboard?.[0]?.theme || this.clusterTheme, E = this.groupByTheme ? `cluster-${r}-${n}-${o}-${d}` : `cluster-${r}-${n}-${o}`;
+        const m = c == null ? u : u.filter((k) => this._isVisibleAtLevel(k, c));
+        if (!m.length) return i;
+        const N = this._getBillboardTheme(m[0]?.data) || this.clusterTheme, E = this.groupByTheme ? `cluster-${r}-${n}-${o}-${g}` : `cluster-${r}-${n}-${o}`;
         this.labelPool.add(
           {
             id: E,
-            billboard: p[0]?.data?.billboard || [],
-            count: p.length,
+            billboard: m[0]?.data?.billboard || [],
+            count: m.length,
             gridKey: `${n}_${o}`,
-            points: p,
-            aggregationGroup: d
+            points: m,
+            aggregationGroup: g
           },
           {
             id: E,
-            lon: m,
-            lat: b,
-            height: _,
-            theme: k
+            lon: v,
+            lat: p,
+            height: C,
+            theme: N
           }
         ), i++;
       }
@@ -421,13 +430,13 @@ class lt {
   }
   _debugDrawCell(e) {
     if (!this.debugCurrentGrids) return;
-    const { levelIdx: t, west: i, south: r, east: n, north: o, lonIdx: s, latIdx: h } = e, g = this.levels[t].level;
+    const { levelIdx: t, west: i, south: r, east: n, north: o, lonIdx: s, latIdx: h } = e, d = this.levels[t].level;
     this._drawDebugGrid(
       i,
       r,
       n,
       o,
-      `L:${g} X:${s} Y:${h}`
+      `L:${d} X:${s} Y:${h}`
     );
   }
   refresh() {
@@ -513,18 +522,18 @@ function ye(a, e) {
     r[t] = e(a[t], t, a);
   return r;
 }
-var oe = R ? R.prototype : void 0, se = oe ? oe.toString : void 0;
-function ve(a) {
+var oe = B ? B.prototype : void 0, se = oe ? oe.toString : void 0;
+function be(a) {
   if (typeof a == "string")
     return a;
   if (P(a))
-    return ye(a, ve) + "";
+    return ye(a, be) + "";
   if (Z(a))
     return se ? se.call(a) : "";
   var e = a + "";
   return e == "0" && 1 / a == -1 / 0 ? "-0" : e;
 }
-function be(a) {
+function ve(a) {
   return a;
 }
 function ct(a, e, t) {
@@ -540,13 +549,13 @@ function ct(a, e, t) {
   }
   return a.apply(e, t);
 }
-var gt = 800, dt = 16, ut = Date.now;
+var dt = 800, gt = 16, ut = Date.now;
 function ft(a) {
   var e = 0, t = 0;
   return function() {
-    var i = ut(), r = dt - (i - t);
+    var i = ut(), r = gt - (i - t);
     if (t = i, r > 0) {
-      if (++e >= gt)
+      if (++e >= dt)
         return arguments[0];
     } else
       e = 0;
@@ -565,8 +574,8 @@ var pt = ne ? function(a, e) {
     value: mt(e),
     writable: !0
   });
-} : be, Ce = ft(pt), le = Math.max;
-function Me(a, e, t) {
+} : ve, Ce = ft(pt), le = Math.max;
+function _e(a, e, t) {
   return e = le(e === void 0 ? a.length - 1 : e, 0), function() {
     for (var i = arguments, r = -1, n = le(i.length - e, 0), o = Array(n); ++r < n; )
       o[r] = i[e + r];
@@ -577,30 +586,30 @@ function Me(a, e, t) {
   };
 }
 function yt(a, e) {
-  return Ce(Me(a, e, be), a + "");
+  return Ce(_e(a, e, ve), a + "");
 }
-function vt(a, e, t) {
+function bt(a, e, t) {
   if (!j(t))
     return !1;
   var i = typeof e;
-  return (i == "number" ? ge(t) && Ue(e, t.length) : i == "string" && e in t) ? de(t[e], a) : !1;
+  return (i == "number" ? de(t) && Ue(e, t.length) : i == "string" && e in t) ? ge(t[e], a) : !1;
 }
-function bt(a) {
+function vt(a) {
   return yt(function(e, t) {
     var i = -1, r = t.length, n = r > 1 ? t[r - 1] : void 0, o = r > 2 ? t[2] : void 0;
-    for (n = a.length > 3 && typeof n == "function" ? (r--, n) : void 0, o && vt(t[0], t[1], o) && (n = r < 3 ? void 0 : n, r = 1), e = Object(e); ++i < r; ) {
+    for (n = a.length > 3 && typeof n == "function" ? (r--, n) : void 0, o && bt(t[0], t[1], o) && (n = r < 3 ? void 0 : n, r = 1), e = Object(e); ++i < r; ) {
       var s = t[i];
       s && a(e, s, i, n);
     }
     return e;
   });
 }
-var Ct = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, Mt = /^\w*$/;
-function _t(a, e) {
+var Ct = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, _t = /^\w*$/;
+function Mt(a, e) {
   if (P(a))
     return !1;
   var t = typeof a;
-  return t == "number" || t == "symbol" || t == "boolean" || a == null || Z(a) ? !0 : Mt.test(a) || !Ct.test(a) || e != null && a in Object(e);
+  return t == "number" || t == "symbol" || t == "boolean" || a == null || Z(a) ? !0 : _t.test(a) || !Ct.test(a) || e != null && a in Object(e);
 }
 var Lt = "Expected a function";
 function J(a, e) {
@@ -630,10 +639,10 @@ var wt = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=
   }), e;
 });
 function St(a) {
-  return a == null ? "" : ve(a);
+  return a == null ? "" : be(a);
 }
 function Q(a, e) {
-  return P(a) ? a : _t(a, e) ? [a] : It(St(a));
+  return P(a) ? a : Mt(a, e) ? [a] : It(St(a));
 }
 function X(a) {
   if (typeof a == "string" || Z(a))
@@ -647,7 +656,7 @@ function Et(a, e) {
     a = a[X(e[t++])];
   return t && t == i ? a : void 0;
 }
-var he = R ? R.isConcatSpreadable : void 0;
+var he = B ? B.isConcatSpreadable : void 0;
 function Dt(a) {
   return P(a) || K(a) || !!(he && a && a[he]);
 }
@@ -664,17 +673,17 @@ function Ot(a) {
   return e ? At(a) : [];
 }
 function Gt(a) {
-  return Ce(Me(a, void 0, Ot), a + "");
+  return Ce(_e(a, void 0, Ot), a + "");
 }
-var Ht = "[object Object]", Rt = Function.prototype, Nt = Object.prototype, _e = Rt.toString, kt = Nt.hasOwnProperty, Bt = _e.call(Object);
+var Ht = "[object Object]", Bt = Function.prototype, Rt = Object.prototype, Me = Bt.toString, Nt = Rt.hasOwnProperty, kt = Me.call(Object);
 function Le(a) {
   if (!q(a) || ce(a) != Ht)
     return !1;
   var e = je(a);
   if (e === null)
     return !0;
-  var t = kt.call(e, "constructor") && e.constructor;
-  return typeof t == "function" && t instanceof t && _e.call(t) == Bt;
+  var t = Nt.call(e, "constructor") && e.constructor;
+  return typeof t == "function" && t instanceof t && Me.call(t) == kt;
 }
 function Wt(a, e, t) {
   var i = -1, r = a.length;
@@ -695,10 +704,10 @@ function Ft(a) {
 }
 var $t = Ft();
 function Y(a, e, t) {
-  (t !== void 0 && !de(a[e], t) || t === void 0 && !(e in a)) && Ze(a, e, t);
+  (t !== void 0 && !ge(a[e], t) || t === void 0 && !(e in a)) && Ze(a, e, t);
 }
 function zt(a) {
-  return q(a) && ge(a);
+  return q(a) && de(a);
 }
 function U(a, e) {
   if (!(e === "constructor" && typeof a[e] == "function") && e != "__proto__")
@@ -708,15 +717,15 @@ function Vt(a) {
   return fe(a, me(a));
 }
 function Kt(a, e, t, i, r, n, o) {
-  var s = U(a, t), h = U(e, t), g = o.get(h);
-  if (g) {
-    Y(a, t, g);
+  var s = U(a, t), h = U(e, t), d = o.get(h);
+  if (d) {
+    Y(a, t, d);
     return;
   }
   var l = n ? n(s, h, t + "", a, e, o) : void 0, c = l === void 0;
   if (c) {
-    var d = P(h), f = !d && Je(h), u = !d && !f && Qe(h);
-    l = h, d || f || u ? P(s) ? l = s : zt(s) ? l = et(s) : f ? (c = !1, l = tt(h, !0)) : u ? (c = !1, l = it(h, !0)) : l = [] : Le(h) || K(h) ? (l = s, K(s) ? l = Vt(s) : (!j(s) || pe(s)) && (l = rt(h))) : c = !1;
+    var g = P(h), f = !g && Je(h), u = !g && !f && Qe(h);
+    l = h, g || f || u ? P(s) ? l = s : zt(s) ? l = et(s) : f ? (c = !1, l = tt(h, !0)) : u ? (c = !1, l = it(h, !0)) : l = [] : Le(h) || K(h) ? (l = s, K(s) ? l = Vt(s) : (!j(s) || pe(s)) && (l = rt(h))) : c = !1;
   }
   c && (o.set(h, l), r(l, h, i, n, o), o.delete(h)), Y(a, t, l);
 }
@@ -737,7 +746,7 @@ function Xt(a) {
 function Yt(a, e) {
   return e.length < 2 ? a : Et(a, Wt(e, 0, -1));
 }
-var Ut = bt(function(a, e, t) {
+var Ut = vt(function(a, e, t) {
   Te(a, e, t);
 }), qt = Object.prototype, jt = qt.hasOwnProperty;
 function Zt(a, e) {
@@ -894,8 +903,8 @@ function Pe(a, e) {
   }), new i(e);
 }
 function ai(a, e) {
-  const t = a.Color, i = Object.defineProperties, r = a.Event, n = a.createPropertyDescriptor, o = a.Property, s = (c, d) => c === void 0 ? d : c, h = {};
-  let g = e.materialType || "PolylineFlow" + Date.now() + Math.floor(Math.random() * 1e3);
+  const t = a.Color, i = Object.defineProperties, r = a.Event, n = a.createPropertyDescriptor, o = a.Property, s = (c, g) => c === void 0 ? g : c, h = {};
+  let d = e.materialType || "PolylineFlow" + Date.now() + Math.floor(Math.random() * 1e3);
   function l(c) {
     c = s(c, h), this._definitionChanged = new r(), this._color = void 0, this._colorSubscription = void 0, this.color = c.color || t.fromBytes(0, 255, 255, 255), this._duration = void 0, this._durationSubscription = void 0, this.duration = s(c.duration, 45);
   }
@@ -911,22 +920,22 @@ function ai(a, e) {
       }
     }
   }), l.prototype.getType = function(c) {
-    return g;
-  }, l.prototype.getValue = function(c, d) {
-    return d || (d = {}), d.color = o.getValueOrClonedDefault(
+    return d;
+  }, l.prototype.getValue = function(c, g) {
+    return g || (g = {}), g.color = o.getValueOrClonedDefault(
       this._color,
       c,
       a.Color.WHITE,
-      d.color
-    ), d.duration = this._duration, d;
+      g.color
+    ), g.duration = this._duration, g;
   }, l.prototype.equals = function(c) {
     return this === c || c instanceof l && o.equals(this._color, c._color);
   }, i(l.prototype, {
     color: n("color"),
     duration: n("duration")
-  }), a.PolylineFlowMaterialProperty = l, a.Material._materialCache.addMaterial(g, {
+  }), a.PolylineFlowMaterialProperty = l, a.Material._materialCache.addMaterial(d, {
     fabric: {
-      type: g,
+      type: d,
       uniforms: {
         color: new t(1, 1, 1, 1),
         duration: 45
@@ -1052,12 +1061,21 @@ class ni {
   id;
   entities = [];
   primitives = [];
+  billboardPointIds = [];
   dataItem = {};
   aggregator;
   cardPool;
   constructor(e) {
-    const { id: t, entities: i = [], primitives: r = [], dataItem: n = {}, aggregator: o, cardPool: s } = e;
-    this.id = t, this.entities = i, this.primitives = r, this.dataItem = n, this.aggregator = o, this.cardPool = s;
+    const {
+      id: t,
+      entities: i = [],
+      primitives: r = [],
+      billboardPointIds: n = [],
+      dataItem: o = {},
+      aggregator: s,
+      cardPool: h
+    } = e;
+    this.id = t, this.entities = i, this.primitives = r, this.billboardPointIds = n, this.dataItem = o, this.aggregator = s, this.cardPool = h;
   }
   // 改造 setVisible 方法，支持 Entity 和 Primitive 的可见性控制
   setVisible(e) {
@@ -1065,14 +1083,20 @@ class ni {
       t && (t.show = e);
     }), this.primitives.forEach((t) => {
       t && (t.show = e);
-    }), this.aggregator && Array.isArray(this.dataItem.billboard) && this.dataItem.billboard.map((i, r) => ({
-      id: this.dataItem.id,
-      data: {
-        ...this.dataItem,
-        show: e && (i.data?.show ?? !0)
-      }
-    })).forEach((i) => {
-      this.aggregator?.updatePoint(i);
+    }), this.aggregator && Array.isArray(this.dataItem.billboard) && this.billboardPointIds.length && this.dataItem.billboard.map((i, r) => {
+      const n = this.billboardPointIds[r];
+      return n ? {
+        id: n,
+        data: {
+          ...this.dataItem,
+          show: e && (i.show ?? i.data?.show ?? !0),
+          __billboardRuntimeId: n,
+          __billboardRuntimeIndex: r,
+          __currentBillboard: i
+        }
+      } : null;
+    }).forEach((i) => {
+      i && this.aggregator?.updatePoint(i);
     }), this.cardPool && this.dataItem.card && (e ? this.cardPool.showByIds([this.dataItem.id]) : this.cardPool.hideByIds([this.dataItem.id]));
   }
   // 改造 removeAll 方法，支持 Entity 和 Primitive 的移除
@@ -1081,7 +1105,10 @@ class ni {
       i && e.entities.remove(i);
     }), this.entities = [], this.primitives.forEach((i) => {
       i && e.scene.primitives.remove(i);
-    }), this.primitives = [], t && this.aggregator && Array.isArray(this.dataItem.billboard) && this.aggregator.removePointsById([this.dataItem.id]), t && this.cardPool && this.dataItem.card && this.cardPool.removeByIds([this.dataItem.id]), this.dataItem.id;
+    }), this.primitives = [], t && this.aggregator && this.billboardPointIds.length && this.aggregator.removePointsById(this.billboardPointIds), t && this.cardPool && this.dataItem.card && this.cardPool.removeByIds([this.dataItem.id]), {
+      groupId: this.dataItem.id,
+      billboardPointIds: [...this.billboardPointIds]
+    };
   }
 }
 class oi {
@@ -1095,7 +1122,7 @@ class oi {
   constructor(e, t, i, r, n, o) {
     this.id = e, this.Cesium = t, this.viewer = i, this.materialManager = r, this.aggregator = n, this.cardPool = o, this.aggregator.labelPool.eventBus.addListener(G.Click, {
       name: "BufferedHierarchicalAggregator_maker_click",
-      fn: (h, g) => {
+      fn: (h, d) => {
         this.cardPool.showByIds([h.data.id]);
       }
     }), new t.ScreenSpaceEventHandler(i.scene.canvas).setInputAction(() => {
@@ -1103,6 +1130,9 @@ class oi {
     }, t.ScreenSpaceEventType.LEFT_CLICK);
   }
   /** ====== 下面是抽出的创建函数 ====== */
+  getBillboardPointId(e, t) {
+    return `${e}__billboard__${t}`;
+  }
   createPolyline(e, t) {
     if (!e.positions || e.positions.length < 1) return null;
     const i = this.materialManager.get({
@@ -1127,21 +1157,21 @@ class oi {
       themeKey: e.theme,
       category: "wall",
       options: e
-    }), r = (y, p = 0) => {
+    }), r = (y, m = 0) => {
       const S = Number(y);
-      return Number.isFinite(S) ? S : p;
-    }, n = e.positions.map((y) => r(y?.[2], 0)), o = r(e.minHeight, 0), s = r(e.maxHeight, 0), h = (y) => Array.isArray(y) && y.length === e.positions.length && y.every((p) => Math.abs(r(p, 0)) < 1e-6), g = n.some((y) => Math.abs(y) > 1e-6), d = (Array.isArray(e.minimumHeights) && e.minimumHeights.length === e.positions.length && !(h(e.minimumHeights) && g) ? e.minimumHeights.map((y) => r(y, 0)) : n).map((y) => y - o), m = (Array.isArray(e.maximumHeights) && e.maximumHeights.length === e.positions.length && !(h(e.maximumHeights) && g) ? e.maximumHeights.map((y) => r(y, 0)) : n).map((y) => y + s), b = e.positions.map(
+      return Number.isFinite(S) ? S : m;
+    }, n = e.positions.map((y) => r(y?.[2], 0)), o = r(e.minHeight, 0), s = r(e.maxHeight, 0), h = (y) => Array.isArray(y) && y.length === e.positions.length && y.every((m) => Math.abs(r(m, 0)) < 1e-6), d = n.some((y) => Math.abs(y) > 1e-6), g = (Array.isArray(e.minimumHeights) && e.minimumHeights.length === e.positions.length && !(h(e.minimumHeights) && d) ? e.minimumHeights.map((y) => r(y, 0)) : n).map((y) => y - o), v = (Array.isArray(e.maximumHeights) && e.maximumHeights.length === e.positions.length && !(h(e.maximumHeights) && d) ? e.maximumHeights.map((y) => r(y, 0)) : n).map((y) => y + s), p = e.positions.map(
       (y) => this.Cesium.Cartesian3.fromDegrees(y[0], y[1], y[2] || 0)
     );
-    let _ = {
+    let C = {
       ...e
     };
-    return i && (_.material = i), this.viewer.entities.add({
+    return i && (C.material = i), this.viewer.entities.add({
       wall: {
-        ..._,
-        positions: b,
-        minimumHeights: d,
-        maximumHeights: m
+        ...C,
+        positions: p,
+        minimumHeights: g,
+        maximumHeights: v
       },
       show: (e.show ?? !0) && t
     });
@@ -1152,8 +1182,8 @@ class oi {
       themeKey: e.theme,
       category: "polygon",
       options: e
-    }), r = Array.isArray(e.hierarchy[0]) ? e.hierarchy.flat() : e.hierarchy, n = this.Cesium.Cartesian3.fromDegreesArrayHeights(r), o = e.holes?.map((g) => {
-      let l = Array.isArray(g[0]) ? e.hierarchy.flat() : e.hole;
+    }), r = Array.isArray(e.hierarchy[0]) ? e.hierarchy.flat() : e.hierarchy, n = this.Cesium.Cartesian3.fromDegreesArrayHeights(r), o = e.holes?.map((d) => {
+      let l = Array.isArray(d[0]) ? e.hierarchy.flat() : e.hole;
       return this.Cesium.Cartesian3.fromDegreesArrayHeights(l.flat());
     }) || [], s = new this.Cesium.PolygonHierarchy(n, o);
     let h = {
@@ -1169,15 +1199,20 @@ class oi {
     });
   }
   createBillboardPoints(e) {
-    return !e.billboard?.length || !this.aggregator ? [] : e.billboard.map((t) => {
-      const [i, r, n = 0] = t.position || [0, 0, 0];
+    return !e.billboard?.length || !this.aggregator ? [] : e.billboard.map((t, i) => {
+      const [r, n, o = 0] = t.position || [0, 0, 0], s = this.getBillboardPointId(e.id, i);
       return {
-        id: e.id,
-        lon: i,
-        lat: r,
-        height: n,
+        id: s,
+        lon: r,
+        lat: n,
+        height: o,
         name: t.options?.text || "",
-        data: e,
+        data: {
+          ...e,
+          __billboardRuntimeId: s,
+          __billboardRuntimeIndex: i,
+          __currentBillboard: t
+        },
         style: { zIndex: e.zIndex || "1" }
       };
     });
@@ -1196,30 +1231,31 @@ class oi {
   }
   /** ====== 主入口：仅保留循环，内部调用独立函数 ====== */
   addGroup(e, t = !0) {
-    const i = e.id || `${Date.now()}`;
+    const i = e.id || `${Date.now()}`, r = e.id ? e : { ...e, id: i };
     this.removeGroup(i);
-    const r = [], n = e.show !== !1;
-    (e.polyline || []).forEach((h) => {
-      const g = this.createPolyline(h, n);
-      g && r.push(g);
-    }), (e.wall || []).forEach((h) => {
-      const g = this.createWall(h, n);
-      g && r.push(g);
-    }), (e.polygon || []).forEach((h) => {
-      const g = this.createPolygon(h, n);
-      g && r.push(g);
+    const n = [], o = r.show !== !1;
+    (r.polyline || []).forEach((d) => {
+      const l = this.createPolyline(d, o);
+      l && n.push(l);
+    }), (r.wall || []).forEach((d) => {
+      const l = this.createWall(d, o);
+      l && n.push(l);
+    }), (r.polygon || []).forEach((d) => {
+      const l = this.createPolygon(d, o);
+      l && n.push(l);
     });
-    const o = this.createBillboardPoints(e);
-    o.length && t && this.aggregator.appendPoints(o, !1), this.createCard(e);
-    const s = new ni({
+    const s = this.createBillboardPoints(r);
+    s.length && t && this.aggregator.appendPoints(s, !1), this.createCard(r);
+    const h = new ni({
       id: i,
-      entities: r,
+      entities: n,
       primitives: [],
-      dataItem: e,
+      billboardPointIds: s.map((d) => d.id),
+      dataItem: r,
       aggregator: this.aggregator,
       cardPool: this.cardPool
     });
-    return this.groupMap.set(i, s), o;
+    return this.groupMap.set(i, h), s;
   }
   async addGroups(e) {
     const i = e.map((r) => this.addGroup(r, !1)).flat();
@@ -1230,27 +1266,33 @@ class oi {
     t && (t.removeAll(this.viewer), this.groupMap.delete(e));
   }
   removeGroups(e) {
-    let t = [];
-    for (const i of e) {
-      const r = this.groupMap.get(i);
-      if (r) {
-        let n = r.removeAll(this.viewer, !1);
-        this.groupMap.delete(i), t.push(n);
+    let t = [], i = [];
+    for (const r of e) {
+      const n = this.groupMap.get(r);
+      if (n) {
+        let o = n.removeAll(this.viewer, !1);
+        this.groupMap.delete(r), t.push(...o.billboardPointIds), i.push(o.groupId);
       }
     }
-    this.aggregator.removePointsById(t), this.cardPool.removeByIds(t);
+    t.length && this.aggregator.removePointsById(t), i.length && this.cardPool.removeByIds(i);
   }
   updateGroup(e) {
     const t = this.groupMap.get(e.id);
     t && (t.removeAll(this.viewer), this.groupMap.delete(e.id)), this.addGroup(e);
   }
   async updateGroups(e) {
-    this.aggregator.removePointsById(e.map((r) => r.id)), this.cardPool.removeByIds(e.map((r) => r.id));
-    const i = e.map((r) => {
-      const n = this.groupMap.get(r.id);
-      return n && (n.removeAll(this.viewer, !1), this.groupMap.delete(r.id)), this.addGroup(r, !1);
+    const t = e.flatMap((n) => {
+      const o = this.groupMap.get(n.id);
+      return o?.billboardPointIds?.length ? o.billboardPointIds : (n.billboard || []).map(
+        (s, h) => this.getBillboardPointId(n.id, h)
+      );
+    });
+    t.length && this.aggregator.removePointsById(t), this.cardPool.removeByIds(e.map((n) => n.id));
+    const r = e.map((n) => {
+      const o = this.groupMap.get(n.id);
+      return o && (o.removeAll(this.viewer, !1), this.groupMap.delete(n.id)), this.addGroup(n, !1);
     }).flat();
-    i.length > 0 && this.aggregator && this.aggregator.appendPoints(i, !1);
+    r.length > 0 && this.aggregator && this.aggregator.appendPoints(r, !1);
   }
   setGroupVisible(e, t) {
     this.groupMap.get(e)?.setVisible(t);
@@ -1323,7 +1365,7 @@ class li {
     t || (t = new V()), i || (i = new V());
     const s = new ie(r, n, this.labelId, t);
     s.setOcclusionOptions({ distanceEpsilon: 1 }), s.setOcclusionEnabled(!1);
-    const h = new ie(r, n, this.cardId, i, !1), g = new lt(r, n, {
+    const h = new ie(r, n, this.cardId, i, !1), d = new lt(r, n, {
       //聚合
       threshold: o?.threshold || 16,
       displayLimit: o?.displayLimit || 300,
@@ -1342,10 +1384,10 @@ class li {
       r,
       n,
       l,
-      g,
+      d,
       h
     );
-    return { materialManager: l, entityLayerManager: c, cardPool: h, labelPool: s, aggregator: g, eventBus: t, cardEventBus: i };
+    return { materialManager: l, entityLayerManager: c, cardPool: h, labelPool: s, aggregator: d, eventBus: t, cardEventBus: i };
   }
   //添加标记
   set(e) {
@@ -1422,11 +1464,11 @@ const w = {
   polygonTileWidth: 2,
   polygonTileHeight: 2
 };
-function v(a, e) {
+function b(a, e) {
   const t = Number(a);
   return Number.isFinite(t) ? t : e;
 }
-function C(a) {
+function _(a) {
   return Number.isFinite(a) ? Math.max(1, a) : 1;
 }
 function hi(a, e) {
@@ -1436,18 +1478,18 @@ function ci(a) {
   const e = a?.repeat;
   if (Array.isArray(e) && e.length >= 2)
     return {
-      x: C(v(e[0], 1)),
-      y: C(v(e[1], 1))
+      x: _(b(e[0], 1)),
+      y: _(b(e[1], 1))
     };
   if (e && typeof e == "object")
     return {
-      x: C(v(e.x, 1)),
-      y: C(v(e.y, 1))
+      x: _(b(e.x, 1)),
+      y: _(b(e.y, 1))
     };
   const t = Number(a?.repeatX), i = Number(a?.repeatY);
   return Number.isFinite(t) && Number.isFinite(i) ? {
-    x: C(t),
-    y: C(i)
+    x: _(t),
+    y: _(i)
   } : null;
 }
 function xe(a, e) {
@@ -1458,13 +1500,13 @@ function xe(a, e) {
     const n = t[r - 1], o = t[r];
     if (!Array.isArray(n) || !Array.isArray(o)) continue;
     const s = a.Cartesian3.fromDegrees(
-      v(n[0], 0),
-      v(n[1], 0),
-      v(n[2], 0)
+      b(n[0], 0),
+      b(n[1], 0),
+      b(n[2], 0)
     ), h = a.Cartesian3.fromDegrees(
-      v(o[0], 0),
-      v(o[1], 0),
-      v(o[2], 0)
+      b(o[0], 0),
+      b(o[1], 0),
+      b(o[2], 0)
     );
     i += a.Cartesian3.distance(s, h);
   }
@@ -1480,7 +1522,7 @@ function Ie(a) {
     }
     if (o > 0) return n / o;
   }
-  const i = Math.abs(v(a?.minHeight, 0)), r = Math.abs(v(a?.maxHeight, 0));
+  const i = Math.abs(b(a?.minHeight, 0)), r = Math.abs(b(a?.maxHeight, 0));
   return i > 0 || r > 0 ? i + r : 3;
 }
 function Se(a, e) {
@@ -1491,14 +1533,14 @@ function Se(a, e) {
   if (!Array.isArray(i) || i.length < 3) return { width: 1, height: 1 };
   let r = Number.POSITIVE_INFINITY, n = Number.NEGATIVE_INFINITY, o = Number.POSITIVE_INFINITY, s = Number.NEGATIVE_INFINITY;
   for (let u = 0; u < i.length; u += 3) {
-    const m = Number(i[u]), b = Number(i[u + 1]);
-    !Number.isFinite(m) || !Number.isFinite(b) || (r = Math.min(r, m), n = Math.max(n, m), o = Math.min(o, b), s = Math.max(s, b));
+    const v = Number(i[u]), p = Number(i[u + 1]);
+    !Number.isFinite(v) || !Number.isFinite(p) || (r = Math.min(r, v), n = Math.max(n, v), o = Math.min(o, p), s = Math.max(s, p));
   }
   if (!Number.isFinite(r) || !Number.isFinite(o))
     return { width: 1, height: 1 };
-  const h = (o + s) / 2, g = a.Ellipsoid.WGS84.maximumRadius, l = a.Math.toRadians(Math.abs(n - r)), c = a.Math.toRadians(Math.abs(s - o)), d = l * g * Math.cos(a.Math.toRadians(h)), f = c * g;
+  const h = (o + s) / 2, d = a.Ellipsoid.WGS84.maximumRadius, l = a.Math.toRadians(Math.abs(n - r)), c = a.Math.toRadians(Math.abs(s - o)), g = l * d * Math.cos(a.Math.toRadians(h)), f = c * d;
   return {
-    width: d > 0 ? d : 1,
+    width: g > 0 ? g : 1,
     height: f > 0 ? f : 1
   };
 }
@@ -1513,28 +1555,28 @@ function Ee({
   if (e?.autoRepeat === !1)
     return { x: 1, y: 1 };
   if (i === "wall") {
-    const h = xe(a, t), g = Ie(t), l = v(
+    const h = xe(a, t), d = Ie(t), l = b(
       e?.tileWidth ?? e?.textureWidth,
       w.wallTileWidth
-    ), c = v(
+    ), c = b(
       e?.tileHeight ?? e?.textureHeight,
       w.wallTileHeight
     );
     return {
-      x: C(h / Math.max(l, 0.01)),
-      y: C(g / Math.max(c, 0.01))
+      x: _(h / Math.max(l, 0.01)),
+      y: _(d / Math.max(c, 0.01))
     };
   }
-  const n = Se(a, t), o = v(
+  const n = Se(a, t), o = b(
     e?.tileWidth ?? e?.textureWidth,
     w.polygonTileWidth
-  ), s = v(
+  ), s = b(
     e?.tileHeight ?? e?.textureHeight,
     w.polygonTileHeight
   );
   return {
-    x: C(n.width / Math.max(o, 0.01)),
-    y: C(n.height / Math.max(s, 0.01))
+    x: _(n.width / Math.max(o, 0.01)),
+    y: _(n.height / Math.max(s, 0.01))
   };
 }
 function De({
@@ -1549,25 +1591,25 @@ function De({
   if (e?.autoRepeat === !1)
     return 1;
   if (i === "wall") {
-    const l = xe(a, t), c = Ie(t), d = v(
+    const l = xe(a, t), c = Ie(t), g = b(
       e?.tileWidth ?? e?.textureWidth,
       w.wallTileWidth
-    ), f = v(
+    ), f = b(
       e?.tileHeight ?? e?.textureHeight,
       w.wallTileHeight
-    ), u = r === "vertical" ? c / Math.max(f, 0.01) : l / Math.max(d, 0.01);
-    return C(Number(u.toFixed(2)));
+    ), u = r === "vertical" ? c / Math.max(f, 0.01) : l / Math.max(g, 0.01);
+    return _(Number(u.toFixed(2)));
   }
-  const o = Se(a, t), s = v(
+  const o = Se(a, t), s = b(
     e?.tileWidth ?? e?.textureWidth,
     w.polygonTileWidth
-  ), h = v(
+  ), h = b(
     e?.tileHeight ?? e?.textureHeight,
     w.polygonTileHeight
-  ), g = r === "vertical" ? o.height / Math.max(h, 0.01) : o.width / Math.max(s, 0.01);
-  return C(Number(g.toFixed(2)));
+  ), d = r === "vertical" ? o.height / Math.max(h, 0.01) : o.width / Math.max(s, 0.01);
+  return _(Number(d.toFixed(2)));
 }
-function N(a) {
+function R(a) {
   const e = a;
   return e.__materialFactory = !0, e;
 }
@@ -1575,7 +1617,7 @@ function Ae(a) {
   const e = String(a?.wallVerticalMode ?? a?.verticalMode ?? "stretch");
   return e === "repeat" || e === "bottom" || e === "stretch" ? e : "stretch";
 }
-function gi({
+function di({
   Cesium: a,
   themeOptions: e,
   entityOptions: t
@@ -1588,7 +1630,7 @@ function gi({
   });
   return Ae(e) === "repeat" ? i : { x: i.x, y: 1 };
 }
-function di(a, e) {
+function gi(a, e) {
   const t = "WallBottomImageMaterial_" + Date.now() + "_" + Math.floor(Math.random() * 1e3);
   function i(r) {
     this._definitionChanged = new a.Event(), this._color = r.color, this.color = r.color;
@@ -1735,7 +1777,7 @@ function fi({
         themeKey: e.data?.theme,
         category: "polygon",
         force: i,
-        material: N((n = {}) => {
+        material: R((n = {}) => {
           const o = Ee({
             Cesium: a,
             themeOptions: r,
@@ -1754,7 +1796,7 @@ function fi({
         themeKey: e.data?.theme,
         category: "polygon",
         force: i,
-        material: N((n = {}) => {
+        material: R((n = {}) => {
           const o = e.data?.freely || "vertical", s = De({
             Cesium: a,
             themeOptions: r,
@@ -1765,7 +1807,7 @@ function fi({
           return Pe(a, {
             image: e.img,
             color: new a.Color.fromCssColorString(r?.color || "#ffffff"),
-            duration: v(r?.duration, 5e3),
+            duration: b(r?.duration, 5e3),
             freely: o,
             direction: r?.direction || "+",
             count: s
@@ -1788,18 +1830,18 @@ function mi({
         themeKey: e.data?.theme,
         category: "wall",
         force: i,
-        material: N((n = {}) => {
-          const o = Ae(r), s = gi({
+        material: R((n = {}) => {
+          const o = Ae(r), s = di({
             Cesium: a,
             themeOptions: r,
             entityOptions: n
           });
           if (o === "bottom") {
             const h = hi(
-              v(r?.bottomHeightRatio, 0.3),
+              b(r?.bottomHeightRatio, 0.3),
               0.3
             );
-            return di(a, {
+            return gi(a, {
               image: e.img,
               repeatX: s.x,
               bottomHeightRatio: h,
@@ -1819,7 +1861,7 @@ function mi({
         themeKey: e.data?.theme,
         category: "wall",
         force: i,
-        material: N((n = {}) => {
+        material: R((n = {}) => {
           const o = e.data?.freely || "vertical", s = De({
             Cesium: a,
             themeOptions: r,
@@ -1830,7 +1872,7 @@ function mi({
           return Pe(a, {
             image: e.img,
             color: new a.Color.fromCssColorString(r?.color || "#ffffff"),
-            duration: v(r?.duration, 5e3),
+            duration: b(r?.duration, 5e3),
             freely: o,
             direction: r?.direction || "+",
             count: s
@@ -1841,6 +1883,9 @@ function mi({
   }
 }
 class pi extends li {
+  getCurrentBillboard(e) {
+    return e?.__currentBillboard || e?.billboard?.[0];
+  }
   constructor(e) {
     const {
       labelId: t = "report-marker",
@@ -1851,13 +1896,13 @@ class pi extends li {
       runListener: s = () => {
       },
       MaterialManager: h = new we(),
-      aggregatorOptions: g
-    } = e, l = [...r], c = [...n], d = [...o], f = {
+      aggregatorOptions: d
+    } = e, l = [...r], c = [...n], g = [...o], f = {
       clusterTheme: "Tag1007",
       pointTheme: "Tag1001",
       centralPointMode: "firstPoint",
       debugCurrentGrids: !1,
-      ...g || {}
+      ...d || {}
     }, u = {
       ...e,
       labelId: t,
@@ -1866,7 +1911,7 @@ class pi extends li {
       aggregatorOptions: f,
       eventBus: new V()
     };
-    super(u), this.opt = { ...this.opt, ...u }, this.initTagListener(this.instance.eventBus, this.opt), this.loadTabThemeConfig(l), this.loadLineThemeConfig(c), this.loadCardThemeConfig(d), this.initDefaultLineMaterials(), this.initDefaultTagTheme();
+    super(u), this.opt = { ...this.opt, ...u }, this.initTagListener(this.instance.eventBus, this.opt), this.loadTabThemeConfig(l), this.loadLineThemeConfig(c), this.loadCardThemeConfig(g), this.initDefaultLineMaterials(), this.initDefaultTagTheme();
   }
   initDefaultTagTheme() {
     this.setTagTheme({
@@ -2088,21 +2133,22 @@ class pi extends li {
   //注册主题
   setTagTheme(e) {
     let { labelPool: t } = this.instance;
+    const i = (r) => this.getCurrentBillboard(r);
     t.registerTheme(e.data.theme, {
-      createElement(i, r) {
-        let n = r.data?.billboard?.[0];
-        const o = ii(n, ["position", "options"]);
-        let s, h = {
-          ...o,
-          text: n?.options?.text,
+      createElement(r, n) {
+        let o = i(n.data);
+        const s = ii(o, ["position", "options"]);
+        let h, d = {
+          ...s,
+          text: o?.options?.text,
           isFullLink: e?.isFullLink ?? !1,
           img: e?.data?.options?.img,
           textStyle: e?.data?.options?.textStyle,
           imgStyle: e?.data?.options?.imgStyle
         };
-        if (r.data?.gridKey)
-          s = x(I(ae), {
-            text: r.data?.count,
+        if (n.data?.gridKey)
+          h = x(I(ae), {
+            text: n.data?.count,
             isFullLink: e.isFullLink ?? !1,
             img: e?.data.options.img,
             imgStyle: e?.data.options?.imgStyle,
@@ -2123,29 +2169,31 @@ class pi extends li {
             }
           });
         else if (e.comType == 4)
-          s = x(I(Xe), h);
+          h = x(I(Xe), d);
         else if (e.comType == 5 || e.comType == 8) {
-          const g = n?.options || {}, l = e?.data?.options || {}, c = n?.pixelOffset || e?.data?.pixelOffset || { x: 0, y: 0 }, d = g.otherOffset ?? l.otherOffset ?? { x: 0, y: -0 }, f = g.isCanDraggable ?? l.isCanDraggable ?? e?.isCanDraggable ?? !1, u = e.comType == 8 ? Ve : Ke;
-          s = x(I(u), {
-            ...h,
-            pixelOffset: c,
-            textStyle: g.textStyle || l.textStyle,
-            lineStyle: g.lineStyle || l.lineStyle,
-            otherOffset: d,
-            isCanDraggable: f,
-            onCanDraggable: g.onCanDraggable || e?.onCanDraggable,
-            onSetOtherOffset: (m) => {
-              r.data?.billboard?.[0]?.options && (r.data.billboard[0].options.otherOffset = m), g.onSetOtherOffset?.(m), e?.onSetOtherOffset?.(r.data, m);
+          const l = o?.options || {}, c = e?.data?.options || {}, g = o?.pixelOffset || e?.data?.pixelOffset || { x: 0, y: 0 }, f = l.otherOffset ?? c.otherOffset ?? { x: 0, y: -0 }, u = l.isCanDraggable ?? c.isCanDraggable ?? e?.isCanDraggable ?? !1, v = e.comType == 8 ? Ve : Ke;
+          h = x(I(v), {
+            ...d,
+            pixelOffset: g,
+            textStyle: l.textStyle || c.textStyle,
+            lineStyle: l.lineStyle || c.lineStyle,
+            otherOffset: f,
+            isCanDraggable: u,
+            onCanDraggable: l.onCanDraggable || e?.onCanDraggable,
+            onSetOtherOffset: (p) => {
+              const C = i(n.data);
+              C?.options && (C.options.otherOffset = p), l.onSetOtherOffset?.(p), e?.onSetOtherOffset?.(n.data, p);
             },
-            onSetLineStake: (m) => {
-              r.data?.billboard?.[0]?.options && (r.data.billboard[0].options.lineStake = m), g.onSetLineStake?.(m), e?.onSetLineStake?.(r.data, m);
+            onSetLineStake: (p) => {
+              const C = i(n.data);
+              C?.options && (C.options.lineStake = p), l.onSetLineStake?.(p), e?.onSetLineStake?.(n.data, p);
             }
           });
-        } else e.comType == 6 || e.comType == 7 ? s = x(I(Ye), {
-          text: h.text,
-          textStyle: h.textStyle
-        }) : s = x(I(ae), h);
-        return O(s, i), () => O(null, i);
+        } else e.comType == 6 || e.comType == 7 ? h = x(I(Ye), {
+          text: d.text,
+          textStyle: d.textStyle
+        }) : h = x(I(ae), d);
+        return O(h, r), () => O(null, r);
       },
       options: {
         offset: e.comType == 5 || e.comType == 8 ? {} : e?.data?.pixelOffset || {}
@@ -2158,7 +2206,7 @@ class pi extends li {
     e.addListener(G.Click, {
       name: "marker:click",
       fn: (n) => {
-        t.runListener?.(H.标记左键点击, n.data), pe(n.data?.onClick) && n.data?.onClick(n.data), n.data?.cameraPoint && n.data?.billboard[0]?.isFlyToCameraPoint && i?.camera?.flyTo({
+        t.runListener?.(H.标记左键点击, n.data), pe(n.data?.onClick) && n.data?.onClick(n.data), n.data?.cameraPoint && this.getCurrentBillboard(n.data)?.isFlyToCameraPoint && i?.camera?.flyTo({
           duration: 1,
           ...n.data?.cameraPoint
         });
@@ -2168,9 +2216,10 @@ class pi extends li {
       fn: (n) => {
         let o = this.opt.Cesium, s = { x: 0, y: 0 };
         try {
-          if (n.data?.billboard?.[0]?.position?.length > 2) {
-            let h = n.data?.billboard[0]?.position, g = o.Cartesian3.fromDegrees(h[0], h[1], h[3] || 0), l = this.instance.labelPool.toWindowCoordinates(g);
-            s.x = l.x, s.y = l.y;
+          const h = this.getCurrentBillboard(n.data);
+          if (h?.position?.length > 2) {
+            let d = h.position, l = o.Cartesian3.fromDegrees(d[0], d[1], d[3] || 0), c = this.instance.labelPool.toWindowCoordinates(l);
+            s.x = c.x, s.y = c.y;
           }
         } catch (h) {
           console.log(h);
@@ -2182,9 +2231,10 @@ class pi extends li {
       fn: (n) => {
         let o = this.opt.Cesium, s = { x: 0, y: 0 };
         try {
-          if (n.data?.billboard?.[0]?.position?.length > 2) {
-            let h = n.data?.billboard[0]?.position, g = o.Cartesian3.fromDegrees(h[0], h[1], h[3] || 0), l = this.instance.labelPool.toWindowCoordinates(g);
-            s.x = l.x, s.y = l.y;
+          const h = this.getCurrentBillboard(n.data);
+          if (h?.position?.length > 2) {
+            let d = h.position, l = o.Cartesian3.fromDegrees(d[0], d[1], d[3] || 0), c = this.instance.labelPool.toWindowCoordinates(l);
+            s.x = c.x, s.y = c.y;
           }
         } catch (h) {
           console.log(h);
@@ -2207,12 +2257,12 @@ class pi extends li {
     });
   }
 }
-const yi = /* @__PURE__ */ ke({
+const yi = /* @__PURE__ */ Ne({
   __name: "MarkerManage",
   props: st,
   emits: ["register", "load", "marker-event"],
   setup(a, { expose: e, emit: t }) {
-    const i = a, r = t, n = Be("leitingMethods");
+    const i = a, r = t, n = ke("leitingMethods");
     let o = null;
     const s = (l = {}) => {
       if (o) return o;
@@ -2221,8 +2271,8 @@ const yi = /* @__PURE__ */ ke({
         ...l,
         Cesium: l.Cesium || i.Cesium,
         viewer: l.viewer || i.viewer,
-        runListener: (d, f, ...u) => {
-          r("marker-event", { key: d, data: f, args: u });
+        runListener: (g, f, ...u) => {
+          r("marker-event", { key: g, data: f, args: u });
         }
       };
       return !c.Cesium || !c.viewer ? null : (o = new pi(c), l.methods && (l.methods.setTagTheme = o.setTagTheme.bind(o), l.methods.setMaterial = o.setMaterial.bind(o), l.methods.setEntityList = o.set.bind(o), l.methods.addComItem = o.add.bind(o), l.methods.deleteComItem = o.delete.bind(o), l.methods.updateComItem = o.update.bind(o), l.methods.getEntityByID = o.getById.bind(o), l.methods.getOptions = o.getOptions.bind(o)), r("load", o), o);
@@ -2245,28 +2295,28 @@ const yi = /* @__PURE__ */ ke({
       setMaterial: (l) => o?.setMaterial(l)
     };
     e(h), r("register", h);
-    function g() {
+    function d() {
       if (o) return o;
-      const l = ze(n), c = l?.getCesium?.(), d = l?.getViewer?.();
-      c && d ? s({ Cesium: c, viewer: d, methods: l }) : i.Cesium && i.viewer && s({ methods: l });
+      const l = ze(n), c = l?.getCesium?.(), g = l?.getViewer?.();
+      c && g ? s({ Cesium: c, viewer: g, methods: l }) : i.Cesium && i.viewer && s({ methods: l });
     }
     return We(() => {
-      g();
+      d();
     }), te(
       () => [i.Cesium, i.viewer],
       ([l, c]) => {
-        l && c && !o && g();
+        l && c && !o && d();
       }
     ), te(
       () => n?.value,
       (l, c) => {
-        g();
+        d();
       },
       { deep: !1 }
     ), Fe(() => {
     }), (l, c) => $e(l.$slots, "default");
   }
-}), xi = Ne(yi);
+}), xi = Re(yi);
 export {
   xi as CxMarkerManage,
   pi as MarkerManage,