@realsee/dnalogel 2.19.2 → 2.19.3

package/libs/PanoTagPlugin/Components/TagItem.js

@@ -1,9 +1,9 @@
-import { SvelteComponent as Q, init as U, safe_not_equal as W, append_styles as X, element as C, space as Y, attr as d, null_to_empty as B, set_style as h, toggle_class as _, insert as P, append as E, transition_out as y, check_outros as F, transition_in as v, detach as N, getContext as Z, group_outros as G, noop as S, create_component as K, mount_component as M, destroy_component as O } from "../../vendor/svelte/internal/index.js";
-import x from "./Tag/index.js";
+import { SvelteComponent as U, init as W, safe_not_equal as X, append_styles as Y, element as C, space as Z, attr as d, null_to_empty as E, set_style as h, toggle_class as _, insert as P, append as F, transition_out as y, check_outros as G, transition_in as v, detach as N, getContext as x, group_outros as H, noop as S, create_component as M, mount_component as O, destroy_component as Q } from "../../vendor/svelte/internal/index.js";
+import $ from "./Tag/index.js";
 import "three";
-import { noTypecheck as H } from "../utils/noTypecheck.js";
-import $ from "./Common/TagPoint.js";
-import { classnames as J } from "../../vendor/classnames/index.js";
+import { noTypecheck as J } from "../utils/noTypecheck.js";
+import tt from "./Common/TagPoint.js";
+import { classnames as K } from "../../vendor/classnames/index.js";
 import "./Tag/TextTag/index.js";
 import "./Tag/TextTag/TextTag.js";
 import "./Common/Line/Straight.js";
@@ -90,10 +90,10 @@ import "./Tag/LinkTag.js";
 import "./Common/Icon/Icon.js";
 import "../utils/getImageInfo.js";
 import "./Tag/CustomTag.js";
-function tt(i) {
-  X(i, "svelte-pzwdws", ".tag.withAnimation.svelte-pzwdws{transition:opacity 0.3s linear}.tag.hide.svelte-pzwdws{opacity:0;pointer-events:none}.tag.hide.svelte-pzwdws *{pointer-events:none !important}.tag.unClickable.svelte-pzwdws{pointer-events:none !important}.tag.unClickable.svelte-pzwdws *{pointer-events:none !important}.tag.disable.svelte-pzwdws{display:none}.wrapper.svelte-pzwdws{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto}");
-}
 function et(i) {
+  Y(i, "svelte-pzwdws", ".tag.withAnimation.svelte-pzwdws{transition:opacity 0.3s linear}.tag.hide.svelte-pzwdws{opacity:0;pointer-events:none}.tag.hide.svelte-pzwdws *{pointer-events:none !important}.tag.unClickable.svelte-pzwdws{pointer-events:none !important}.tag.unClickable.svelte-pzwdws *{pointer-events:none !important}.tag.disable.svelte-pzwdws{display:none}.wrapper.svelte-pzwdws{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto}");
+}
+function it(i) {
   let e;
   return {
     c() {
@@ -110,9 +110,9 @@ function et(i) {
     }
   };
 }
-function it(i) {
+function ot(i) {
   let e, t;
-  return e = new x({
+  return e = new $({
     props: {
       mediaStore: (
         /*mediaStore*/
@@ -122,7 +122,7 @@ function it(i) {
         /*withAnimation*/
         i[0]
       ),
-      tag: H(
+      tag: J(
         /*tag*/
         i[1]
       ),
@@ -141,10 +141,10 @@ function it(i) {
     }
   }), {
     c() {
-      K(e.$$.fragment);
+      M(e.$$.fragment);
     },
     m(o, a) {
-      M(e, o, a), t = !0;
+      O(e, o, a), t = !0;
     },
     p(o, a) {
       const m = {};
@@ -153,7 +153,7 @@ function it(i) {
       o[2]), a & /*withAnimation*/
       1 && (m.withAnimation = /*withAnimation*/
       o[0]), a & /*tag*/
-      2 && (m.tag = H(
+      2 && (m.tag = J(
         /*tag*/
         o[1]
       )), a & /*state*/
@@ -169,11 +169,11 @@ function it(i) {
       y(e.$$.fragment, o), t = !1;
     },
     d(o) {
-      O(e, o);
+      Q(e, o);
     }
   };
 }
-function ot(i) {
+function rt(i) {
   let e;
   return {
     c() {
@@ -190,17 +190,17 @@ function ot(i) {
     }
   };
 }
-function rt(i) {
+function nt(i) {
   let e, t;
-  return e = new $({ props: { tag: (
+  return e = new tt({ props: { tag: (
     /*tag*/
     i[1]
   ) } }), {
     c() {
-      K(e.$$.fragment);
+      M(e.$$.fragment);
     },
     m(o, a) {
-      M(e, o, a), t = !0;
+      O(e, o, a), t = !0;
     },
     p(o, a) {
       const m = {};
@@ -215,13 +215,13 @@ function rt(i) {
       y(e.$$.fragment, o), t = !1;
     },
     d(o) {
-      O(e, o);
+      Q(e, o);
     }
   };
 }
-function nt(i) {
+function at(i) {
   let e, t, o, a, m, s, f, g, w, l;
-  const T = [it, et], u = [];
+  const T = [ot, it], u = [];
   function p(n, r) {
     return (
       /*haveContent*/
@@ -229,7 +229,7 @@ function nt(i) {
     );
   }
   o = p(i), a = u[o] = T[o](i);
-  const z = [rt, ot], c = [];
+  const z = [nt, rt], c = [];
   function A(n, r) {
     return (
       /*havePoint*/
@@ -238,7 +238,7 @@ function nt(i) {
   }
   return s = A(i), f = c[s] = z[s](i), {
     c() {
-      e = C("div"), t = C("div"), a.c(), m = Y(), f.c(), d(t, "class", g = B(J(
+      e = C("div"), t = C("div"), a.c(), m = Z(), f.c(), d(t, "class", g = E(K(
         "wrapper",
         /*tag*/
         i[1].className ? `${/*tag*/
@@ -264,11 +264,6 @@ function nt(i) {
         "top",
         /*top*/
         i[6]
-      ), h(
-        t,
-        "z-index",
-        /*zIndex*/
-        i[5]
       ), d(e, "class", "tag svelte-pzwdws"), d(
         e,
         "data-tag-id",
@@ -294,21 +289,26 @@ function nt(i) {
         "withAnimation",
         /*withAnimation*/
         i[0]
+      ), h(
+        e,
+        "z-index",
+        /*zIndex*/
+        i[5]
       );
     },
     m(n, r) {
-      P(n, e, r), E(e, t), u[o].m(t, null), E(t, m), c[s].m(t, null), l = !0;
+      P(n, e, r), F(e, t), u[o].m(t, null), F(t, m), c[s].m(t, null), l = !0;
     },
     p(n, [r]) {
       let b = o;
-      o = p(n), o === b ? u[o].p(n, r) : (G(), y(u[b], 1, 1, () => {
+      o = p(n), o === b ? u[o].p(n, r) : (H(), y(u[b], 1, 1, () => {
         u[b] = null;
-      }), F(), a = u[o], a ? a.p(n, r) : (a = u[o] = T[o](n), a.c()), v(a, 1), a.m(t, m));
+      }), G(), a = u[o], a ? a.p(n, r) : (a = u[o] = T[o](n), a.c()), v(a, 1), a.m(t, m));
       let k = s;
-      s = A(n), s === k ? c[s].p(n, r) : (G(), y(c[k], 1, 1, () => {
+      s = A(n), s === k ? c[s].p(n, r) : (H(), y(c[k], 1, 1, () => {
         c[k] = null;
-      }), F(), f = c[s], f ? f.p(n, r) : (f = c[s] = z[s](n), f.c()), v(f, 1), f.m(t, null)), (!l || r & /*tag*/
-      2 && g !== (g = B(J(
+      }), G(), f = c[s], f ? f.p(n, r) : (f = c[s] = z[s](n), f.c()), v(f, 1), f.m(t, null)), (!l || r & /*tag*/
+      2 && g !== (g = E(K(
         "wrapper",
         /*tag*/
         n[1].className ? `${/*tag*/
@@ -339,12 +339,6 @@ function nt(i) {
         "top",
         /*top*/
         n[6]
-      ), r & /*zIndex*/
-      32 && h(
-        t,
-        "z-index",
-        /*zIndex*/
-        n[5]
       ), (!l || r & /*id*/
       2048) && d(
         e,
@@ -375,6 +369,12 @@ function nt(i) {
         "withAnimation",
         /*withAnimation*/
         n[0]
+      ), r & /*zIndex*/
+      32 && h(
+        e,
+        "z-index",
+        /*zIndex*/
+        n[5]
       );
     },
     i(n) {
@@ -388,26 +388,26 @@ function nt(i) {
     }
   };
 }
-function at(i, e, t) {
+function pt(i, e, t) {
   let o, a, m, s, f, g, w, l, T, { withAnimation: u = !1 } = e, { tag: p } = e, { mediaStore: z } = e, { state: c } = e, { temporaryState: A } = e;
-  const n = Z("hooks");
+  const n = x("hooks");
   return i.$$set = (r) => {
     "withAnimation" in r && t(0, u = r.withAnimation), "tag" in r && t(1, p = r.tag), "mediaStore" in r && t(2, z = r.mediaStore), "state" in r && t(3, c = r.state), "temporaryState" in r && t(4, A = r.temporaryState);
   }, i.$$.update = () => {
-    var r, b, k, L, I, q, D, R;
+    var r, b, k, I, L, q, D, R, V;
     i.$$.dirty & /*tag*/
     2 && t(13, o = (() => {
-      var V, j;
-      return !(((j = (V = p.style) == null ? void 0 : V.point) == null ? void 0 : j.enabled) === !1 || p.contentType === "Sticker" || p.contentType === "Link" || p.contentType === "VRLink" || p.contentType === "PanoLink" || p.contentType === "Audio" && p.data.appearance === "plane");
+      var j, B;
+      return !(((B = (j = p.style) == null ? void 0 : j.point) == null ? void 0 : B.enabled) === !1 || p.contentType === "Sticker" || p.contentType === "Link" || p.contentType === "VRLink" || p.contentType === "PanoLink" || p.contentType === "Audio" && p.data.appearance === "plane");
     })()), i.$$.dirty & /*tag*/
     2 && t(12, a = (() => p.stickType === "2DPoint")()), i.$$.dirty & /*tag*/
     2 && t(11, m = p.id), i.$$.dirty & /*tag*/
     2 && t(10, s = !((r = p.pointTagStyle) != null && r.leftPercent) || !((b = p.pointTagStyle) != null && b.topPercent) || p.enabled === !1 || !p.state), i.$$.dirty & /*tag*/
-    2 && t(9, f = !((k = p.state) != null && k.visible) || ((L = p.temporaryState) == null ? void 0 : L.visible) === !1), i.$$.dirty & /*tag*/
-    2 && t(8, g = (I = p.state) == null ? void 0 : I.unfolded), i.$$.dirty & /*tag*/
+    2 && t(9, f = !((k = p.state) != null && k.visible) || ((I = p.temporaryState) == null ? void 0 : I.visible) === !1), i.$$.dirty & /*tag*/
+    2 && t(8, g = (L = p.state) == null ? void 0 : L.unfolded), i.$$.dirty & /*tag*/
     2 && t(7, w = ((q = p.pointTagStyle) == null ? void 0 : q.leftPercent) + "%"), i.$$.dirty & /*tag*/
     2 && t(6, l = ((D = p.pointTagStyle) == null ? void 0 : D.topPercent) + "%"), i.$$.dirty & /*tag*/
-    2 && t(5, T = (R = p.state) != null && R.unfolded ? 1 : 0);
+    2 && t(5, T = (R = p.state) != null && R.unfolded ? 99999 : (V = p.zIndex) != null ? V : 0);
   }, [
     u,
     p,
@@ -426,14 +426,14 @@ function at(i, e, t) {
     n
   ];
 }
-class Oe extends Q {
+class Qe extends U {
   constructor(e) {
-    super(), U(
+    super(), W(
       this,
       e,
+      pt,
       at,
-      nt,
-      W,
+      X,
       {
         withAnimation: 0,
         tag: 1,
@@ -441,10 +441,10 @@ class Oe extends Q {
         state: 3,
         temporaryState: 4
       },
-      tt
+      et
     );
   }
 }
 export {
-  Oe as default
+  Qe as default
 };

package/libs/PanoTagPlugin/controller/TagComputer.d.ts

@@ -28,6 +28,7 @@ export declare abstract class TagComputer extends TagUtil {
      */
     getUnfoldedByCamera(tag: TagElement<any, any>): boolean;
     protected sort<T extends Tag<any, any>>(tags: T[]): T[];
+    protected setTagZIndex<T extends TagElement<any, any>>(tags: T[]): void;
     /**
      * @description: 一个点的标签
      */

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,17 +1,17 @@
 var M = Object.defineProperty, U = Object.defineProperties;
-var R = Object.getOwnPropertyDescriptors;
+var D = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
-var B = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
+var R = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
 var g = (c, l, e) => l in c ? M(c, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[l] = e, x = (c, l) => {
   for (var e in l || (l = {}))
-    B.call(l, e) && g(c, e, l[e]);
+    R.call(l, e) && g(c, e, l[e]);
   if (P)
     for (var e of P(l))
-      C.call(l, e) && g(c, e, l[e]);
+      B.call(l, e) && g(c, e, l[e]);
   return c;
-}, I = (c, l) => U(c, R(l));
+}, I = (c, l) => U(c, D(l));
 var T = (c, l, e) => (g(c, typeof l != "symbol" ? l + "" : l, e), e);
-import * as D from "three";
+import * as C from "three";
 import { is3DTag as j, isMediaModelTag as y } from "../utils/tag/tagCheck.js";
 import { tagPosition as V, getTagPosition as k } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.js";
@@ -58,17 +58,17 @@ import "../../shared-utils/threex/domevents/index.js";
 class Ue extends $ {
   constructor(e) {
     super(e);
-    T(this, "raycaster", new D.Raycaster());
+    T(this, "raycaster", new C.Raycaster());
   }
   /**
    * @description: 获取是否可见
    */
   getVisibleByPanoIndex(e, t) {
-    const s = this.getCache({ panoIndex: t, id: e.id }), n = t != null ? t : this.five.getCurrentState().panoIndex;
+    const n = this.getCache({ panoIndex: t, id: e.id }), s = t != null ? t : this.five.getCurrentState().panoIndex;
     if (e.stickType === "Model")
       return !0;
-    if (s.visible !== void 0)
-      return s.visible;
+    if (n.visible !== void 0)
+      return n.visible;
     {
       const i = (() => {
         var d, u, v;
@@ -79,16 +79,16 @@ class Ue extends $ {
           return { value: !1, reason: "config.keep is hidden" };
         if (o.keep === "visible")
           return { value: !0, reason: "config.keep is visible" };
-        if (o.visiblePanoIndex !== void 0 && o.visiblePanoIndex !== "all" && n !== void 0) {
-          if (Array.isArray(o.visiblePanoIndex) && !o.visiblePanoIndex.includes(n))
+        if (o.visiblePanoIndex !== void 0 && o.visiblePanoIndex !== "all" && s !== void 0) {
+          if (Array.isArray(o.visiblePanoIndex) && !o.visiblePanoIndex.includes(s))
             return {
               value: !1,
-              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${n}, visiblePanoIndex: ${o.visiblePanoIndex}`
+              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${s}, visiblePanoIndex: ${o.visiblePanoIndex}`
             };
-          if (o.visiblePanoIndex === "current" && n !== ((u = e.fiveState) == null ? void 0 : u.panoIndex))
+          if (o.visiblePanoIndex === "current" && s !== ((u = e.fiveState) == null ? void 0 : u.panoIndex))
             return {
               value: !1,
-              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${n}, tag.panoIndex: ${(v = e.fiveState) == null ? void 0 : v.panoIndex}`
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${s}, tag.panoIndex: ${(v = e.fiveState) == null ? void 0 : v.panoIndex}`
             };
         }
         if (o.visibleDistance !== void 0 && o.visibleDistance !== "unLimited" && h(f, o.visibleDistance) === !1)
@@ -97,12 +97,12 @@ class Ue extends $ {
             reason: `distance is not in visibleDistance. distance: ${f}, visibleDistance: ${o.visibleDistance}`
           };
         if (o.intersectRaycaster !== !1 && (typeof o.intersectRaycaster != "object" || o.intersectRaycaster.enabled !== !1)) {
-          if (n === void 0)
+          if (s === void 0)
             return {
               value: !1,
-              reason: `intersectRaycaster check failed: fivePanoIndex is ${n}`
+              reason: `intersectRaycaster check failed: fivePanoIndex is ${s}`
             };
-          const r = this.getRaycasterFromPanoIndex(e, n);
+          const r = this.getRaycasterFromPanoIndex(e, s);
           if (!r)
             return { value: !1, reason: `intersectRaycaster check failed: raycaster is ${r}` };
           const a = this.getTagEnableByIntersect(e, r);
@@ -119,19 +119,19 @@ class Ue extends $ {
           reason: "all check passed"
         };
       })();
-      return s.visible = i.value, s.__debug_visible_reason__ = i, s.visible;
+      return n.visible = i.value, n.__debug_visible_reason__ = i, n.visible;
     }
   }
   getVisibleByFiveMode(e, t) {
-    const s = t != null ? t : this.five.getCurrentState().mode, n = this.getTagConfig(e).visibleConfig;
-    if (n) {
-      if (typeof n == "object") {
-        const i = n == null ? void 0 : n.visibleFiveMode;
-        return i ? i != null && i.includes(s) ? n.followModelVisibility === !0 && (s === "Floorplan" || s === "Mapview") ? this.getVisibleByFloorIndex(e) : !0 : !1 : s === "Panorama";
-      } else if (typeof n == "function")
+    const n = t != null ? t : this.five.getCurrentState().mode, s = this.getTagConfig(e).visibleConfig;
+    if (s) {
+      if (typeof s == "object") {
+        const i = s == null ? void 0 : s.visibleFiveMode;
+        return i ? i != null && i.includes(n) ? s.followModelVisibility === !0 && (n === "Floorplan" || n === "Mapview") ? this.getVisibleByFloorIndex(e) : !0 : !1 : n === "Panorama";
+      } else if (typeof s == "function")
         return t === "Panorama";
     } else
-      return s === "Panorama";
+      return n === "Panorama";
   }
   /**
    * @description 获取标签当前状态
@@ -142,21 +142,21 @@ class Ue extends $ {
     return (t = this.state.visible && e.state.visible) != null ? t : !0;
   }
   getVisible(e) {
-    const t = this.five.getCurrentState(), s = this.getVisibleByFiveMode(e), n = t.mode === "Panorama" ? this.getVisibleByPanoIndex(e, t.panoIndex) : !0;
-    return s && n;
+    const t = this.five.getCurrentState(), n = this.getVisibleByFiveMode(e), s = t.mode === "Panorama" ? this.getVisibleByPanoIndex(e, t.panoIndex) : !0;
+    return n && s;
   }
   /** 获取当前点位上模型中的多媒体是否应该展示 */
   getModelMedialVisibleByPanoIndex(e) {
     if (!this.getCurrentVisibleState(e))
       return !1;
-    const t = this.five.getCurrentState().panoIndex, s = this.getCache({ panoIndex: t, id: e.id });
-    if (s.modelMedialVisible !== void 0)
-      return s.modelMedialVisible;
-    const n = this.getRaycasterFromPanoIndex(e, t);
-    if (!n)
+    const t = this.five.getCurrentState().panoIndex, n = this.getCache({ panoIndex: t, id: e.id });
+    if (n.modelMedialVisible !== void 0)
+      return n.modelMedialVisible;
+    const s = this.getRaycasterFromPanoIndex(e, t);
+    if (!s)
       return !1;
-    const i = this.getTagEnableByIntersect(e, n);
-    return s.modelMedialVisible = i.value, s.__debug_visible_reason__ = i, i.value !== !1;
+    const i = this.getTagEnableByIntersect(e, s);
+    return n.modelMedialVisible = i.value, n.__debug_visible_reason__ = i, i.value !== !1;
   }
   /**
    * @description: 获取是否展开
@@ -164,9 +164,9 @@ class Ue extends $ {
   getUnfoldedByPanoIndex(e, t) {
     if (!this.getVisibleByPanoIndex(e))
       return;
-    const n = this.getCache({ panoIndex: t, id: e.id });
-    if (n.unfolded !== void 0)
-      return n.unfolded;
+    const s = this.getCache({ panoIndex: t, id: e.id });
+    if (s.unfolded !== void 0)
+      return s.unfolded;
     {
       const i = this.getTagConfig(e).unfoldedConfig;
       if (!i)
@@ -182,9 +182,9 @@ class Ue extends $ {
         if (i.unfoldDistance && h(d, i.unfoldDistance) === !1)
           return !1;
       })();
-      n.unfolded = o;
+      s.unfolded = o;
       const f = this.getUnfoldedByCamera(e);
-      return f !== void 0 ? f : n.unfolded;
+      return f !== void 0 ? f : s.unfolded;
     }
   }
   /**
@@ -193,10 +193,10 @@ class Ue extends $ {
   getUnfoldedByCamera(e) {
     return this.getVisible(e) ? (() => {
       var o;
-      const n = this.getDistance(e), i = this.getTagConfig(e).unfoldedConfig;
+      const s = this.getDistance(e), i = this.getTagConfig(e).unfoldedConfig;
       if (i) {
         if (typeof i == "function")
-          return i(this.five, { tag: e, distance: n });
+          return i(this.five, { tag: e, distance: s });
         if (i.keep === "folded")
           return !1;
         if (i.keep === "unfolded")
@@ -230,9 +230,15 @@ class Ue extends $ {
     })() : void 0;
   }
   sort(e) {
-    return e.sort((t, s) => {
-      const n = this.getDistance(t), i = this.getDistance(s);
-      return n === void 0 || i === void 0 ? 0 : i - n;
+    return e.sort((t, n) => {
+      const s = this.getDistance(t), i = this.getDistance(n);
+      return s === void 0 || i === void 0 ? 0 : i - s;
+    });
+  }
+  setTagZIndex(e) {
+    return e.forEach((t) => {
+      const n = this.getDistance(t);
+      t.zIndex = Math.round((n != null ? n : 0) * 100);
     });
   }
   /**
@@ -241,17 +247,17 @@ class Ue extends $ {
   setPointTagPosition() {
     const e = this.filterPointTag;
     e.length !== 0 && e.forEach((t) => {
-      var n;
-      if (!((n = t.state) != null && n.visible)) {
+      var s;
+      if (!((s = t.state) != null && s.visible)) {
         t.pointTagStyle = null;
         return;
       }
-      const s = this.getTagProject(t);
-      if (!s) {
+      const n = this.getTagProject(t);
+      if (!n) {
         t.pointTagStyle = null;
         return;
       }
-      t.pointTagStyle = { leftPercent: (s.x + 1) / 2 * 100, topPercent: (-s.y + 1) / 2 * 100 };
+      t.pointTagStyle = { leftPercent: (n.x + 1) / 2 * 100, topPercent: (-n.y + 1) / 2 * 100 };
     });
   }
   setVisible() {
@@ -269,23 +275,23 @@ class Ue extends $ {
   setModelMedialVisible() {
     const e = this.five.getCurrentState().mode;
     this.tags.forEach((t) => {
-      var n;
+      var s;
       if (!y(t))
         return;
-      if (!((n = t.model) != null && n.object)) {
+      if (!((s = t.model) != null && s.object)) {
         t.mediaVisible = !1;
         return;
       }
-      const s = e === "Panorama" ? this.getModelMedialVisibleByPanoIndex(t) : !0;
-      t.mediaVisible = s;
+      const n = e === "Panorama" ? this.getModelMedialVisibleByPanoIndex(t) : !0;
+      t.mediaVisible = n;
     });
   }
   setUnfoldedByPanoIndex() {
     this.tags.forEach((e) => {
       const t = this.getUnfoldedByPanoIndex(e);
       if (e.state && (t !== void 0 && (e.state.unfolded = t), t && !e.state.visible)) {
-        const s = this.getTagConfig(e);
-        typeof s.unfoldedConfig == "object" && s.unfoldedConfig.autoFoldWhenHide !== !1 && (e.state.unfolded = !1);
+        const n = this.getTagConfig(e);
+        typeof n.unfoldedConfig == "object" && n.unfoldedConfig.autoFoldWhenHide !== !1 && (e.state.unfolded = !1);
       }
     });
   }
@@ -295,17 +301,17 @@ class Ue extends $ {
   getTagProject(e) {
     if (!this.getVisible(e))
       return;
-    const s = V(e.position);
-    if (!s)
+    const n = V(e.position);
+    if (!n)
       return;
-    const { x: n, y: i, z: o } = s.project(this.five.camera);
+    const { x: s, y: i, z: o } = n.project(this.five.camera);
     if (!(o > 1))
-      return { x: n, y: i, z: o };
+      return { x: s, y: i, z: o };
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, t) {
     var u, v, r;
-    const s = (u = this.getTagConfig(e).visibleConfig) != null ? u : {}, n = this.getDistance(e), [i] = this.five.model.intersectRaycaster(t), o = (() => {
+    const n = (u = this.getTagConfig(e).visibleConfig) != null ? u : {}, s = this.getDistance(e), [i] = this.five.model.intersectRaycaster(t), o = (() => {
       if (!y(e))
         return;
       const a = this.tags.filter(y).map((b) => {
@@ -315,34 +321,34 @@ class Ue extends $ {
       return t.intersectObjects(a, !0)[0];
     })(), f = (() => {
       var a;
-      return typeof s == "object" && typeof s.intersectRaycaster == "object" && (a = s.intersectRaycaster.distanceAccuracy) != null ? a : 0.01;
+      return typeof n == "object" && typeof n.intersectRaycaster == "object" && (a = n.intersectRaycaster.distanceAccuracy) != null ? a : 0.01;
     })(), d = Math.min((v = i == null ? void 0 : i.distance) != null ? v : 1 / 0, (r = o == null ? void 0 : o.distance) != null ? r : 1 / 0);
-    return d + f < n ? {
+    return d + f < s ? {
       value: !1,
-      reason: `intersectRaycaster check failed: distance is ${n}, intersection.distance is ${i == null ? void 0 : i.distance}, intersection.point is ${i == null ? void 0 : i.point.toArray()},
+      reason: `intersectRaycaster check failed: distance is ${s}, intersection.distance is ${i == null ? void 0 : i.distance}, intersection.point is ${i == null ? void 0 : i.point.toArray()},
         customModelIntersection.point is ${o == null ? void 0 : o.point.toArray()}, minIntersectionDistance is ${d}`
     } : { value: !0, reason: "" };
   }
   /** 获取点位看向标签的射线 */
   getRaycasterFromPanoIndex(e, t) {
     var o;
-    const s = (o = this.five.work.observers[t]) == null ? void 0 : o.position;
-    if (s === void 0)
-      throw new Error(`getVisible(): observerPosition is ${s}`);
-    const n = V(e.position);
-    if (!n)
+    const n = (o = this.five.work.observers[t]) == null ? void 0 : o.position;
+    if (n === void 0)
+      throw new Error(`getVisible(): observerPosition is ${n}`);
+    const s = V(e.position);
+    if (!s)
       return;
-    const i = n.sub(s).normalize();
-    return this.raycaster.set(s, i), this.raycaster;
+    const i = s.sub(n).normalize();
+    return this.raycaster.set(n, i), this.raycaster;
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
     var i, o, f, d, u, v, r;
     let t = 0;
-    const s = (i = e.fiveState) == null ? void 0 : i.panoIndex;
-    s !== void 0 ? t = (o = this.five.work.observers[s]) == null ? void 0 : o.floorIndex : t = E(this.five.work.observers, (r = (v = (d = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : d.position) != null ? v : (u = e.mediaPlane) == null ? void 0 : u.position) != null ? r : k(e));
-    const n = this.five.model.shownFloor;
-    return n === null || n === t;
+    const n = (i = e.fiveState) == null ? void 0 : i.panoIndex;
+    n !== void 0 ? t = (o = this.five.work.observers[n]) == null ? void 0 : o.floorIndex : t = E(this.five.work.observers, (r = (v = (d = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : d.position) != null ? v : (u = e.mediaPlane) == null ? void 0 : u.position) != null ? r : k(e));
+    const s = this.five.model.shownFloor;
+    return s === null || s === t;
   }
 }
 export {

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -22,8 +22,8 @@ import { Group as S, Quaternion as O, Vector3 as v, Matrix4 as D } from "three";
 import x from "../Components/TagContainer.js";
 import A from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as y } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as P, isStickModelTag as I } from "../utils/tag/tagCheck.js";
+import { centerPoint as I } from "../../shared-utils/three/centerPoint.js";
+import { isMediaModelTag as P, isStickModelTag as G } from "../utils/tag/tagCheck.js";
 import { CSS3DRenderPlugin as V } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
 import { VideoPlane as j, ImagePlane as R } from "../utils/model/mediaPlane.js";
@@ -336,7 +336,7 @@ class ti extends w {
       return;
     const n = P(t) ? t.data.mediaPosition : t.position;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new v().fromArray(n[0]), s = new v().fromArray(n[2]), u = G(r, s).add(new v(0, 0, 5e-4)), p = new D().setPosition(u), m = new D().makeScale(o, o, o), l = new D().multiply(a).multiply(p).multiply(m);
+    const a = e.matrixWorld, r = new v().fromArray(n[0]), s = new v().fromArray(n[2]), u = I(r, s).add(new v(0, 0, 5e-4)), p = new D().setPosition(u), m = new D().makeScale(o, o, o), l = new D().multiply(a).multiply(p).multiply(m);
     l.decompose(i.position, i.quaternion, i.scale);
     const c = i.opacityMesh;
     c && l.decompose(c.position, c.quaternion, c.scale);
@@ -344,7 +344,7 @@ class ti extends w {
   /** 添加模型标签 */
   addMediaModelTag(t) {
     return C(this, null, function* () {
-      const e = t.filter(I).map((o) => this.loadModel(o));
+      const e = t.filter(G).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
@@ -353,8 +353,8 @@ class ti extends w {
    */
   updateRenderPointTag() {
     var e;
-    const t = this.sort(this.filterPointTag);
-    if (this.setPointTagPosition(), this.TagContainerSvelte)
+    const t = this.filterPointTag;
+    if (this.setTagZIndex(t), this.setPointTagPosition(), this.TagContainerSvelte)
       this.TagContainerSvelte.$set({ tags: t, state: this.state, temporaryState: this.temporaryState });
     else {
       const o = (e = this.five.getElement()) == null ? void 0 : e.parentElement;

package/libs/PanoTagPlugin/controller/index.js

@@ -199,7 +199,7 @@ class ci extends N {
   load(e, t) {
     return f(this, null, function* () {
       var s, o;
-      this.clearTags(), console.info(M, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
+      this.clearTags(), console.debug(M, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });

package/libs/PanoTagPlugin/typings/controller.d.ts

@@ -87,6 +87,7 @@ export type TagElement<C extends TagContentType = TagContentType, S extends Stic
         leftPercent: number;
         topPercent: number;
     } | null;
+    zIndex?: number;
     temporaryState: {
         visible: boolean;
     };