@realsee/dnalogel 3.31.1 → 3.32.0-dev.0

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,12 +1,12 @@
 var A = Object.defineProperty;
 var R = Object.getOwnPropertySymbols;
-var k = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var k = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
 var C = (d, m, t) => m in d ? A(d, m, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[m] = t, j = (d, m) => {
   for (var t in m || (m = {}))
     k.call(m, t) && C(d, t, m[t]);
   if (R)
     for (var t of R(m))
-      E.call(m, t) && C(d, t, m[t]);
+      I.call(m, t) && C(d, t, m[t]);
   return d;
 };
 var u = (d, m, t) => (C(d, typeof m != "symbol" ? m + "" : m, t), t);
@@ -26,9 +26,9 @@ var S = (d, m, t) => new Promise((e, o) => {
   }, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(i, r);
   a((t = t.apply(d, m)).next());
 });
-import { TagComputer as I } from "./TagComputer.js";
-import { Group as y, Quaternion as V, Vector3 as b, Matrix4 as v } from "three";
-import O from "../Components/TagContainer.js";
+import { TagComputer as V } from "./TagComputer.js";
+import { Group as y, Quaternion as O, Vector3 as b, Matrix4 as v } from "three";
+import E from "../Components/TagContainer.js";
 import x from "../Components/Tag/index.js";
 import { CSS3DRenderPlugin as G } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
@@ -67,8 +67,8 @@ import "../utils/normalPositionToPositions.js";
 import "./TagCache.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/url/absoluteUrl.js";
-import "../../vendor/svelte/store/index.js";
-import "../../vendor/svelte/internal/index.js";
+import "../../vendor/svelte/src/runtime/store/index.js";
+import "../../vendor/svelte/src/runtime/internal/utils.js";
 import "../../shared-utils/device.js";
 import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
@@ -88,13 +88,25 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
+import "../../vendor/svelte/src/runtime/internal/dom.js";
+import "../../vendor/svelte/src/runtime/internal/transitions.js";
+import "../../vendor/svelte/src/runtime/internal/environment.js";
+import "../../vendor/svelte/src/runtime/internal/loop.js";
+import "../../vendor/svelte/src/runtime/internal/style_manager.js";
+import "../../vendor/svelte/src/runtime/internal/scheduler.js";
+import "../../vendor/svelte/src/runtime/internal/lifecycle.js";
+import "../../vendor/svelte/src/runtime/internal/each.js";
+import "../../vendor/svelte/src/runtime/internal/Component.js";
+import "../../vendor/svelte/src/runtime/internal/disclose-version/index.js";
+import "../../vendor/svelte/src/shared/version.js";
 import "../Components/TagItem.js";
 import "../utils/noTypecheck.js";
 import "../Components/Common/TagPoint.js";
 import "../Components/Common/Shadow.js";
-import "../../vendor/svelte/transition/index.js";
-import "../../vendor/svelte/easing/index.js";
+import "../../vendor/svelte/src/runtime/transition/index.js";
+import "../../vendor/svelte/src/runtime/easing/index.js";
 import "../Components/Common/Icon/Icon.js";
+import "../../vendor/svelte/src/runtime/internal/await_block.js";
 import "../utils/getImageInfo.js";
 import "../utils/px2rem.js";
 import "../../vendor/classnames/index.js";
@@ -115,6 +127,7 @@ import "../Components/Common/Text/MText.js";
 import "../Components/Tag/ImageTextTag.js";
 import "../Components/Common/Line/Polyline.js";
 import "../Components/Common/Media.js";
+import "../../vendor/svelte/src/runtime/internal/spread.js";
 import "../../vendor/svelte-carousel/src/components/Carousel/Carousel.js";
 import "../../vendor/svelte-carousel/src/components/Dots/Dots.js";
 import "../../vendor/svelte-carousel/src/components/Dot/Dot.js";
@@ -162,7 +175,7 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const q = /* @__PURE__ */ new Map(), $ = /* @__PURE__ */ new Map();
-class Ti extends I {
+class ki extends V {
   constructor(t) {
     super(t);
     u(this, "rendererMap", /* @__PURE__ */ new Map());
@@ -184,7 +197,7 @@ class Ti extends I {
         return;
       t.loading = !0;
       const o = F(e).then((s) => {
-        var p;
+        var l;
         const n = Object.assign(s.scene, {
           customID: t.id,
           isTagModel: !0,
@@ -193,7 +206,7 @@ class Ti extends I {
             this.hooks.emit("click", { target: "TagModel", tag: t, event: h });
           })
         });
-        return n.visible = this.getCurrentVisibleState(t), new v().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(t), (p = this.getTagConfig(t).modelConfig) != null && p.autoLookAtEnabled && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
+        return n.visible = this.getCurrentVisibleState(t), new v().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(t), (l = this.getTagConfig(t).modelConfig) != null && l.autoLookAtEnabled && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
       });
       t.model = { promise: o };
       const i = yield o;
@@ -249,7 +262,7 @@ class Ti extends I {
       var o, i;
       return ((i = (o = e.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : i.type) === "Video";
     }).forEach((e) => {
-      var l;
+      var p;
       const o = e.data.mediaData[0];
       if (!o)
         return;
@@ -258,10 +271,10 @@ class Ti extends I {
         return;
       const r = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !r))(), s = (() => !!(!e.mediaPlane && r))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
       if ((a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), s || n) {
-        const p = e.position.map(g), h = new L(i, p, {
+        const l = e.position.map(g), h = new L(i, l, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
-          paused: !((l = e.data.autoplayConfig) != null && l.autoplayVideo),
+          paused: !((p = e.data.autoplayConfig) != null && p.autoplayVideo),
           objectFit: e.data.objectFit,
           videoTextureMap: q,
           ImageTextureMap: $,
@@ -290,8 +303,8 @@ class Ti extends I {
       (a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), (s || n) && (e.mediaPlane = new w(o, i, { objectFit: e.data.objectFit }), this.getTagConfig(e).clickable !== !1 && this.domEvents.addAutoBindEventListener(
         e.mediaPlane,
         "click",
-        (l) => {
-          this.hooks.emit("click", { tag: e, target: "TagContent", event: l.origDomEvent });
+        (p) => {
+          this.hooks.emit("click", { tag: e, target: "TagContent", event: p.origDomEvent });
         },
         { noEmitWhenHide: !0 }
       ), this.imagePlaneGroup.add(e.mediaPlane));
@@ -304,10 +317,10 @@ class Ti extends I {
     this.filterCSS3DTag.forEach((e) => {
       var o, i, r;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: a, css3DInstance: s, initialNormal: n, currentNormal: l } = e.tag3DContentSvelte;
-        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(l)) {
-          const p = new V().setFromUnitVectors(n, l);
-          s.css3DObject.setRotationFromQuaternion(p);
+        const { svelteApp: a, css3DInstance: s, initialNormal: n, currentNormal: p } = e.tag3DContentSvelte;
+        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(p)) {
+          const l = new O().setFromUnitVectors(n, p);
+          s.css3DObject.setRotationFromQuaternion(l);
         }
         return;
       } else {
@@ -321,26 +334,26 @@ class Ti extends I {
         const s = this.getTagNormal(e);
         if (!s)
           return;
-        const n = this.getTagConfig(e), l = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
-        if (this.getRenderType(e) === "BehindDom" || l.mode === "behind") {
-          l.mode = "behind", l.container = document.createElement("div");
+        const n = this.getTagConfig(e), p = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
+        if (this.getRenderType(e) === "BehindDom" || p.mode === "behind") {
+          p.mode = "behind", p.container = document.createElement("div");
           const f = "black";
-          l.container.style.backgroundColor = f, l.container.style.border = `3px solid ${f}`, this.css3DRenderPlugin.hooks.on("render", () => {
+          p.container.style.backgroundColor = f, p.container.style.border = `3px solid ${f}`, this.css3DRenderPlugin.hooks.on("render", () => {
             var c;
-            if (p.css3DObject.opacityMesh && n.clickable !== !1) {
-              const P = this.addObjectClickHandler(e, p.css3DObject.opacityMesh, (T) => {
+            if (l.css3DObject.opacityMesh && n.clickable !== !1) {
+              const P = this.addObjectClickHandler(e, l.css3DObject.opacityMesh, (T) => {
                 this.hooks.emit("click", { event: T, target: "TagContent", tag: e });
               });
               (c = this.store.css3DRenderDisposer.get(e.id)) == null || c.push(P);
             }
           });
         }
-        const p = this.css3DRenderPlugin.create3DDomContainer(a, l);
-        if (!p)
+        const l = this.css3DRenderPlugin.create3DDomContainer(a, p);
+        if (!l)
           return;
-        this.store.css3DRenderDisposer.set(e.id, [p.dispose]);
+        this.store.css3DRenderDisposer.set(e.id, [l.dispose]);
         const h = new x({
-          target: p.container,
+          target: l.container,
           props: {
             tag: e,
             hooks: this.hooks,
@@ -352,12 +365,12 @@ class Ti extends I {
         });
         e.tag3DContentSvelte = {
           svelteApp: h,
-          domContainer: p,
-          css3DInstance: p,
+          domContainer: l,
+          css3DInstance: l,
           initialNormal: s,
           currentNormal: s,
           dispose: () => {
-            h.$destroy(), p.dispose();
+            h.$destroy(), l.dispose();
           }
         }, D(e) && ((r = e.model) != null && r.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
@@ -399,7 +412,7 @@ class Ti extends I {
     if (!r || r.length !== 4 || !Array.isArray(r[0]) || !Array.isArray(r[2]))
       return;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, s = new b().fromArray(r[0]), n = new b().fromArray(r[2]), l = W(s, n).add(new b(0, 0, 5e-4)), p = new v().setPosition(l), h = new v().makeScale(o, o, o), f = new v().multiply(a).multiply(p).multiply(h);
+    const a = e.matrixWorld, s = new b().fromArray(r[0]), n = new b().fromArray(r[2]), p = W(s, n).add(new b(0, 0, 5e-4)), l = new v().setPosition(p), h = new v().makeScale(o, o, o), f = new v().multiply(a).multiply(l).multiply(h);
     f.decompose(i.position, i.quaternion, i.scale);
     const c = i.opacityMesh;
     c && f.decompose(c.position, c.quaternion, c.scale);
@@ -476,16 +489,16 @@ class Ti extends I {
     }
   }
   updateDomView(t = {}) {
-    var o, i;
-    const e = this.filterPointTag.filter((r) => r.state.visible);
+    var o;
+    const e = this.filterPointTag.filter((i) => i.state.visible);
     if (this.TagContainerSvelte)
       this.TagContainerSvelte.$set({ tags: e, state: this.state, temporaryState: this.temporaryState });
     else {
-      const r = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
-      if (!r)
+      const i = this.container;
+      if (!i)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new O({
-        target: r,
+      this.TagContainerSvelte = new E({
+        target: i,
         props: {
           hooks: this.hooks,
           tags: e,
@@ -494,12 +507,12 @@ class Ti extends I {
           mediaStore: this.mediaStore,
           rendererMap: this.rendererMap,
           contentTypeMap: this.contentTypeMap,
-          withAnimation: (i = t == null ? void 0 : t.withAnimation) != null ? i : this.store.visibleWithAnimation
+          withAnimation: (o = t == null ? void 0 : t.withAnimation) != null ? o : this.store.visibleWithAnimation
         }
       });
     }
   }
 }
 export {
-  Ti as TagRender
+  ki as TagRender
 };

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

@@ -10,11 +10,13 @@ import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 import { WorkUtil } from '../../shared-utils/Utils/WorkUtil';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
+    get container(): Element;
+    set container(container: Element);
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
     tagsLengthWillUpdate: boolean;
+    workUtil: WorkUtil;
     set workCode(workCode: string);
     get workCode(): string;
-    workUtil: WorkUtil;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
@@ -29,6 +31,7 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
+    private _container;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -2,28 +2,28 @@ var q = Object.defineProperty, K = Object.defineProperties;
 var Q = Object.getOwnPropertyDescriptors;
 var V = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, Z = Object.prototype.propertyIsEnumerable;
-var w = (l, s, e) => s in l ? q(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, b = (l, s) => {
+var w = (c, s, e) => s in c ? q(c, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[s] = e, b = (c, s) => {
   for (var e in s || (s = {}))
-    Y.call(s, e) && w(l, e, s[e]);
+    Y.call(s, e) && w(c, e, s[e]);
   if (V)
     for (var e of V(s))
-      Z.call(s, e) && w(l, e, s[e]);
-  return l;
-}, R = (l, s) => K(l, Q(s));
-var u = (l, s, e) => (w(l, typeof s != "symbol" ? s + "" : s, e), e);
+      Z.call(s, e) && w(c, e, s[e]);
+  return c;
+}, _ = (c, s) => K(c, Q(s));
+var d = (c, s, e) => (w(c, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as ee } from "../typings/tag/TagConfig.js";
 import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as ie from "three";
 import { DefaultConfig as te } from "../tag.config.js";
 import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
 import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as _ } from "../utils/tagPosition.js";
+import { getTagCenterPosition as R } from "../utils/tagPosition.js";
 import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
-import { TagCache as re } from "./TagCache.js";
-import { writable as ne } from "../../vendor/svelte/store/index.js";
+import { TagCache as ne } from "./TagCache.js";
+import { writable as re } from "../../vendor/svelte/src/runtime/store/index.js";
 import { isIOSWX as se } from "../../shared-utils/device.js";
 import { Five as fe } from "@realsee/five";
-import { isMediaPlaneTag as ae, isMediaModelTag as B, isPlaneTag as le, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+import { isMediaPlaneTag as ae, isMediaModelTag as B, isPlaneTag as ce, isPoint3DTag as le } from "../utils/tag/tagCheck.js";
 import { VideoPlane as de } from "../utils/model/mediaPlane.js";
 import { FiveDomEvents as ue } from "../../shared-utils/five/FiveDomEvents.js";
 import N from "../utils/tag/adaptConfig.js";
@@ -52,7 +52,7 @@ import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../shared-utils/three/getObjectVisible.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../../vendor/svelte/internal/index.js";
+import "../../vendor/svelte/src/runtime/internal/utils.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
 import "../../shared-utils/math/pointIsRectangle.js";
@@ -63,35 +63,36 @@ import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-class ui extends re {
-  // private _cache_pointTag?: PointTagInstance[]
-  // private _cache_2DPointTag?: TagInstance<TagContentType, '2DPoint'>[]
-  // private _cache_imagePlane?: TagInstance<'MediaPlane', 'Plane'>[]
-  // private _cache_mediaModel?: TagInstance<'MediaModel', 'Model'>[]
-  // private _cache_css3DTag?: (
-  //   | TagInstance<TagContentType, 'Plane'>
-  //   | TagInstance<TagContentType, 'Model'>
-  //   | TagInstance<TagContentType, '3DPoint'>
-  // )[]
+class ui extends ne {
   constructor(e) {
     super(e);
-    u(this, "tags", []);
-    u(this, "config", te);
-    u(this, "tagsLengthWillUpdate", !0);
-    u(this, "workUtil", new me(this.five));
-    u(this, "mediaStore", ne({
+    d(this, "tags", []);
+    d(this, "config", te);
+    d(this, "tagsLengthWillUpdate", !0);
+    d(this, "workUtil", new me(this.five));
+    d(this, "mediaStore", re({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    u(this, "css3DRenderPlugin");
-    u(this, "store", {
+    d(this, "css3DRenderPlugin");
+    d(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    u(this, "domEvents", new ue(this.five));
-    u(this, "loadVideoFirstFrame", () => {
+    d(this, "domEvents", new ue(this.five));
+    // private _cache_pointTag?: PointTagInstance[]
+    // private _cache_2DPointTag?: TagInstance<TagContentType, '2DPoint'>[]
+    // private _cache_imagePlane?: TagInstance<'MediaPlane', 'Plane'>[]
+    // private _cache_mediaModel?: TagInstance<'MediaModel', 'Model'>[]
+    // private _cache_css3DTag?: (
+    //   | TagInstance<TagContentType, 'Plane'>
+    //   | TagInstance<TagContentType, 'Model'>
+    //   | TagInstance<TagContentType, '3DPoint'>
+    // )[]
+    d(this, "_container", null);
+    d(this, "loadVideoFirstFrame", () => {
       se && this.hooks.emit("loadVideoFirstFrame");
     });
     this.mediaStore.subscribe(({ currentMediaElement: i }) => {
@@ -105,6 +106,13 @@ class ui extends re {
       });
     });
   }
+  get container() {
+    var e;
+    return this._container || ((e = this.five.getElement()) == null ? void 0 : e.parentElement);
+  }
+  set container(e) {
+    this._container = e;
+  }
   set workCode(e) {
     this.workUtil.workCode = e;
   }
@@ -127,9 +135,9 @@ class ui extends re {
    * @description 获取标签配置
    */
   getTagConfig(e, i) {
-    var n, f, c;
-    const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, r = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return (c = r != null ? r : o) != null ? c : {};
+    var r, f, l;
+    const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (f = o.configWithFiveMode) == null ? void 0 : f[t];
+    return (l = n != null ? n : o) != null ? l : {};
   }
   /**
    * @description 获取标签当前状态
@@ -144,8 +152,8 @@ class ui extends re {
       e.computedConfig = i;
       const o = this.getTagConfig(e);
       if (e.config = o, e.config.initialData) {
-        const r = JSON.parse(JSON.stringify(e.data));
-        e.data = (t = o.initialData) != null && t.important ? y(e.data, r, o.initialData) : y(e.data, o.initialData, r);
+        const n = JSON.parse(JSON.stringify(e.data));
+        e.data = (t = o.initialData) != null && t.important ? y(e.data, n, o.initialData) : y(e.data, o.initialData, n);
       }
     });
   }
@@ -200,16 +208,16 @@ class ui extends re {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const r = this.workUtil.getObserverPosition(o);
-      if (r === void 0)
-        throw new Error(`getAngle(): observerPosition is ${r}`);
-      const n = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
-      if (!n)
+      const n = this.workUtil.getObserverPosition(o);
+      if (n === void 0)
+        throw new Error(`getAngle(): observerPosition is ${n}`);
+      const r = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
+      if (!r)
         return;
-      const f = _(e);
+      const f = R(e);
       if (!f)
         return;
-      const c = new ie.Vector3().copy(r).sub(f), h = n.angleTo(c) * 180 / Math.PI;
+      const l = new ie.Vector3().copy(n).sub(f), h = r.angleTo(l) * 180 / Math.PI;
       return t.angle = h, t.angle;
     }
   }
@@ -217,42 +225,42 @@ class ui extends re {
    * @description 获取距离
    */
   getDistance(e, i) {
-    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = o, n = A(r) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
-    if ((n == null ? void 0 : n.distance) !== void 0)
-      return n.distance;
-    const f = _(e);
+    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    if ((r == null ? void 0 : r.distance) !== void 0)
+      return r.distance;
+    const f = R(e);
     if (!f)
       return -1;
-    if (A(r)) {
-      const c = this.workUtil.getObserverPosition(t);
-      if (c === void 0)
+    if (A(n)) {
+      const l = this.workUtil.getObserverPosition(t);
+      if (l === void 0)
         return -1;
-      const h = c.distanceTo(f);
-      return n && (n.distance = h), h;
+      const h = l.distanceTo(f);
+      return r && (r.distance = h), h;
     }
-    if ($(r))
+    if ($(n))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (le(e))
+    if (ce(e))
       return e.position;
     if (B(e))
       return e.data.mediaPosition;
-    if (ce(e))
+    if (le(e))
       return oe(this.five.camera.position, C(e.position), C(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
       return () => {
       };
-    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), r = (n) => {
+    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), n = (r) => {
       if (!t())
         return !1;
-      o(n.origDomEvent);
+      o(r.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", r), () => {
-      var n;
-      (n = this.domEvents) == null || n.removeEventListener(i, "click", r);
+    return this.domEvents.addEventListener(i, "click", n), () => {
+      var r;
+      (r = this.domEvents) == null || r.removeEventListener(i, "click", n);
     };
   }
   getTagNormal(e) {
@@ -312,10 +320,10 @@ class ui extends re {
       if ((I = e == null ? void 0 : e.config) != null && I._isMerged)
         return e.config;
     }
-    const t = {}, r = {}, n = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([d, m]) => {
+    const t = {}, n = {}, r = {};
+    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, m]) => {
       var F, L;
-      const a = d, D = a.split("-"), x = d.startsWith("["), T = x ? D[0].slice(1, -1) : void 0, g = x ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (F = r[T]) != null ? F : r[T] = {} : (L = n[T]) != null ? L : n[T] = {} : t;
+      const a = u, D = a.split("-"), x = u.startsWith("["), T = x ? D[0].slice(1, -1) : void 0, g = x ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (F = n[T]) != null ? F : n[T] = {} : (L = r[T]) != null ? L : r[T] = {} : t;
       if (!v[a]) {
         if (g.length === 0 && (v[a] = m), g.length === 1) {
           const [p] = g;
@@ -334,17 +342,17 @@ class ui extends re {
         }
       }
     });
-    const f = (W = e.initialConfig) != null ? W : {}, c = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, c, f), P = {}, G = Object.values(fe.Mode);
-    z(r).forEach(([d, m]) => {
+    const f = (W = e.initialConfig) != null ? W : {}, l = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, l, f), P = {}, G = Object.values(fe.Mode);
+    z(n).forEach(([u, m]) => {
       G.forEach((a) => {
-        (d === "PanoramaLike" && A(a) || d === "ModelLike" && $(a)) && (P[a] = y({}, c, ...Object.values(m), f, { _isMerged: !0 }));
+        (u === "PanoramaLike" && A(a) || u === "ModelLike" && $(a)) && (P[a] = y({}, l, ...Object.values(m), f, { _isMerged: !0 }));
       });
-    }), z(n).forEach(([d, m]) => {
-      const a = P[d];
-      P[d] = y({}, c, a, ...Object.values(m), f, { _isMerged: !0 });
+    }), z(r).forEach(([u, m]) => {
+      const a = P[u];
+      P[u] = y({}, l, a, ...Object.values(m), f, { _isMerged: !0 });
     });
-    const k = R(b({}, h), { configWithFiveMode: P });
-    return N(k), Object.values(P).forEach((d) => N(d)), k._isMerged = !0, k;
+    const k = _(b({}, h), { configWithFiveMode: P });
+    return N(k), Object.values(P).forEach((u) => N(u)), k._isMerged = !0, k;
   }
 }
 export {

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

@@ -21,6 +21,7 @@ declare class PanoTagPluginController extends TagRender {
         config?: Pick<Tags, 'contentTypeConfig' | 'globalConfig'>;
         debug?: boolean;
     });
+    appendTo(wrapper: Element): void;
     /**
      * @description 加载数据
      */