leiting-bim 2.1.126 → 2.1.128

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

@@ -1,11 +1,13 @@
 import { w as we } from "../create-DynflqE1.js";
-import { h as M, markRaw as T, render as I, defineComponent as xe, inject as Ie, onMounted as Se, watch as j, onUnmounted as De, renderSlot as Ee, unref as Ge } from "vue";
-import { M as S, H as Z, a as H } from "../HtmlOverlayLabelPool-DgCFnmr3.js";
-import { CxCardCarousel as J } from "./card-carousel.js";
-import { CxMarkerDefault as Q } from "./marker-default.js";
-import { CxMarkerHtml as Oe } from "./marker-html.js";
-import { i as K, b as oe, a as L, S as E, d as ee, c as W, e as ne, f as Ae, g as se, M as le, h as N, j as ke, k as Re, l as $e, m as he, n as ce, o as Be, p as He, q as Ne, r as ze, s as Fe, t as de, u as Ke, v as We, w as Ve, x as Ye } from "../index-Kdqw0FJN.js";
-const Ue = {
+import { h as L, markRaw as M, render as S, defineComponent as xe, inject as Se, onMounted as De, watch as Z, onUnmounted as Ie, renderSlot as Oe, unref as Ee } from "vue";
+import { M as D, H as J, a as H } from "../HtmlOverlayLabelPool-DgCFnmr3.js";
+import { CxCardCarousel as Q } from "./card-carousel.js";
+import { CxMarkerBubble as Ge } from "./marker-bubble.js";
+import { CxMarkerDefault as ee } from "./marker-default.js";
+import { CxMarkerHtml as Ae } from "./marker-html.js";
+import { CxMarkerText as ke } from "./marker-text.js";
+import { i as W, b as ne, a as _, S as O, d as te, c as V, e as se, f as Re, g as le, M as he, h as N, j as $e, k as Be, l as He, m as ce, n as de, o as Ne, p as ze, q as Fe, r as Ke, s as We, t as ge, u as Ve, v as Ye, w as Ue, x as Xe } from "../index-McKGafjp.js";
+const qe = {
   id: { type: String, default: "marker" },
   Cesium: { type: Object },
   viewer: { type: Object },
@@ -16,8 +18,8 @@ const Ue = {
   themeConfig: { type: Object }
   // Optional override
 };
-var D = /* @__PURE__ */ ((r) => (r.左建选中模型 = "MODEL_LEFT_CLICK", r.标记左键点击 = "TAG_LEFT_CLICK", r.标记移入 = "TAG_MOUSEENTER", r.标记移出 = "TAG_MOUSELEAVE", r.模型位置保存 = "SAVE_REGION", r.模型加载完成 = "MODEL_READY", r))(D || {});
-class Xe {
+var I = /* @__PURE__ */ ((r) => (r.左建选中模型 = "MODEL_LEFT_CLICK", r.标记左键点击 = "TAG_LEFT_CLICK", r.标记移入 = "TAG_MOUSEENTER", r.标记移出 = "TAG_MOUSELEAVE", r.模型位置保存 = "SAVE_REGION", r.模型加载完成 = "MODEL_READY", r))(I || {});
+class je {
   Cesium;
   viewer;
   labelPool;
@@ -118,23 +120,23 @@ class Xe {
     for (const a of this.levels) {
       const n = a.level, s = this.gridLayers.get(n);
       if (!s) continue;
-      const h = this.Cesium.Cartographic.fromDegrees(i.lon, i.lat), d = this.tilingScheme.positionToTileXY(
+      const h = this.Cesium.Cartographic.fromDegrees(i.lon, i.lat), c = this.tilingScheme.positionToTileXY(
         h,
         n,
         new this.Cesium.Cartesian2()
       );
-      if (!d) continue;
-      const l = `${d.x}_${d.y}`, c = s.get(l);
-      if (c) {
-        const g = c.allPoints.findIndex((f) => f.id === e.id);
-        if (g !== -1 && c.allPoints.splice(g, 1), i.data?.billboard?.[0]?.skipAggregation) {
-          const f = c.skipPoints.findIndex((u) => u.id === e.id);
-          f !== -1 && c.skipPoints.splice(f, 1);
+      if (!c) continue;
+      const l = `${c.x}_${c.y}`, d = s.get(l);
+      if (d) {
+        const g = d.allPoints.findIndex((f) => f.id === e.id);
+        if (g !== -1 && d.allPoints.splice(g, 1), i.data?.billboard?.[0]?.skipAggregation) {
+          const f = d.skipPoints.findIndex((u) => u.id === e.id);
+          f !== -1 && d.skipPoints.splice(f, 1);
         } else {
-          const f = this.groupByTheme ? i.data?.theme : this.clusterTheme, u = c.groups.get(f);
+          const f = this.groupByTheme ? i.data?.theme : this.clusterTheme, u = d.groups.get(f);
           if (u) {
             const p = u.findIndex((y) => y.id === e.id);
-            p !== -1 && u.splice(p, 1), u.length === 0 && c.groups.delete(f);
+            p !== -1 && u.splice(p, 1), u.length === 0 && d.groups.delete(f);
           }
         }
       }
@@ -151,8 +153,8 @@ class Xe {
         for (const [a, n] of o.entries()) {
           n.allPoints = n.allPoints.filter((s) => !t.has(s.id)), n.skipPoints = n.skipPoints.filter((s) => !t.has(s.id));
           for (const [s, h] of n.groups.entries()) {
-            const d = h.filter((l) => !t.has(l.id));
-            d.length === 0 ? n.groups.delete(s) : n.groups.set(s, d);
+            const c = h.filter((l) => !t.has(l.id));
+            c.length === 0 ? n.groups.delete(s) : n.groups.set(s, c);
           }
           n.allPoints.length === 0 && o.delete(a);
         }
@@ -185,8 +187,8 @@ class Xe {
       }, o.set(s, h)), h.allPoints.push(e), e.data?.billboard?.[0]?.skipAggregation)
         h.skipPoints.push(e);
       else {
-        const d = this.groupByTheme ? e.data?.billboard?.[0]?.theme : this.clusterTheme;
-        h.groups.has(d) || h.groups.set(d, []), h.groups.get(d).push(e);
+        const c = this.groupByTheme ? e.data?.billboard?.[0]?.theme : this.clusterTheme;
+        h.groups.has(c) || h.groups.set(c, []), h.groups.get(c).push(e);
       }
     }
   }
@@ -281,41 +283,41 @@ class Xe {
     return t;
   }
   _processTiles(e, t) {
-    const i = /* @__PURE__ */ new Set(), o = this.viewer.scene, a = o && o.globe, n = a && a.ellipsoid, s = n && o.camera.computeViewRectangle(n), h = (d, l, c) => {
+    const i = /* @__PURE__ */ new Set(), o = this.viewer.scene, a = o && o.globe, n = a && a.ellipsoid, s = n && o.camera.computeViewRectangle(n), h = (c, l, d) => {
       if (!s) return !0;
-      const g = this.tilingScheme.tileXYToRectangle(d, l, c);
+      const g = this.tilingScheme.tileXYToRectangle(c, l, d);
       return !(!g || g.east <= s.west || g.west >= s.east || g.north <= s.south || g.south >= s.north);
     };
-    for (const d of e) {
-      const l = d.rectangle, c = d._level ?? d.level;
-      if (!l || typeof c != "number") continue;
-      const g = this._getGridRefLevel(c), f = this._resolveLevelIndex(g);
+    for (const c of e) {
+      const l = c.rectangle, d = c._level ?? c.level;
+      if (!l || typeof d != "number") continue;
+      const g = this._getGridRefLevel(d), f = this._resolveLevelIndex(g);
       if (f === void 0) continue;
-      const u = this.levels[f].level, p = d._x ?? d.x, y = d._y ?? d.y;
+      const u = this.levels[f].level, p = c._x ?? c.x, y = c._y ?? c.y;
       if (typeof p == "number" && typeof y == "number") {
-        const C = c - u;
+        const C = d - u;
         if (C >= 0) {
-          const _ = 1 << C, v = Math.floor(p / _), w = Math.floor(y / _), x = `${u}_${v}_${w}`;
+          const b = 1 << C, v = Math.floor(p / b), w = Math.floor(y / b), x = `${u}_${v}_${w}`;
           if (i.has(x)) continue;
-          i.add(x), t(f, v, w, c);
+          i.add(x), t(f, v, w, d);
         } else {
           const v = 1 << Math.min(-C, this.maxRefineLevels), w = p * v, x = y * v;
           for (let k = 0; k < v; k++)
             for (let R = 0; R < v; R++) {
               const $ = w + k, B = x + R;
               if (!h($, B, u)) continue;
-              const q = `${u}_${$}_${B}`;
-              i.has(q) || (i.add(q), t(f, $, B, c));
+              const j = `${u}_${$}_${B}`;
+              i.has(j) || (i.add(j), t(f, $, B, d));
             }
         }
         continue;
       }
-      const b = this.levels[f].size, m = this.Cesium.Math.toDegrees(l.west), X = this.Cesium.Math.toDegrees(l.east), O = this.Cesium.Math.toDegrees(l.south), P = this.Cesium.Math.toDegrees(l.north), A = Math.floor((m - -180) / b), Me = Math.floor((X - -180) / b), Te = Math.floor((O - -90) / b), Pe = Math.floor((P - -90) / b);
+      const T = this.levels[f].size, m = this.Cesium.Math.toDegrees(l.west), q = this.Cesium.Math.toDegrees(l.east), G = this.Cesium.Math.toDegrees(l.south), P = this.Cesium.Math.toDegrees(l.north), A = Math.floor((m - -180) / T), Me = Math.floor((q - -180) / T), Te = Math.floor((G - -90) / T), Pe = Math.floor((P - -90) / T);
       for (let C = A; C <= Me; C++)
-        for (let _ = Te; _ <= Pe; _++) {
-          if (!h(C, _, u)) continue;
-          const v = `${u}_${C}_${_}`;
-          i.has(v) || (i.add(v), t(f, C, _, c));
+        for (let b = Te; b <= Pe; b++) {
+          if (!h(C, b, u)) continue;
+          const v = `${u}_${C}_${b}`;
+          i.has(v) || (i.add(v), t(f, C, b, d));
         }
     }
   }
@@ -328,18 +330,18 @@ class Xe {
   _getCellContext(e, t, i, o) {
     const n = this.levels[e].level, s = this.gridLayers.get(n);
     if (!s) return null;
-    const h = `${t}_${i}`, d = s.get(h);
-    if (!d) return null;
-    const l = this.tilingScheme.tileXYToRectangle(t, i, n), 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), p = (c + f) / 2, y = (g + u) / 2;
+    const h = `${t}_${i}`, c = s.get(h);
+    if (!c) return null;
+    const l = this.tilingScheme.tileXYToRectangle(t, i, n), d = 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), p = (d + f) / 2, y = (g + u) / 2;
     return {
       levelIdx: e,
       tileLevel: n,
       lonIdx: t,
       latIdx: i,
       key: h,
-      cell: d,
+      cell: c,
       rect: l,
-      west: c,
+      west: d,
       south: g,
       east: f,
       north: u,
@@ -371,17 +373,17 @@ class Xe {
       latIdx: n,
       cell: s,
       centerLon: h,
-      centerLat: d,
+      centerLat: c,
       viewTileLevel: l
-    } = e, c = l;
+    } = e, d = l;
     for (const [g, f] of s.groups) {
       const u = f.filter((m) => m.data?.show !== !1);
       if (u.length === 0) continue;
-      let p = h, y = d, G = u[0]?.height || 0;
-      if (this.centralPointMode == "firstPoint" && (p = u[0]?.lon || 0, y = u[0]?.lat || 0, G = u[0]?.height || 0), o === this.levels.length - 1 || u.length < t)
+      let p = h, y = c, E = u[0]?.height || 0;
+      if (this.centralPointMode == "firstPoint" && (p = u[0]?.lon || 0, y = u[0]?.lat || 0, E = u[0]?.height || 0), o === this.levels.length - 1 || u.length < t)
         for (const m of u) {
           if (i >= this.displayLimit) break;
-          this._isVisibleAtLevel(m, c) && (this.labelPool.add(m.data, {
+          this._isVisibleAtLevel(m, d) && (this.labelPool.add(m.data, {
             id: `point-${m.id}`,
             lon: m.lon,
             lat: m.lat,
@@ -393,9 +395,9 @@ class Xe {
       else {
         if (i >= this.displayLimit)
           return i;
-        const m = c == null ? u : u.filter((A) => this._isVisibleAtLevel(A, c));
+        const m = d == null ? u : u.filter((A) => this._isVisibleAtLevel(A, d));
         if (!m.length) return i;
-        const O = m[0]?.data?.billboard?.[0]?.theme || this.clusterTheme, P = this.groupByTheme ? `cluster-${o}-${a}-${n}-${g}` : `cluster-${o}-${a}-${n}`;
+        const G = m[0]?.data?.billboard?.[0]?.theme || this.clusterTheme, P = this.groupByTheme ? `cluster-${o}-${a}-${n}-${g}` : `cluster-${o}-${a}-${n}`;
         this.labelPool.add(
           {
             id: P,
@@ -409,8 +411,8 @@ class Xe {
             id: P,
             lon: p,
             lat: y,
-            height: G,
-            theme: O
+            height: E,
+            theme: G
           }
         ), i++;
       }
@@ -419,13 +421,13 @@ class Xe {
   }
   _debugDrawCell(e) {
     if (!this.debugCurrentGrids) return;
-    const { levelIdx: t, west: i, south: o, east: a, north: n, lonIdx: s, latIdx: h } = e, d = this.levels[t].level;
+    const { levelIdx: t, west: i, south: o, east: a, north: n, lonIdx: s, latIdx: h } = e, c = this.levels[t].level;
     this._drawDebugGrid(
       i,
       o,
       a,
       n,
-      `L:${d} X:${s} Y:${h}`
+      `L:${c} X:${s} Y:${h}`
     );
   }
   refresh() {
@@ -502,30 +504,30 @@ class Xe {
     t && this._tileLoadListener && (t.tileLoadProgressEvent.removeEventListener(this._tileLoadListener), this._tileLoadListener = null), this._updateTimer !== null && (clearTimeout(this._updateTimer), this._updateTimer = null), this.labelPool.reset(), this._clearDebugGrids(), this._removeDebugImageryLayer();
   }
 }
-var qe = "[object Symbol]";
-function V(r) {
-  return typeof r == "symbol" || K(r) && oe(r) == qe;
+var Ze = "[object Symbol]";
+function Y(r) {
+  return typeof r == "symbol" || W(r) && ne(r) == Ze;
 }
-function ge(r, e) {
+function ue(r, e) {
   for (var t = -1, i = r == null ? 0 : r.length, o = Array(i); ++t < i; )
     o[t] = e(r[t], t, r);
   return o;
 }
-var te = E ? E.prototype : void 0, ie = te ? te.toString : void 0;
-function ue(r) {
+var ie = O ? O.prototype : void 0, re = ie ? ie.toString : void 0;
+function fe(r) {
   if (typeof r == "string")
     return r;
-  if (L(r))
-    return ge(r, ue) + "";
-  if (V(r))
-    return ie ? ie.call(r) : "";
+  if (_(r))
+    return ue(r, fe) + "";
+  if (Y(r))
+    return re ? re.call(r) : "";
   var e = r + "";
   return e == "0" && 1 / r == -1 / 0 ? "-0" : e;
 }
-function fe(r) {
+function me(r) {
   return r;
 }
-function je(r, e, t) {
+function Je(r, e, t) {
   switch (t.length) {
     case 0:
       return r.call(e);
@@ -538,72 +540,72 @@ function je(r, e, t) {
   }
   return r.apply(e, t);
 }
-var Ze = 800, Je = 16, Qe = Date.now;
-function et(r) {
+var Qe = 800, et = 16, tt = Date.now;
+function it(r) {
   var e = 0, t = 0;
   return function() {
-    var i = Qe(), o = Je - (i - t);
+    var i = tt(), o = et - (i - t);
     if (t = i, o > 0) {
-      if (++e >= Ze)
+      if (++e >= Qe)
         return arguments[0];
     } else
       e = 0;
     return r.apply(void 0, arguments);
   };
 }
-function tt(r) {
+function rt(r) {
   return function() {
     return r;
   };
 }
-var it = ee ? function(r, e) {
-  return ee(r, "toString", {
+var at = te ? function(r, e) {
+  return te(r, "toString", {
     configurable: !0,
     enumerable: !1,
-    value: tt(e),
+    value: rt(e),
     writable: !0
   });
-} : fe, me = et(it), re = Math.max;
-function pe(r, e, t) {
-  return e = re(e === void 0 ? r.length - 1 : e, 0), function() {
-    for (var i = arguments, o = -1, a = re(i.length - e, 0), n = Array(a); ++o < a; )
+} : me, pe = it(at), ae = Math.max;
+function ye(r, e, t) {
+  return e = ae(e === void 0 ? r.length - 1 : e, 0), function() {
+    for (var i = arguments, o = -1, a = ae(i.length - e, 0), n = Array(a); ++o < a; )
       n[o] = i[e + o];
     o = -1;
     for (var s = Array(e + 1); ++o < e; )
       s[o] = i[o];
-    return s[e] = t(n), je(r, this, s);
+    return s[e] = t(n), Je(r, this, s);
   };
 }
-function rt(r, e) {
-  return me(pe(r, e, fe), r + "");
+function ot(r, e) {
+  return pe(ye(r, e, me), r + "");
 }
-function at(r, e, t) {
-  if (!W(t))
+function nt(r, e, t) {
+  if (!V(t))
     return !1;
   var i = typeof e;
-  return (i == "number" ? ne(t) && Ae(e, t.length) : i == "string" && e in t) ? se(t[e], r) : !1;
+  return (i == "number" ? se(t) && Re(e, t.length) : i == "string" && e in t) ? le(t[e], r) : !1;
 }
-function ot(r) {
-  return rt(function(e, t) {
+function st(r) {
+  return ot(function(e, t) {
     var i = -1, o = t.length, a = o > 1 ? t[o - 1] : void 0, n = o > 2 ? t[2] : void 0;
-    for (a = r.length > 3 && typeof a == "function" ? (o--, a) : void 0, n && at(t[0], t[1], n) && (a = o < 3 ? void 0 : a, o = 1), e = Object(e); ++i < o; ) {
+    for (a = r.length > 3 && typeof a == "function" ? (o--, a) : void 0, n && nt(t[0], t[1], n) && (a = o < 3 ? void 0 : a, o = 1), e = Object(e); ++i < o; ) {
       var s = t[i];
       s && r(e, s, i, a);
     }
     return e;
   });
 }
-var nt = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, st = /^\w*$/;
-function lt(r, e) {
-  if (L(r))
+var lt = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, ht = /^\w*$/;
+function ct(r, e) {
+  if (_(r))
     return !1;
   var t = typeof r;
-  return t == "number" || t == "symbol" || t == "boolean" || r == null || V(r) ? !0 : st.test(r) || !nt.test(r) || e != null && r in Object(e);
+  return t == "number" || t == "symbol" || t == "boolean" || r == null || Y(r) ? !0 : ht.test(r) || !lt.test(r) || e != null && r in Object(e);
 }
-var ht = "Expected a function";
-function Y(r, e) {
+var dt = "Expected a function";
+function U(r, e) {
   if (typeof r != "function" || e != null && typeof e != "function")
-    throw new TypeError(ht);
+    throw new TypeError(dt);
   var t = function() {
     var i = arguments, o = e ? e.apply(this, i) : i[0], a = t.cache;
     if (a.has(o))
@@ -611,77 +613,77 @@ function Y(r, e) {
     var n = r.apply(this, i);
     return t.cache = a.set(o, n) || a, n;
   };
-  return t.cache = new (Y.Cache || le)(), t;
+  return t.cache = new (U.Cache || he)(), t;
 }
-Y.Cache = le;
-var ct = 500;
-function dt(r) {
-  var e = Y(r, function(i) {
-    return t.size === ct && t.clear(), i;
+U.Cache = he;
+var gt = 500;
+function ut(r) {
+  var e = U(r, function(i) {
+    return t.size === gt && t.clear(), i;
   }), t = e.cache;
   return e;
 }
-var gt = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g, ut = /\\(\\)?/g, ft = dt(function(r) {
+var ft = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g, mt = /\\(\\)?/g, pt = ut(function(r) {
   var e = [];
-  return r.charCodeAt(0) === 46 && e.push(""), r.replace(gt, function(t, i, o, a) {
-    e.push(o ? a.replace(ut, "$1") : i || t);
+  return r.charCodeAt(0) === 46 && e.push(""), r.replace(ft, function(t, i, o, a) {
+    e.push(o ? a.replace(mt, "$1") : i || t);
   }), e;
 });
-function mt(r) {
-  return r == null ? "" : ue(r);
+function yt(r) {
+  return r == null ? "" : fe(r);
 }
-function U(r, e) {
-  return L(r) ? r : lt(r, e) ? [r] : ft(mt(r));
+function X(r, e) {
+  return _(r) ? r : ct(r, e) ? [r] : pt(yt(r));
 }
-function ye(r) {
-  if (typeof r == "string" || V(r))
+function z(r) {
+  if (typeof r == "string" || Y(r))
     return r;
   var e = r + "";
   return e == "0" && 1 / r == -1 / 0 ? "-0" : e;
 }
-function pt(r, e) {
-  e = U(e, r);
+function vt(r, e) {
+  e = X(e, r);
   for (var t = 0, i = e.length; r != null && t < i; )
-    r = r[ye(e[t++])];
+    r = r[z(e[t++])];
   return t && t == i ? r : void 0;
 }
-var ae = E ? E.isConcatSpreadable : void 0;
-function yt(r) {
-  return L(r) || N(r) || !!(ae && r && r[ae]);
+var oe = O ? O.isConcatSpreadable : void 0;
+function Ct(r) {
+  return _(r) || N(r) || !!(oe && r && r[oe]);
 }
-function vt(r, e, t, i, o) {
+function bt(r, e, t, i, o) {
   var a = -1, n = r.length;
-  for (t || (t = yt), o || (o = []); ++a < n; ) {
+  for (t || (t = Ct), o || (o = []); ++a < n; ) {
     var s = r[a];
-    t(s) ? ke(o, s) : o[o.length] = s;
+    t(s) ? $e(o, s) : o[o.length] = s;
   }
   return o;
 }
-function Ct(r) {
+function _t(r) {
   var e = r == null ? 0 : r.length;
-  return e ? vt(r) : [];
+  return e ? bt(r) : [];
 }
-function _t(r) {
-  return me(pe(r, void 0, Ct), r + "");
+function Lt(r) {
+  return pe(ye(r, void 0, _t), r + "");
 }
-var Lt = "[object Object]", bt = Function.prototype, Mt = Object.prototype, ve = bt.toString, Tt = Mt.hasOwnProperty, Pt = ve.call(Object);
+var Mt = "[object Object]", Tt = Function.prototype, Pt = Object.prototype, ve = Tt.toString, wt = Pt.hasOwnProperty, xt = ve.call(Object);
 function Ce(r) {
-  if (!K(r) || oe(r) != Lt)
+  if (!W(r) || ne(r) != Mt)
     return !1;
-  var e = Re(r);
+  var e = Be(r);
   if (e === null)
     return !0;
-  var t = Tt.call(e, "constructor") && e.constructor;
-  return typeof t == "function" && t instanceof t && ve.call(t) == Pt;
+  var t = wt.call(e, "constructor") && e.constructor;
+  return typeof t == "function" && t instanceof t && ve.call(t) == xt;
 }
-function wt(r, e, t) {
+function St(r, e, t) {
   var i = -1, o = r.length;
   e < 0 && (e = -e > o ? 0 : o + e), t = t > o ? o : t, t < 0 && (t += o), o = e > t ? 0 : t - e >>> 0, e >>>= 0;
   for (var a = Array(o); ++i < o; )
     a[i] = r[i + e];
   return a;
 }
-function xt(r) {
+function Dt(r) {
   return function(e, t, i) {
     for (var o = -1, a = Object(e), n = i(e), s = n.length; s--; ) {
       var h = n[++o];
@@ -691,89 +693,82 @@ function xt(r) {
     return e;
   };
 }
-var It = xt();
-function z(r, e, t) {
-  (t !== void 0 && !se(r[e], t) || t === void 0 && !(e in r)) && $e(r, e, t);
+var It = Dt();
+function F(r, e, t) {
+  (t !== void 0 && !le(r[e], t) || t === void 0 && !(e in r)) && He(r, e, t);
 }
-function St(r) {
-  return K(r) && ne(r);
+function Ot(r) {
+  return W(r) && se(r);
 }
-function F(r, e) {
+function K(r, e) {
   if (!(e === "constructor" && typeof r[e] == "function") && e != "__proto__")
     return r[e];
 }
-function Dt(r) {
-  return he(r, ce(r));
+function Et(r) {
+  return ce(r, de(r));
 }
-function Et(r, e, t, i, o, a, n) {
-  var s = F(r, t), h = F(e, t), d = n.get(h);
-  if (d) {
-    z(r, t, d);
+function Gt(r, e, t, i, o, a, n) {
+  var s = K(r, t), h = K(e, t), c = n.get(h);
+  if (c) {
+    F(r, t, c);
     return;
   }
-  var l = a ? a(s, h, t + "", r, e, n) : void 0, c = l === void 0;
-  if (c) {
-    var g = L(h), f = !g && Be(h), u = !g && !f && He(h);
-    l = h, g || f || u ? L(s) ? l = s : St(s) ? l = Ne(s) : f ? (c = !1, l = ze(h, !0)) : u ? (c = !1, l = Fe(h, !0)) : l = [] : Ce(h) || N(h) ? (l = s, N(s) ? l = Dt(s) : (!W(s) || de(s)) && (l = Ke(h))) : c = !1;
+  var l = a ? a(s, h, t + "", r, e, n) : void 0, d = l === void 0;
+  if (d) {
+    var g = _(h), f = !g && Ne(h), u = !g && !f && ze(h);
+    l = h, g || f || u ? _(s) ? l = s : Ot(s) ? l = Fe(s) : f ? (d = !1, l = Ke(h, !0)) : u ? (d = !1, l = We(h, !0)) : l = [] : Ce(h) || N(h) ? (l = s, N(s) ? l = Et(s) : (!V(s) || ge(s)) && (l = Ve(h))) : d = !1;
   }
-  c && (n.set(h, l), o(l, h, i, a, n), n.delete(h)), z(r, t, l);
+  d && (n.set(h, l), o(l, h, i, a, n), n.delete(h)), F(r, t, l);
 }
-function _e(r, e, t, i, o) {
+function be(r, e, t, i, o) {
   r !== e && It(e, function(a, n) {
-    if (o || (o = new We()), W(a))
-      Et(r, e, n, t, _e, i, o);
+    if (o || (o = new Ye()), V(a))
+      Gt(r, e, n, t, be, i, o);
     else {
-      var s = i ? i(F(r, n), a, n + "", r, e, o) : void 0;
-      s === void 0 && (s = a), z(r, n, s);
+      var s = i ? i(K(r, n), a, n + "", r, e, o) : void 0;
+      s === void 0 && (s = a), F(r, n, s);
     }
-  }, ce);
+  }, de);
 }
-function Gt(r) {
+function At(r) {
   var e = r == null ? 0 : r.length;
   return e ? r[e - 1] : void 0;
 }
-function Ot(r, e) {
-  return e.length < 2 ? r : pt(r, wt(e, 0, -1));
+function kt(r, e) {
+  return e.length < 2 ? r : vt(r, St(e, 0, -1));
 }
-var At = ot(function(r, e, t) {
-  _e(r, e, t);
-}), kt = Object.prototype, Rt = kt.hasOwnProperty;
-function $t(r, e) {
-  e = U(e, r);
+var Rt = st(function(r, e, t) {
+  be(r, e, t);
+}), $t = Object.prototype, Bt = $t.hasOwnProperty;
+function Ht(r, e) {
+  e = X(e, r);
   var t = -1, i = e.length;
   if (!i)
     return !0;
-  for (var o = r == null || typeof r != "object" && typeof r != "function"; ++t < i; ) {
-    var a = e[t];
-    if (typeof a == "string") {
-      if (a === "__proto__" && !Rt.call(r, "__proto__"))
-        return !1;
-      if (a === "constructor" && t + 1 < i && typeof e[t + 1] == "string" && e[t + 1] === "prototype") {
-        if (o && t === 0)
-          continue;
-        return !1;
-      }
-    }
+  for (; ++t < i; ) {
+    var o = z(e[t]);
+    if (o === "__proto__" && !Bt.call(r, "__proto__") || (o === "constructor" || o === "prototype") && t < i - 1)
+      return !1;
   }
-  var n = Ot(r, e);
-  return n == null || delete n[ye(Gt(e))];
+  var a = kt(r, e);
+  return a == null || delete a[z(At(e))];
 }
-function Bt(r) {
+function Nt(r) {
   return Ce(r) ? void 0 : r;
 }
-var Ht = 1, Nt = 2, zt = 4, Ft = _t(function(r, e) {
+var zt = 1, Ft = 2, Kt = 4, Wt = Lt(function(r, e) {
   var t = {};
   if (r == null)
     return t;
   var i = !1;
-  e = ge(e, function(a) {
-    return a = U(a, r), i || (i = a.length > 1), a;
-  }), he(r, Ve(r), t), i && (t = Ye(t, Ht | Nt | zt, Bt));
+  e = ue(e, function(a) {
+    return a = X(a, r), i || (i = a.length > 1), a;
+  }), ce(r, Ue(r), t), i && (t = Xe(t, zt | Ft | Kt, Nt));
   for (var o = e.length; o--; )
-    $t(t, e[o]);
+    Ht(t, e[o]);
   return t;
 });
-function Kt(r, e) {
+function Vt(r, e) {
   const t = e.materialType || "DynamicImgMaterial" + Date.now() + Math.floor(Math.random() * 1e3);
   function i(a) {
     this._definitionChanged = new r.Event(), this._color = a.color, this._colorSubscription = void 0, this.color = a.color, this.duration = a.duration, this._time = Date.now();
@@ -810,7 +805,7 @@ function Kt(r, e) {
       vec2 st = materialInput.st;
       float time = fract(mod(float(czm_frameNumber * 33.0) , float(${a.duration})) / float(${a.duration}));
       ${a.freely === "vertical" ? `vec4 colorImage = texture(image, vec2(fract(float(${a.count}) *st.t ${a.direction} time), fract(st.s)));` : `vec4 colorImage = texture(image, vec2(fract(float(${a.count}) *st.s ${a.direction} time), fract(st.t)));`}
-      ${a.isCustomColor ? "material.diffuse = color.rgb;" : "material.diffuse = colorImage.rgb;"}
+      material.diffuse = color.rgb;
        material.alpha = colorImage.a;
       return material;
       }`;
@@ -827,8 +822,7 @@ function Kt(r, e) {
         count: e.count,
         freely: e.freely || "",
         direction: e.direction,
-        duration: e.duration || 100,
-        isCustomColor: e.isCustomColor
+        duration: e.duration || 100
       })
     },
     translucent() {
@@ -836,7 +830,7 @@ function Kt(r, e) {
     }
   }), new i(e);
 }
-function Le(r, e) {
+function _e(r, e) {
   const t = e.MaterialType || "wallType" + (/* @__PURE__ */ new Date()).getTime() + parseInt(Math.random() * 1e3 + "");
   function i(a) {
     this._definitionChanged = new r.Event(), this._color = void 0, this._colorSubscription = void 0, this.color = a.color, this.duration = a.duration, this._time = (/* @__PURE__ */ new Date()).getTime();
@@ -870,10 +864,10 @@ function Le(r, e) {
     return a.freely == "vertical" ? n += "vec4 colorImage = texture(image, vec2(fract(float(" + a.count + ")*st.t " + a.direction + ` time), fract(st.s)));
  ` : n += "vec4 colorImage = texture(image, vec2(fract(float(" + a.count + ")*st.s " + a.direction + ` time), fract(st.t)));
  `, n += `vec4 fragColor;
-            fragColor.rgb = (colorImage.rgb) / 1.0;
+            fragColor.rgb = (color.rgb) / 1.0;
             fragColor = czm_gammaCorrect(fragColor);
- `, n += ` material.diffuse = colorImage.rgb;
-            material.alpha = colorImage.a;
+ `, n += ` material.diffuse = color.rgb;
+            material.alpha = colorImage.a * color.a;
             material.emission = fragColor.rgb;
             
             return material;
@@ -884,7 +878,7 @@ function Le(r, e) {
     fabric: {
       type: t,
       uniforms: {
-        color: new r.Color(1, 0, 0, 0.5),
+        color: e.color || new r.Color(1, 1, 1, 1),
         image: e.image,
         time: 0
       },
@@ -899,11 +893,11 @@ function Le(r, e) {
     }
   }), new i(e);
 }
-function Wt(r, e) {
-  const t = r.Color, i = Object.defineProperties, o = r.Event, a = r.createPropertyDescriptor, n = r.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 o(), 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);
+function Yt(r, e) {
+  const t = r.Color, i = Object.defineProperties, o = r.Event, a = r.createPropertyDescriptor, n = r.Property, s = (d, g) => d === void 0 ? g : d, h = {};
+  let c = e.materialType || "PolylineFlow" + Date.now() + Math.floor(Math.random() * 1e3);
+  function l(d) {
+    d = s(d, h), this._definitionChanged = new o(), this._color = void 0, this._colorSubscription = void 0, this.color = d.color || t.fromBytes(0, 255, 255, 255), this._duration = void 0, this._durationSubscription = void 0, this.duration = s(d.duration, 45);
   }
   return i(l.prototype, {
     isConstant: {
@@ -916,23 +910,23 @@ function Wt(r, e) {
         return this._definitionChanged;
       }
     }
-  }), l.prototype.getType = function(c) {
-    return d;
-  }, l.prototype.getValue = function(c, g) {
+  }), l.prototype.getType = function(d) {
+    return c;
+  }, l.prototype.getValue = function(d, g) {
     return g || (g = {}), g.color = n.getValueOrClonedDefault(
       this._color,
-      c,
+      d,
       r.Color.WHITE,
       g.color
     ), g.duration = this._duration, g;
-  }, l.prototype.equals = function(c) {
-    return this === c || c instanceof l && n.equals(this._color, c._color);
+  }, l.prototype.equals = function(d) {
+    return this === d || d instanceof l && n.equals(this._color, d._color);
   }, i(l.prototype, {
     color: a("color"),
     duration: a("duration")
-  }), r.PolylineFlowMaterialProperty = l, r.Material._materialCache.addMaterial(d, {
+  }), r.PolylineFlowMaterialProperty = l, r.Material._materialCache.addMaterial(c, {
     fabric: {
-      type: d,
+      type: c,
       uniforms: {
         color: new t(1, 1, 1, 1),
         duration: 45
@@ -962,7 +956,7 @@ function Wt(r, e) {
     }
   }), new l(e);
 }
-class be {
+class Le {
   categoryMap = /* @__PURE__ */ new Map();
   CategoryGet = {};
   constructor() {
@@ -1051,7 +1045,7 @@ class be {
     return [...this.categoryMap.keys()];
   }
 }
-class Vt {
+class Ut {
   id;
   entities = [];
   primitives = [];
@@ -1087,7 +1081,7 @@ class Vt {
     }), 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;
   }
 }
-class Yt {
+class Xt {
   id;
   groupMap = /* @__PURE__ */ new Map();
   Cesium;
@@ -1096,9 +1090,9 @@ class Yt {
   aggregator;
   cardPool;
   constructor(e, t, i, o, a, n) {
-    this.id = e, this.Cesium = t, this.viewer = i, this.materialManager = o, this.aggregator = a, this.cardPool = n, this.aggregator.labelPool.eventBus.addListener(S.Click, {
+    this.id = e, this.Cesium = t, this.viewer = i, this.materialManager = o, this.aggregator = a, this.cardPool = n, this.aggregator.labelPool.eventBus.addListener(D.Click, {
       name: "BufferedHierarchicalAggregator_maker_click",
-      fn: (h, d) => {
+      fn: (h, c) => {
         this.cardPool.showByIds([h.data.id]);
       }
     }), new t.ScreenSpaceEventHandler(i.scene.canvas).setInputAction(() => {
@@ -1152,8 +1146,8 @@ class Yt {
       themeKey: e.theme,
       category: "polygon",
       options: e
-    }), o = Array.isArray(e.hierarchy[0]) ? e.hierarchy.flat() : e.hierarchy, a = this.Cesium.Cartesian3.fromDegreesArrayHeights(o), n = e.holes?.map((d) => {
-      let l = Array.isArray(d[0]) ? e.hierarchy.flat() : e.hole;
+    }), o = Array.isArray(e.hierarchy[0]) ? e.hierarchy.flat() : e.hierarchy, a = this.Cesium.Cartesian3.fromDegreesArrayHeights(o), n = e.holes?.map((c) => {
+      let l = Array.isArray(c[0]) ? e.hierarchy.flat() : e.hole;
       return this.Cesium.Cartesian3.fromDegreesArrayHeights(l.flat());
     }) || [], s = new this.Cesium.PolygonHierarchy(a, n);
     let h = {
@@ -1200,18 +1194,18 @@ class Yt {
     this.removeGroup(i);
     const o = [], a = e.show !== !1;
     (e.polyline || []).forEach((h) => {
-      const d = this.createPolyline(h, a);
-      d && o.push(d);
+      const c = this.createPolyline(h, a);
+      c && o.push(c);
     }), (e.wall || []).forEach((h) => {
-      const d = this.createWall(h, a);
-      d && o.push(d);
+      const c = this.createWall(h, a);
+      c && o.push(c);
     }), (e.polygon || []).forEach((h) => {
-      const d = this.createPolygon(h, a);
-      d && o.push(d);
+      const c = this.createPolygon(h, a);
+      c && o.push(c);
     });
     const n = this.createBillboardPoints(e);
     n.length && t && this.aggregator.appendPoints(n, !1), this.createCard(e);
-    const s = new Vt({
+    const s = new Ut({
       id: i,
       entities: o,
       primitives: [],
@@ -1259,7 +1253,7 @@ class Yt {
     this.groupMap.forEach((e) => e.removeAll(this.viewer)), this.groupMap.clear();
   }
 }
-class Ut {
+class qt {
   Cesium;
   viewer;
   layerMap = /* @__PURE__ */ new Map();
@@ -1272,7 +1266,7 @@ class Ut {
   addLayer(e) {
     this.layerMap.has(e) || this.layerMap.set(
       e,
-      new Yt(
+      new Xt(
         e,
         this.Cesium,
         this.viewer,
@@ -1307,7 +1301,7 @@ class Ut {
     this.layerMap.get(e)?.removeGroups(t);
   }
 }
-class Xt {
+class jt {
   labelId;
   cardId;
   opt;
@@ -1315,13 +1309,13 @@ class Xt {
   MaterialManager;
   instance;
   constructor(e) {
-    this.labelId = e.labelId, this.cardId = e.cardId, this.opt = e, this.MaterialManager = e.MaterialManager || new be(), this.instance = this.initCore(e, e.eventBus, e.cardEventBus);
+    this.labelId = e.labelId, this.cardId = e.cardId, this.opt = e, this.MaterialManager = e.MaterialManager || new Le(), this.instance = this.initCore(e, e.eventBus, e.cardEventBus);
   }
   //初始化标记管理
   initCore(e, t, i) {
     let { Cesium: o, viewer: a, aggregatorOptions: n } = e;
     t || (t = new H()), i || (i = new H());
-    const s = new Z(o, a, this.labelId, t), h = new Z(o, a, this.cardId, i, !1), d = new Xe(o, a, {
+    const s = new J(o, a, this.labelId, t), h = new J(o, a, this.cardId, i, !1), c = new je(o, a, {
       //聚合
       threshold: n?.threshold || 16,
       displayLimit: n?.displayLimit || 300,
@@ -1335,15 +1329,15 @@ class Xt {
       // 普通点的默认主题
       ...n,
       labelPool: s
-    }), l = this.MaterialManager, c = new Ut(
+    }), l = this.MaterialManager, d = new qt(
       //实体图层管理
       o,
       a,
       l,
-      d,
+      c,
       h
     );
-    return { materialManager: l, entityLayerManager: c, cardPool: h, labelPool: s, aggregator: d, eventBus: t, cardEventBus: i };
+    return { materialManager: l, entityLayerManager: d, cardPool: h, labelPool: s, aggregator: c, eventBus: t, cardEventBus: i };
   }
   //添加标记
   set(e) {
@@ -1357,18 +1351,18 @@ class Xt {
   //添加
   add(e) {
     let t = [];
-    L(e) ? t = e : t.push(e), t.forEach((i) => {
+    _(e) ? t = e : t.push(e), t.forEach((i) => {
       this.entityList.set(i.id, i);
     }), this.instance.entityLayerManager.getLayer("Layer_default") || this.instance.entityLayerManager.addLayer("Layer_default"), this.instance.entityLayerManager.addGroupsToLayer("Layer_default", t);
   }
   //更新标记
   update(e, t = !0) {
     let i = [];
-    L(e) ? i = e : i.push(e);
+    _(e) ? i = e : i.push(e);
     const o = i.map((a) => {
       const n = this.entityList.get(a.id);
       if (!n) return;
-      let s = At({}, n, a);
+      let s = Rt({}, n, a);
       return this.entityList.set(a.id, s), s;
     }).filter(Boolean);
     t && this.instance.entityLayerManager.updateGroupToLayer("Layer_default", o);
@@ -1387,7 +1381,7 @@ class Xt {
   //删除标记
   delete(e) {
     let t = [];
-    L(e) ? t = e : t.push(e), t.forEach((i) => {
+    _(e) ? t = e : t.push(e), t.forEach((i) => {
       this.entityList.delete(i);
     }), this.instance.entityLayerManager.removeGroups("Layer_default", t);
   }
@@ -1398,14 +1392,14 @@ class Xt {
     this.instance.aggregator.setDebugCurrentGrids(e || !1);
   }
 }
-function qt({
+function Zt({
   Cesium: r,
   options: e,
   MaterialManager: t
 }) {
   if (e.data?.theme) {
     if (e.data?.lineType == "1") {
-      let i = Wt(r, {
+      let i = Yt(r, {
         color: new r.Color.fromCssColorString(e?.options?.color || "#ffffff"),
         duration: 100
       });
@@ -1445,7 +1439,7 @@ function qt({
         category: "polyline"
       });
     } else if (e.data?.lineType == "5") {
-      let i = Kt(r, {
+      let i = Vt(r, {
         image: e.img,
         color: new r.Color.fromCssColorString(e?.options?.color || "#ffffff"),
         duration: 5e3,
@@ -1461,7 +1455,7 @@ function qt({
     }
   }
 }
-function jt({
+function Jt({
   Cesium: r,
   options: e,
   MaterialManager: t
@@ -1484,7 +1478,7 @@ function jt({
         category: "polygon"
       });
     } else if (e.data?.polygonType == "DynamicImgMaterial") {
-      let i = Le(r, {
+      let i = _e(r, {
         image: e.img,
         color: new r.Color.fromCssColorString(e?.options?.color),
         duration: 5e3,
@@ -1500,7 +1494,7 @@ function jt({
     }
   }
 }
-function Zt({
+function Qt({
   Cesium: r,
   options: e,
   MaterialManager: t
@@ -1516,9 +1510,9 @@ function Zt({
         category: "wall"
       });
     } else if (e.data?.wallType == "DynamicImgMaterial") {
-      let i = Le(r, {
+      let i = _e(r, {
         image: e.img,
-        // color: new Cesium.Color.fromCssColorString(options?.options?.color),
+        color: new r.Color.fromCssColorString(e?.options?.color),
         duration: 5e3,
         freely: e.data?.freely || "vertical",
         direction: "+",
@@ -1532,7 +1526,7 @@ function Zt({
     }
   }
 }
-class Jt extends Xt {
+class ei extends jt {
   constructor(e) {
     const {
       labelId: t = "report-marker",
@@ -1542,14 +1536,14 @@ class Jt extends Xt {
       cardThemeConfig: n = [],
       runListener: s = () => {
       },
-      MaterialManager: h = new be(),
-      aggregatorOptions: d
-    } = e, l = [...o], c = [...a], g = [...n], f = {
+      MaterialManager: h = new Le(),
+      aggregatorOptions: c
+    } = e, l = [...o], d = [...a], g = [...n], f = {
       clusterTheme: "Tag1007",
       pointTheme: "Tag1001",
       centralPointMode: "firstPoint",
       debugCurrentGrids: !1,
-      ...d || {}
+      ...c || {}
     }, u = {
       ...e,
       labelId: t,
@@ -1558,7 +1552,7 @@ class Jt extends Xt {
       aggregatorOptions: f,
       eventBus: new H()
     };
-    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();
+    super(u), this.opt = { ...this.opt, ...u }, this.initTagListener(this.instance.eventBus, this.opt), this.loadTabThemeConfig(l), this.loadLineThemeConfig(d), this.loadCardThemeConfig(g), this.initDefaultLineMaterials(), this.initDefaultTagTheme();
   }
   initDefaultTagTheme() {
     this.setTagTheme({
@@ -1671,21 +1665,21 @@ class Jt extends Xt {
     const t = this.opt.Cesium, i = this.instance.materialManager || this.opt.MaterialManager;
     if (e.line?.length > 0)
       for (let o of e.line)
-        qt({
+        Zt({
           options: o,
           Cesium: t,
           MaterialManager: i
         });
     if (e.polygon?.length > 0)
       for (let o of e.polygon)
-        jt({
+        Jt({
           options: o,
           Cesium: t,
           MaterialManager: i
         });
     if (e.wall?.length > 0)
       for (let o of e.wall)
-        Zt({
+        Qt({
           options: o,
           Cesium: t,
           MaterialManager: i
@@ -1719,7 +1713,7 @@ class Jt extends Xt {
       t.registerTheme(i.data.theme, {
         createElement(o, a) {
           let n = a.data.data, s;
-          return i.comType == 1 ? s = M(T(J), {
+          return i.comType == 1 ? s = L(M(Q), {
             data: n || {},
             imgSrc: i.data.img,
             styleConfig: {
@@ -1740,7 +1734,7 @@ class Jt extends Xt {
               top: "0px"
             },
             bgClass: [i.data.theme]
-          }) : i.comType == 3 && (s = M(T(J), {
+          }) : i.comType == 3 && (s = L(M(Q), {
             data: n || {},
             imgSrc: i.data.img,
             styleConfig: {
@@ -1763,7 +1757,7 @@ class Jt extends Xt {
             bgClass: [i.data.theme]
             // titleConfig: themeOptions.options.titleConfig,
             // pageInfoConfig: themeOptions.options.pageInfoConfig,
-          })), I(s, o), () => I(null, o);
+          })), S(s, o), () => S(null, o);
         },
         options: {
           offset: i.data.pixelOffset,
@@ -1778,7 +1772,7 @@ class Jt extends Xt {
     t.registerTheme(e.data.theme, {
       createElement(i, o) {
         let a = o.data?.billboard?.[0];
-        const n = Ft(a, ["position", "options"]);
+        const n = Wt(a, ["position", "options"]);
         let s, h = {
           ...n,
           text: a?.options?.text,
@@ -1787,71 +1781,93 @@ class Jt extends Xt {
           textStyle: e?.data?.options?.textStyle,
           imgStyle: e?.data?.options?.imgStyle
         };
-        return o.data?.gridKey ? s = M(T(Q), {
-          text: o.data?.count,
-          isFullLink: e.isFullLink ?? !1,
-          img: e?.data.options.img,
-          imgStyle: e?.data.options?.imgStyle,
-          textStyle: {
-            display: "block !important",
-            "font-size": "12px !important",
-            minWidth: "20px",
-            maxWidth: "max-content",
-            position: "absolute",
-            left: "63%",
-            top: "-8px",
-            background: "#f00",
-            "border-radius": "50%",
-            height: "20px",
-            "line-height": "20px",
-            "text-align": "center",
-            color: "white"
-          }
-        }) : e.comType == 4 ? s = M(T(Oe), h) : s = M(T(Q), h), I(s, i), () => I(null, i);
+        if (o.data?.gridKey)
+          s = L(M(ee), {
+            text: o.data?.count,
+            isFullLink: e.isFullLink ?? !1,
+            img: e?.data.options.img,
+            imgStyle: e?.data.options?.imgStyle,
+            textStyle: {
+              display: "block !important",
+              "font-size": "12px !important",
+              minWidth: "20px",
+              maxWidth: "max-content",
+              position: "absolute",
+              left: "63%",
+              top: "-8px",
+              background: "#f00",
+              "border-radius": "50%",
+              height: "20px",
+              "line-height": "20px",
+              "text-align": "center",
+              color: "white"
+            }
+          });
+        else if (e.comType == 4)
+          s = L(M(Ae), h);
+        else if (e.comType == 5) {
+          const c = a?.options || {}, l = e?.data?.options || {}, d = a?.pixelOffset || e?.data?.pixelOffset || { x: 0, y: 0 }, g = c.otherOffset ?? l.otherOffset ?? { x: 0, y: -0 }, f = c.isCanDraggable ?? l.isCanDraggable ?? e?.isCanDraggable ?? !1;
+          s = L(M(Ge), {
+            ...h,
+            pixelOffset: d,
+            textStyle: c.textStyle || l.textStyle,
+            lineStyle: c.lineStyle || l.lineStyle,
+            otherOffset: g,
+            isCanDraggable: f,
+            onCanDraggable: c.onCanDraggable || e?.onCanDraggable,
+            onSetOtherOffset: (u) => {
+              o.data?.billboard?.[0]?.options && (o.data.billboard[0].options.otherOffset = u), c.onSetOtherOffset?.(u), e?.onSetOtherOffset?.(o.data, u);
+            }
+          });
+        } else e.comType == 6 || e.comType == 7 ? s = L(M(ke), {
+          text: h.text,
+          textStyle: h.textStyle
+        }) : s = L(M(ee), h);
+        return S(s, i), () => S(null, i);
       },
       options: {
-        offset: e?.data?.pixelOffset || {}
+        offset: e.comType == 5 ? {} : e?.data?.pixelOffset || {}
       }
     });
   }
   //标记监听事件
   initTagListener(e, t) {
     let { viewer: i, tagListeningOptions: o } = t;
-    e.addListener(S.Click, {
+    e.addListener(D.Click, {
       name: "marker:click",
       fn: (a) => {
-        t.runListener?.(D.标记左键点击, a.data), de(a.data?.onClick) && a.data?.onClick(a.data), a.data?.cameraPoint && a.data?.billboard[0]?.isFlyToCameraPoint && i?.camera?.flyTo({
+        t.runListener?.(I.标记左键点击, a.data), ge(a.data?.onClick) && a.data?.onClick(a.data), a.data?.cameraPoint && a.data?.billboard[0]?.isFlyToCameraPoint && i?.camera?.flyTo({
           duration: 1,
           ...a.data?.cameraPoint
         });
       }
-    }), e.addListener(S.MouseEnter, {
+    }), e.addListener(D.MouseEnter, {
       name: "marker:mouseenter",
       fn: (a) => {
         let n = this.opt.Cesium, s = { x: 0, y: 0 };
         try {
           if (a.data?.billboard?.[0]?.position?.length > 2) {
-            let h = a.data?.billboard[0]?.position, d = n.Cartesian3.fromDegrees(h[0], h[1], h[3] || 0), l = this.instance.labelPool.toWindowCoordinates(d);
+            let h = a.data?.billboard[0]?.position, c = n.Cartesian3.fromDegrees(h[0], h[1], h[3] || 0), l = this.instance.labelPool.toWindowCoordinates(c);
             s.x = l.x, s.y = l.y;
           }
         } catch (h) {
           console.log(h);
         }
-        t.runListener?.(D.标记移入, a.data, s);
+        t.runListener?.(I.标记移入, a.data, s);
       }
-    }), e.addListener(S.MouseLeave, {
+    }), e.addListener(D.MouseLeave, {
       name: "marker:mouseleave",
       fn: (a) => {
         let n = this.opt.Cesium, s = { x: 0, y: 0 };
         try {
           if (a.data?.billboard?.[0]?.position?.length > 2) {
-            let h = a.data?.billboard[0]?.position, d = n.Cartesian3.fromDegrees(h[0], h[1], h[3] || 0), l = this.instance.labelPool.toWindowCoordinates(d);
+            let h = a.data?.billboard[0]?.position, c = n.Cartesian3.fromDegrees(h[0], h[1], h[3] || 0), l = this.instance.labelPool.toWindowCoordinates(c);
             s.x = l.x, s.y = l.y;
           }
         } catch (h) {
           console.log(h);
         }
-        t.runListener?.(D.标记移出, a.data, s);
+        t.runListener?.(I.标记移出, a.data, s);
       }
     }), o?.forEach((a) => {
       e.addListener(a.key, a.ListenerItem, a.overwrite);
@@ -1869,16 +1885,16 @@ class Jt extends Xt {
     });
   }
 }
-const Qt = /* @__PURE__ */ xe({
+const ti = /* @__PURE__ */ xe({
   __name: "MarkerManage",
-  props: Ue,
+  props: qe,
   emits: ["register", "load", "marker-event"],
   setup(r, { expose: e, emit: t }) {
-    const i = r, o = t, a = Ie("leitingMethods");
+    const i = r, o = t, a = Se("leitingMethods");
     let n = null;
     const s = (l = {}) => {
       if (n) return n;
-      const c = {
+      const d = {
         ...i,
         ...l,
         Cesium: l.Cesium || i.Cesium,
@@ -1887,50 +1903,50 @@ const Qt = /* @__PURE__ */ xe({
           o("marker-event", { key: g, data: f, args: u });
         }
       };
-      return !c.Cesium || !c.viewer ? null : (n = new Jt(c), l.methods && (l.methods.setTagTheme = n.setTagTheme.bind(n), l.methods.setMaterial = n.setMaterial.bind(n), l.methods.setEntityList = n.set.bind(n), l.methods.addComItem = n.add.bind(n), l.methods.deleteComItem = n.delete.bind(n), l.methods.updateComItem = n.update.bind(n), l.methods.getEntityByID = n.getById.bind(n), l.methods.getOptions = n.getOptions.bind(n)), o("load", n), n);
+      return !d.Cesium || !d.viewer ? null : (n = new ei(d), l.methods && (l.methods.setTagTheme = n.setTagTheme.bind(n), l.methods.setMaterial = n.setMaterial.bind(n), l.methods.setEntityList = n.set.bind(n), l.methods.addComItem = n.add.bind(n), l.methods.deleteComItem = n.delete.bind(n), l.methods.updateComItem = n.update.bind(n), l.methods.getEntityByID = n.getById.bind(n), l.methods.getOptions = n.getOptions.bind(n)), o("load", n), n);
     }, h = {
       init: s,
       set: (l) => n?.set(l),
       add: (l) => n?.add(l),
-      update: (l, c) => n?.update(l, c),
+      update: (l, d) => n?.update(l, d),
       getById: (l) => n?.getById(l),
       getOptions: () => n?.getOptions(),
       delete: (l) => n?.delete(l),
-      setMarkerAggregationEnabled: (l, c) => n?.setMarkerAggregationEnabled(l, c),
+      setMarkerAggregationEnabled: (l, d) => n?.setMarkerAggregationEnabled(l, d),
       setDebugCurrentGridsEnabled: (l) => n?.setDebugCurrentGridsEnabled(l),
       initThemes: (l) => n?.initThemes(l),
       setTagTheme: (l) => n?.setTagTheme(l),
       setMaterial: (l) => n?.setMaterial(l)
     };
     e(h), o("register", h);
-    function d() {
+    function c() {
       if (n) return n;
-      const l = Ge(a), c = l?.getCesium?.(), g = l?.getViewer?.();
-      c && g ? s({ Cesium: c, viewer: g, methods: l }) : i.Cesium && i.viewer && s({ methods: l });
+      const l = Ee(a), d = l?.getCesium?.(), g = l?.getViewer?.();
+      d && g ? s({ Cesium: d, viewer: g, methods: l }) : i.Cesium && i.viewer && s({ methods: l });
     }
-    return Se(() => {
-      d();
-    }), j(
+    return De(() => {
+      c();
+    }), Z(
       () => [i.Cesium, i.viewer],
-      ([l, c]) => {
-        l && c && !n && d();
+      ([l, d]) => {
+        l && d && !n && c();
       }
-    ), j(
+    ), Z(
       () => a?.value,
-      (l, c) => {
-        d();
+      (l, d) => {
+        c();
       },
       { deep: !1 }
-    ), De(() => {
-    }), (l, c) => Ee(l.$slots, "default");
+    ), Ie(() => {
+    }), (l, d) => Oe(l.$slots, "default");
   }
-}), si = we(Qt);
+}), di = we(ti);
 export {
-  si as CxMarkerManage,
-  Jt as MarkerManage,
-  Xt as MarkerManagerCore,
-  D as ReportListenerKey,
-  si as default,
-  Ue as markerManageProps
+  di as CxMarkerManage,
+  ei as MarkerManage,
+  jt as MarkerManagerCore,
+  I as ReportListenerKey,
+  di as default,
+  qe as markerManageProps
 };
 //# sourceMappingURL=marker-manage.js.map