@realsee/dnalogel 2.20.0-dev.1 → 2.20.0-dev.10

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,19 +1,19 @@
 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 = (d, l, e) => l in d ? M(d, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[l] = e, x = (d, l) => {
   for (var e in l || (l = {}))
-    B.call(l, e) && g(d, e, l[e]);
+    R.call(l, e) && g(d, e, l[e]);
   if (P)
     for (var e of P(l))
-      C.call(l, e) && g(d, e, l[e]);
+      B.call(l, e) && g(d, e, l[e]);
   return d;
-}, I = (d, l) => U(d, R(l));
-var V = (d, l, e) => (g(d, typeof l != "symbol" ? l + "" : l, e), e);
-import * as D from "three";
+}, I = (d, l) => U(d, D(l));
+var T = (d, l, e) => (g(d, typeof l != "symbol" ? l + "" : l, e), e);
+import * as C from "three";
 import { is3DTag as j, isMediaModelTag as y } from "../utils/tag/tagCheck.js";
-import { tagPosition as T, getTagPosition as k } from "../utils/tagPosition.js";
+import { tagPosition as V, getTagPosition as k } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.js";
 import "hammerjs";
 import "@realsee/five";
@@ -58,17 +58,17 @@ import "../../shared-utils/threex/domevents/index.js";
 class Ue extends S {
   constructor(e) {
     super(e);
-    V(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 c, u, v;
@@ -79,16 +79,16 @@ class Ue extends S {
           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 S {
             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 S {
           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 S {
     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 S {
   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 S {
         if (i.unfoldDistance && h(c, 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 S {
   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 S {
     })() : 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 S {
   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.screenPosition = null;
         return;
       }
-      const s = this.getTagProject(t);
-      if (!s) {
+      const n = this.getTagProject(t);
+      if (!n) {
         t.screenPosition = null;
         return;
       }
-      t.screenPosition = { leftPercent: (s.x + 1) / 2 * 100, topPercent: (-s.y + 1) / 2 * 100 };
+      t.screenPosition = { leftPercent: (n.x + 1) / 2 * 100, topPercent: (-n.y + 1) / 2 * 100 };
     });
   }
   setVisible() {
@@ -269,23 +275,23 @@ class Ue extends S {
   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 S {
   getTagProject(e) {
     if (!this.getVisible(e))
       return;
-    const s = T(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 S {
       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;
     })(), c = 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 c + f < n ? {
+    return c + 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 ${c}`
     } : { 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 = T(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, c, 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 = (c = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : c.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 = (c = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : c.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.d.ts

@@ -1,11 +1,12 @@
 import { TagComputer } from './TagComputer';
-import type { Tag, TagInstance, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup, TagContentType } from '../typings';
+import type { Tag, TagInstance, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup, TagContentType, ElementRenderer, TagRendererMap } from '../typings';
 import type { TemporaryState } from '../typings';
 import { type Object3D } from 'three';
 import TagContainerSvelte from '../Components/TagContainer.svelte';
 import type { Five } from '@realsee/five';
 export declare abstract class TagRender extends TagComputer {
     protected group: TagObjectGroup;
+    protected renderMap: TagRendererMap;
     protected imagePlaneGroup: ImagePlaneGroup;
     protected gltfObjectGroup: TagGLTFObjectGroup;
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
@@ -15,6 +16,15 @@ export declare abstract class TagRender extends TagComputer {
     /** 点标签 */
     protected TagContainerSvelte?: TagContainerSvelte;
     constructor(five: Five);
+    /**
+     * @description: 设置 contentType 的渲染器
+     * @param {string} contentType
+     * 如果是 `TagContentType` 中的类型，将会覆盖掉插件内部默认的渲染器,
+     * 如果是其他任意 str
+     * ing 如：'Foo'，则可以将类似 `{id: 1, contentType: 'Foo', position: [0,0,0]}` 的 tag 交给插件渲染
+     * @note 优先级低于 tag.element
+     */
+    registerRenderer(contentType: string, renderer: ElementRenderer): void;
     clearTags(): void;
     /**
      * @description: 更新所有标签

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,7 +1,7 @@
 var R = Object.defineProperty;
-var k = (f, h, t) => h in f ? R(f, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[h] = t;
-var b = (f, h, t) => (k(f, typeof h != "symbol" ? h + "" : h, t), t);
-var C = (f, h, t) => new Promise((e, o) => {
+var k = (b, h, t) => h in b ? R(b, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : b[h] = t;
+var f = (b, h, t) => (k(b, typeof h != "symbol" ? h + "" : h, t), t);
+var C = (b, h, t) => new Promise((e, o) => {
   var i = (r) => {
     try {
       a(t.next(r));
@@ -15,16 +15,16 @@ var C = (f, h, t) => new Promise((e, o) => {
       o(s);
     }
   }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, n);
-  a((t = t.apply(f, h)).next());
+  a((t = t.apply(b, h)).next());
 });
-import { TagComputer as E } from "./TagComputer.js";
-import { Group as S, Quaternion as w, Vector3 as v, Matrix4 as D } from "three";
+import { TagComputer as w } from "./TagComputer.js";
+import { Group as S, Quaternion as E, Vector3 as v, Matrix4 as D } from "three";
 import O from "../Components/TagContainer.js";
 import A from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as y } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { centerPoint as x } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as P, isStickModelTag as G } from "../utils/tag/tagCheck.js";
-import { CSS3DRenderPlugin as I } from "../../CSS3DRenderPlugin/index.js";
+import { isMediaModelTag as P, isStickModelTag as I } from "../utils/tag/tagCheck.js";
+import { CSS3DRenderPlugin as G } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as V } from "../../shared-utils/three/GLTFLoader.js";
 import { VideoPlane as M, ImagePlane as j } from "../utils/model/mediaPlane.js";
 import "../utils/tagPosition.js";
@@ -140,20 +140,21 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const F = /* @__PURE__ */ new Map(), L = /* @__PURE__ */ new Map();
-class ei extends E {
+class ei extends w {
   constructor(t) {
     super(t);
-    b(this, "group", new S());
-    b(this, "imagePlaneGroup", new S());
-    b(this, "gltfObjectGroup", new S());
+    f(this, "group", new S());
+    f(this, "renderMap", /* @__PURE__ */ new Map());
+    f(this, "imagePlaneGroup", new S());
+    f(this, "gltfObjectGroup", new S());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
-    b(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    f(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
-    b(this, "temporaryState", { visible: !0 });
+    f(this, "temporaryState", { visible: !0 });
     /** 点标签 */
-    b(this, "TagContainerSvelte");
+    f(this, "TagContainerSvelte");
     /** 加载外部模型 */
-    b(this, "loadModel", (t) => C(this, null, function* () {
+    f(this, "loadModel", (t) => C(this, null, function* () {
       var a;
       const e = t.data.modelUrl;
       if (!e)
@@ -190,6 +191,17 @@ class ei extends E {
     }));
     this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.imagePlaneGroup.name = "ImagePlaneGroup", this.group.add(this.gltfObjectGroup), this.group.add(this.imagePlaneGroup);
   }
+  /**
+   * @description: 设置 contentType 的渲染器
+   * @param {string} contentType
+   * 如果是 `TagContentType` 中的类型，将会覆盖掉插件内部默认的渲染器,
+   * 如果是其他任意 str
+   * ing 如：'Foo'，则可以将类似 `{id: 1, contentType: 'Foo', position: [0,0,0]}` 的 tag 交给插件渲染
+   * @note 优先级低于 tag.element
+   */
+  registerRenderer(t, e) {
+    this.renderMap.set(t, { renderer: e });
+  }
   clearTags() {
     this.tags.forEach((t) => {
       var e, o;
@@ -246,14 +258,14 @@ class ei extends E {
       if (e.tag3DContentSvelte) {
         const { svelteApp: r, css3DInstance: s, initialNormal: u, currentNormal: p } = e.tag3DContentSvelte;
         if (r.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !u.equals(p)) {
-          const m = new w().setFromUnitVectors(u, p);
+          const m = new E().setFromUnitVectors(u, p);
           s.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
         if (P(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
           return;
-        if (this.css3DRenderPlugin || (this.css3DRenderPlugin = I(this.five)), e.stickType === "3DPoint" && !e.normal)
+        if (this.css3DRenderPlugin || (this.css3DRenderPlugin = G(this.five)), e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
         const r = this.getPositions(e);
         if (!r)
@@ -346,7 +358,7 @@ class ei extends E {
   /** 添加模型标签 */
   addMediaModelTag(t) {
     return C(this, null, function* () {
-      const e = t.filter(G).map((o) => this.loadModel(o));
+      const e = t.filter(I).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
@@ -355,8 +367,8 @@ class ei extends E {
    */
   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;
@@ -364,7 +376,14 @@ class ei extends E {
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
       this.TagContainerSvelte = new O({
         target: o,
-        props: { hooks: this.hooks, tags: t, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
+        props: {
+          hooks: this.hooks,
+          tags: t,
+          state: this.state,
+          temporaryState: this.temporaryState,
+          mediaStore: this.mediaStore,
+          renderMap: this.renderMap
+        }
       });
     }
   }

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -6,7 +6,7 @@ import * as P from "three";
 import { DefaultConfig as C } from "../tag.config.js";
 import { anyPositionToVector3 as w, arrayPositionToVector3 as h } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { planeNormal as p } from "../utils/planeNormal.js";
-import { tagPosition as E, getTagPosition as M } from "../utils/tagPosition.js";
+import { tagPosition as M, getTagPosition as E } from "../utils/tagPosition.js";
 import { normalPositionToPositions as k } from "../utils/normalPositionToPositions.js";
 import { TagCache as b } from "./TagCache.js";
 import { writable as I } from "../../vendor/svelte/store/index.js";
@@ -112,7 +112,7 @@ class Pe extends b {
       }
       if (f.length === 2) {
         const [s = "Any", n = "Any"] = f;
-        (e.stickType === s || s === "Any") && (e.contentType === n || n === "Any") && (i[r] = this.config.contentTypeConfig[r]);
+        s === "Mixin" && e.contentType === n && (i[r] = this.config.contentTypeConfig[r]), (e.stickType === s || s === "Any") && (e.contentType === n || n === "Any") && (i[r] = this.config.contentTypeConfig[r]);
       }
       if (f.length === 3) {
         const [s = "Any", n, m] = f;
@@ -188,7 +188,7 @@ class Pe extends b {
       const f = (() => e.stickType === "3DPoint" ? w(e.normal) : p(e.position))();
       if (!f)
         return;
-      const s = E(e.position);
+      const s = M(e.position);
       if (!s)
         return;
       const n = new P.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
@@ -210,7 +210,7 @@ class Pe extends b {
       const r = (a = (d = this.five.work) == null ? void 0 : d.observers[t]) == null ? void 0 : a.position;
       if (r === void 0)
         throw new Error(`getDistance(): observerPosition is ${r}`);
-      const f = M(e);
+      const f = E(e);
       if (!f)
         return -1;
       const s = r.distanceTo(f);

package/libs/PanoTagPlugin/controller/index.js

@@ -10,7 +10,7 @@ var v = (h, a, e) => a in h ? E(h, a, { enumerable: !0, configurable: !0, writab
       I.call(a, e) && v(h, e, a[e]);
   return h;
 }, u = (h, a) => F(h, w(a));
-var g = (h, a, e) => (v(h, typeof a != "symbol" ? a + "" : a, e), e);
+var m = (h, a, e) => (v(h, typeof a != "symbol" ? a + "" : a, e), e);
 var p = (h, a, e) => new Promise((t, i) => {
   var s = (r) => {
     try {
@@ -33,9 +33,9 @@ import { objectAssignDeepExports as c } from "../../vendor/object-assign-deep/ob
 import { arrayPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { addDebugPoints as R } from "../utils/addDebugPoints.js";
 import { isMediaModelTag as y, isModelTag as O } from "../utils/tag/tagCheck.js";
-import { waitFiveModelLoaded as _ } from "../utils/actionAfterFiveModelLoad.js";
+import { waitFiveModelLoaded as k } from "../utils/actionAfterFiveModelLoad.js";
 import { debounce as D } from "../utils/debounce.js";
-import { throttle as k } from "../utils/throttle.js";
+import { throttle as _ } from "../utils/throttle.js";
 import { resizeObserver as S } from "../utils/resizeObserver.js";
 import L from "../utils/tag/format.js";
 import { generateBlankAudio as G, AudioNamespace as V } from "../../shared-utils/audio.js";
@@ -163,23 +163,23 @@ class ci extends N {
   constructor(e, t) {
     super(e);
     /** state */
-    g(this, "state", { enabled: !0, visible: !0 });
+    m(this, "state", { enabled: !0, visible: !0 });
     /** 插件参数 */
-    g(this, "params");
+    m(this, "params");
     /** debug */
-    g(this, "debug");
+    m(this, "debug");
     /** 更改 tag 模型 */
-    g(this, "changeTagModel", (e, t) => p(this, null, function* () {
+    m(this, "changeTagModel", (e, t) => p(this, null, function* () {
       e.data = c({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
-    g(this, "handleFiveInitAnimationEnded", () => {
+    m(this, "handleFiveInitAnimationEnded", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
         y(t) && e === "Panorama" && this.changeTagMode(t, "front"), t.state.visible = this.getVisible(t);
       }), this.updateRenderAllTags();
     });
     /** 楼层切换时，需要更新标签可见性 */
-    g(this, "handleFiveModelShownFloorChange", () => {
+    m(this, "handleFiveModelShownFloorChange", () => {
       this.tags.forEach((e) => {
         var i, s;
         const t = this.getTagConfig(e).visibleConfig;
@@ -236,10 +236,11 @@ class ci extends N {
           fold: () => this.changeUnfoldedById(o.id, !1),
           enable: () => this.changeEnabledById(o.id, !0),
           disable: () => this.changeEnabledById(o.id, !1),
-          destroy: () => this.destroyTagById(o.id)
+          destroy: () => this.destroyTagById(o.id),
+          changeData: (g) => this.changeDataById(o.id, g)
         });
       }).filter((o) => o.position);
-      return s.forEach(L), this.tags.push(...s), _(this.five).then(() => p(this, null, function* () {
+      return s.forEach(L), this.tags.push(...s), k(this.five).then(() => p(this, null, function* () {
         var o, n, r;
         this.store.eventListenerDisposer && ((n = (o = this.store).eventListenerDisposer) == null || n.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(s);
       }));
@@ -336,7 +337,8 @@ class ci extends N {
    */
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
-    s && (i ? s.data = c({}, s.data, t) : s.data = f(f({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags());
+    let o = !1;
+    s && (s.data && (o = !0), i ? s.data = c({}, s.data, t) : s.data = f(f({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 改变tag的stickType
@@ -349,7 +351,8 @@ class ci extends N {
    */
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
-    t && (i ? c(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
+    let o = !1;
+    t && (t.data && (o = !0), i ? c(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 销毁tag
@@ -396,8 +399,8 @@ class ci extends N {
    * @description: 添加 cameraUpdate, panoArrived 等事件监听
    */
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), l = this.clickhandler.bind(this), m = this.five.currentMode;
-    return m && this.handleFiveModeChange(m), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", d), t.on("click", l), () => {
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), l = this.clickhandler.bind(this), g = this.five.currentMode;
+    return g && this.handleFiveModeChange(g), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", d), t.on("click", l), () => {
       e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", n), e.off("panoArrived", r), e.off("panoArrived", d), t.off("click", l), this.store.eventListenerDisposer = void 0;
     };
   }
@@ -417,7 +420,7 @@ class ci extends N {
     }, i = () => {
       this.state.enabled && this.hide();
     }, { observe: s, unobserve: o } = S(
-      k(() => {
+      _(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
@@ -493,10 +496,10 @@ class ci extends N {
         o.position.copy(n.position), o.quaternion.copy(n.quaternion);
         const r = this.five.camera.position;
         o.lookAt(r.clone().setY(o.position.y));
-        const d = n.quaternion.clone(), l = o.quaternion.clone(), m = x();
-        m.onUpdate(({ progress: P }) => {
+        const d = n.quaternion.clone(), l = o.quaternion.clone(), g = x();
+        g.onUpdate(({ progress: P }) => {
           n.quaternion.copy(d.clone().slerp(l, P));
-        }), m.play();
+        }), g.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     });
   }