@realsee/dnalogel 3.41.7 → 3.42.0-alpha-tag.1

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

@@ -65,7 +65,7 @@ export declare abstract class TagRender extends TagComputer {
     /**
      * @description 一个点的标签
      */
-    protected setPointTagPosition(tag?: TagInstance | TagInstance[]): void;
+    protected setPointTagPosition: (tag?: TagInstance | TagInstance[]) => void;
     /**
      * @description 渲染单个点的标签
      */

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,9 +1,9 @@
 var I = Object.defineProperty;
 var j = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
+var V = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
 var C = (u, l, e) => l in u ? I(u, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[l] = e, k = (u, l) => {
   for (var e in l || (l = {}))
-    x.call(l, e) && C(u, e, l[e]);
+    V.call(l, e) && C(u, e, l[e]);
   if (j)
     for (var e of j(l))
       O.call(l, e) && C(u, e, l[e]);
@@ -13,18 +13,18 @@ var h = (u, l, e) => (C(u, typeof l != "symbol" ? l + "" : l, e), e);
 var M = (u, l, e) => new Promise((o, t) => {
   var i = (s) => {
     try {
-      n(e.next(s));
-    } catch (a) {
-      t(a);
+      a(e.next(s));
+    } catch (n) {
+      t(n);
     }
   }, r = (s) => {
     try {
-      n(e.throw(s));
-    } catch (a) {
-      t(a);
+      a(e.throw(s));
+    } catch (n) {
+      t(n);
     }
-  }, n = (s) => s.done ? o(s.value) : Promise.resolve(s.value).then(i, r);
-  n((e = e.apply(u, l)).next());
+  }, a = (s) => s.done ? o(s.value) : Promise.resolve(s.value).then(i, r);
+  a((e = e.apply(u, l)).next());
 });
 import { TagComputer as E } from "./TagComputer.js";
 import { Group as R, Quaternion as G, Vector3 as D, Matrix4 as g } from "three";
@@ -102,7 +102,6 @@ import "../../vendor/svelte/easing/index.js";
 import "../Components/Common/Icon/Icon.js";
 import "../utils/getImageInfo.js";
 import "../utils/px2rem.js";
-import "../../vendor/classnames/index.js";
 import "../Components/Tag/TextTag/index.js";
 import "../Components/Tag/TextTag/TextTag.js";
 import "../Components/Common/Line/Straight.js";
@@ -163,6 +162,7 @@ import "../Components/Tag/MediaPlane.js";
 import "../Components/Tag/LinkTag.js";
 import "../Components/Tag/PanoramaTag.js";
 import "../Components/Tag/CustomTag.js";
+import "../../vendor/classnames/index.js";
 import "@realsee/five/gltf-loader";
 const B = /* @__PURE__ */ new Map(), N = /* @__PURE__ */ new Map();
 class Si extends E {
@@ -184,7 +184,7 @@ class Si extends E {
      */
     h(this, "updateRender3DDomTag", (e) => {
       (e ? v(e) : this.filterCSS3DTag).forEach((t) => {
-        var i, r, n, s, a;
+        var i, r, a, s, n;
         if (t.tag3DContentSvelte) {
           const { svelteApp: c, css3DInstance: m, initialNormal: f, currentNormal: d } = t.tag3DContentSvelte;
           if ((r = m == null ? void 0 : m.css3DObject) == null || r.setVisible((this.state.visible && ((i = t.state) == null ? void 0 : i.visible)) !== !1), c.$set({ tag: t, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !f.equals(d)) {
@@ -193,7 +193,7 @@ class Si extends E {
           }
           return;
         } else {
-          if (y(t) && !((n = t.model) != null && n.object) || ((s = t.state) == null ? void 0 : s.visible) === !1 || !this.state.visible || !this.state.enabled || !this.css3DRenderPlugin)
+          if (y(t) && !((a = t.model) != null && a.object) || ((s = t.state) == null ? void 0 : s.visible) === !1 || !this.state.visible || !this.state.enabled || !this.css3DRenderPlugin)
             return;
           if (t.stickType === "3DPoint" && !t.normal)
             return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
@@ -206,12 +206,12 @@ class Si extends E {
           const f = this.getTagConfig(t), d = k({ wrapperStyle: { zIndex: this.calculateTagZIndex(t).toString() } }, f.tag3DConfig);
           if (this.getRenderType(t) === "BehindDom" || d.mode === "behind") {
             d.mode = "behind", d.container = document.createElement("div");
-            const P = "black";
-            d.container.style.backgroundColor = P, d.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            const T = "black";
+            d.container.style.backgroundColor = T, d.container.style.border = `3px solid ${T}`, this.css3DRenderPlugin.hooks.on("render", () => {
               var b;
               if (p.css3DObject.opacityMesh && f.clickable !== !1) {
-                const A = this.addObjectClickHandler(t, p.css3DObject.opacityMesh, (V) => {
-                  this.hooks.emit("click", { event: V, target: "TagContent", tag: t });
+                const A = this.addObjectClickHandler(t, p.css3DObject.opacityMesh, (x) => {
+                  this.hooks.emit("click", { event: x, target: "TagContent", tag: t });
                 });
                 (b = this.store.css3DRenderDisposer.get(t.id)) == null || b.push(A);
               }
@@ -221,7 +221,7 @@ class Si extends E {
           if (!p)
             return;
           this.store.css3DRenderDisposer.set(t.id, [p.dispose]);
-          const T = new _({
+          const P = new _({
             target: p.container,
             props: {
               tag: t,
@@ -233,18 +233,47 @@ class Si extends E {
             }
           });
           t.tag3DContentSvelte = {
-            svelteApp: T,
+            svelteApp: P,
             domContainer: p,
             css3DInstance: p,
             initialNormal: m,
             currentNormal: m,
             dispose: () => {
-              T.$destroy(), p.dispose();
+              P.$destroy(), p.dispose();
             }
-          }, y(t) && ((a = t.model) != null && a.object) && this.updateTagCss3DObjectMatrix(t, t.model.object);
+          }, y(t) && ((n = t.model) != null && n.object) && this.updateTagCss3DObjectMatrix(t, t.model.object);
         }
       }), this.clearUnusedPanelTag();
     });
+    /**
+     * @description 一个点的标签
+     */
+    h(this, "setPointTagPosition", (e) => {
+      const o = e ? v(e) : this.filterPointTag;
+      o.length !== 0 && o.forEach((t) => {
+        var s;
+        const i = this.getCurrentVisibleState(t), r = (s = t.__Object__) != null ? s : {
+          timeoutId: void 0,
+          inAnimation: !1
+        };
+        if (t.__Object__ = r, !i && t.screenPosition ? (r.inAnimation = !0, r.timeoutId = setTimeout(() => {
+          requestAnimationFrame(() => {
+            this.getCurrentVisibleState(t) || (r.inAnimation = !1, t.screenPosition = null, this.updateDomView());
+          });
+        }, 1e3)) : r.timeoutId && (clearTimeout(r.timeoutId), r.inAnimation = !1, r.timeoutId = void 0), !i && !r.inAnimation)
+          return;
+        const a = this.getTagProject(t);
+        if (a) {
+          const n = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), c = this.getDistance(t);
+          t.screenPosition = {
+            leftPx: (a.x + 1) / 2 * this.renderWidthPx,
+            topPx: (-a.y + 1) / 2 * this.renderHeightPx,
+            scale: Math.max(Math.min(1 - n * c / 40, 1), 0.5)
+          };
+        } else
+          t.screenPosition = null;
+      });
+    });
     /**
      * @description 渲染单个点的标签
      */
@@ -254,14 +283,14 @@ class Si extends E {
     });
     /** 加载外部模型 */
     h(this, "loadModel", (e) => M(this, null, function* () {
-      var n;
+      var a;
       const o = e.data.modelUrl;
       if (!o)
         return;
       e.loading = !0;
       const t = L(o).then((s) => {
         var m;
-        const a = Object.assign(s.scene, {
+        const n = Object.assign(s.scene, {
           customID: e.id,
           isTagModel: !0,
           removeEventListener: this.getTagConfig(e).clickable === !1 ? () => {
@@ -269,11 +298,11 @@ class Si extends E {
             this.hooks.emit("click", { target: "TagModel", tag: e, event: f });
           })
         });
-        return a.visible = this.getCurrentVisibleState(e), new g().fromArray(e.matrix).decompose(a.position, a.quaternion, a.scale), a.updateWorldMatrix(!0, !0), a.visible = this.getVisible(e), (m = this.getTagConfig(e).modelConfig) != null && m.autoLookAtEnabled && a.lookAt(this.five.camera.position.clone().setY(a.position.y)), a;
+        return n.visible = this.getCurrentVisibleState(e), new g().fromArray(e.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(e), (m = this.getTagConfig(e).modelConfig) != null && m.autoLookAtEnabled && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
       });
       e.model = { promise: t };
       const i = yield t;
-      if (e.loading = !1, ((n = e.model) == null ? void 0 : n.promise) !== t || !this.tags.includes(e))
+      if (e.loading = !1, ((a = e.model) == null ? void 0 : a.promise) !== t || !this.tags.includes(e))
         return;
       e.model.object = i;
       const r = this.gltfObjectGroup.children.find((s) => s.customID === e.id);
@@ -283,8 +312,8 @@ class Si extends E {
           e.mediaPlane = new w(e.data.mediaData[0].url, e.data.mediaPosition.map(S), {
             objectFit: e.data.objectFit
           });
-          const a = new D().addVectors(s[0], s[2]).divideScalar(2);
-          e.mediaPlane.position.copy(a), i.add(e.mediaPlane);
+          const n = new D().addVectors(s[0], s[2]).divideScalar(2);
+          e.mediaPlane.position.copy(n), i.add(e.mediaPlane);
         }
         this.getRenderType(e) !== "Mesh" && (i.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(e, i), i.updateTagCss3DObjectMatrix());
       }
@@ -366,8 +395,8 @@ class Si extends E {
       const { url: r } = i;
       if (!r)
         return;
-      const n = this.getCurrentVisibleState(t), s = (() => !!(t.mediaPlane && !n))(), a = (() => !!(!t.mediaPlane && n))(), c = (() => !!(t.mediaPlane && t.mediaPlane.src !== r))();
-      if ((s || c) && t.mediaPlane && (this.imagePlaneGroup.remove(t.mediaPlane), t.mediaPlane.dispose(), t.mediaPlane.removeFromParent(), t.mediaPlane = void 0), a || c) {
+      const a = this.getCurrentVisibleState(t), s = (() => !!(t.mediaPlane && !a))(), n = (() => !!(!t.mediaPlane && a))(), c = (() => !!(t.mediaPlane && t.mediaPlane.src !== r))();
+      if ((s || c) && t.mediaPlane && (this.imagePlaneGroup.remove(t.mediaPlane), t.mediaPlane.dispose(), t.mediaPlane.removeFromParent(), t.mediaPlane = void 0), n || c) {
         const f = t.position.map(S), d = new q(r, f, {
           videoCoverSrc: i.videoCoverUrl,
           playButton: t.data.playIcon,
@@ -377,10 +406,10 @@ class Si extends E {
           ImageTextureMap: N,
           domEvents: this.domEvents
         });
-        d.onVideoReady = (T) => {
-          T.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
+        d.onVideoReady = (P) => {
+          P.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
         };
-        const p = (T) => (this.five.on("renderFrame", T), () => this.five.off("renderFrame", T));
+        const p = (P) => (this.five.on("renderFrame", P), () => this.five.off("renderFrame", P));
         d.initialRenderHooks(p), t.mediaPlane = d, this.imagePlaneGroup.add(t.mediaPlane);
       }
     });
@@ -396,8 +425,8 @@ class Si extends E {
       const { url: i } = t.data.mediaData[0];
       if (!i)
         return;
-      const r = t.position.map(S), n = this.getCurrentVisibleState(t), s = (() => !!(t.mediaPlane && !n))(), a = (() => !!(!t.mediaPlane && n))(), c = (() => !!(t.mediaPlane && t.mediaPlane.src !== i))();
-      (s || c) && t.mediaPlane && (this.imagePlaneGroup.remove(t.mediaPlane), t.mediaPlane.dispose(), t.mediaPlane.removeFromParent(), t.mediaPlane = void 0), (a || c) && (t.mediaPlane = new w(i, r, { objectFit: t.data.objectFit }), this.getTagConfig(t).clickable !== !1 && this.domEvents.addAutoBindEventListener(
+      const r = t.position.map(S), a = this.getCurrentVisibleState(t), s = (() => !!(t.mediaPlane && !a))(), n = (() => !!(!t.mediaPlane && a))(), c = (() => !!(t.mediaPlane && t.mediaPlane.src !== i))();
+      (s || c) && t.mediaPlane && (this.imagePlaneGroup.remove(t.mediaPlane), t.mediaPlane.dispose(), t.mediaPlane.removeFromParent(), t.mediaPlane = void 0), (n || c) && (t.mediaPlane = new w(i, r, { objectFit: t.data.objectFit }), this.getTagConfig(t).clickable !== !1 && this.domEvents.addAutoBindEventListener(
         t.mediaPlane,
         "click",
         (m) => {
@@ -418,8 +447,8 @@ class Si extends E {
     const e = (i) => !this.enabledModelTagSet.has(i.customID), o = this.gltfObjectGroup.children.filter(e);
     o.forEach((i) => i.removeEventListener()), this.gltfObjectGroup.remove(...o), this.tags.filter((i) => i.stickType === "Model").forEach((i) => {
       var r;
-      (r = i.model) == null || r.promise.then((n) => {
-        n.visible = this.getCurrentVisibleState(i);
+      (r = i.model) == null || r.promise.then((a) => {
+        a.visible = this.getCurrentVisibleState(i);
       });
     }), this.five.needsRender = !0;
   }
@@ -435,15 +464,15 @@ class Si extends E {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(e, o) {
-    var T, P, b;
-    const t = (P = (T = this.getTagConfig(e).tag3DConfig) == null ? void 0 : T.ratio) != null ? P : 216e-5, i = (b = e.tag3DContentSvelte) == null ? void 0 : b.css3DInstance.css3DObject;
+    var P, T, b;
+    const t = (T = (P = this.getTagConfig(e).tag3DConfig) == null ? void 0 : P.ratio) != null ? T : 216e-5, i = (b = e.tag3DContentSvelte) == null ? void 0 : b.css3DInstance.css3DObject;
     if (!i)
       return;
     const r = y(e) ? e.data.mediaPosition : e.position;
     if (!r || r.length !== 4 || !Array.isArray(r[0]) || !Array.isArray(r[2]))
       return;
     o.updateWorldMatrix(!1, !1);
-    const n = o.matrixWorld, s = new D().fromArray(r[0]), a = new D().fromArray(r[2]), c = U(s, a).add(new D(0, 0, 5e-4)), m = new g().setPosition(c), f = new g().makeScale(t, t, t), d = new g().multiply(n).multiply(m).multiply(f);
+    const a = o.matrixWorld, s = new D().fromArray(r[0]), n = new D().fromArray(r[2]), c = U(s, n).add(new D(0, 0, 5e-4)), m = new g().setPosition(c), f = new g().makeScale(t, t, t), d = new g().multiply(a).multiply(m).multiply(f);
     d.decompose(i.position, i.quaternion, i.scale);
     const p = i.opacityMesh;
     p && d.decompose(p.position, p.quaternion, p.scale);
@@ -455,27 +484,6 @@ class Si extends E {
       yield Promise.all(o), this.setVisible(), this.updateRenderAllTags();
     });
   }
-  /**
-   * @description 一个点的标签
-   */
-  setPointTagPosition(e) {
-    const o = e ? v(e) : this.filterPointTag;
-    o.length !== 0 && o.forEach((t) => {
-      var s;
-      const i = this.getCurrentVisibleState(t), r = (s = t.__Object__) != null ? s : {
-        timeoutId: void 0,
-        inAnimation: !1
-      };
-      if (t.__Object__ = r, !i && t.screenPosition ? (r.inAnimation = !0, r.timeoutId = setTimeout(() => {
-        requestAnimationFrame(() => {
-          this.getCurrentVisibleState(t) || (r.inAnimation = !1, t.screenPosition = null, this.updateDomView());
-        });
-      }, 1e3)) : r.timeoutId && (clearTimeout(r.timeoutId), r.inAnimation = !1, r.timeoutId = void 0), !i && !r.inAnimation)
-        return;
-      const n = this.getTagProject(t);
-      n ? t.screenPosition = { leftPercent: (n.x + 1) / 2 * 100, topPercent: (-n.y + 1) / 2 * 100 } : t.screenPosition = null;
-    });
-  }
   updateTagContainerVisible() {
     var e;
     (e = this.TagContainerSvelte) == null || e.$set({
@@ -483,8 +491,8 @@ class Si extends E {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filterCSS3DTag.forEach((o) => {
-      var t, i, r, n, s;
-      (n = (i = (t = o.tag3DContentSvelte) == null ? void 0 : t.css3DInstance) == null ? void 0 : i.css3DObject) == null || n.setVisible((this.state.visible && ((r = o.state) == null ? void 0 : r.visible)) !== !1), (s = o.tag3DContentSvelte) == null || s.svelteApp.$set({
+      var t, i, r, a, s;
+      (a = (i = (t = o.tag3DContentSvelte) == null ? void 0 : t.css3DInstance) == null ? void 0 : i.css3DObject) == null || a.setVisible((this.state.visible && ((r = o.state) == null ? void 0 : r.visible)) !== !1), (s = o.tag3DContentSvelte) == null || s.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation

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

@@ -8,6 +8,8 @@ import type { Mode } from '@realsee/five';
 import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
+    renderWidthPx?: number;
+    renderHeightPx?: number;
     get container(): Element;
     set container(container: Element);
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -12,10 +12,10 @@ var k = (l, s, e) => s in l ? q(l, s, { enumerable: !0, configurable: !0, writab
 }, V = (l, s) => K(l, Q(s));
 var f = (l, s, e) => (k(l, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as ie } from "../typings/tag/TagConfig.js";
-import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as U from "three";
 import { DefaultConfig as te } from "../tag.config.js";
-import { anyPositionToVector3 as P } from "../../shared-utils/positionToVector3.js";
+import { anyPositionToVector3 as y } from "../../shared-utils/positionToVector3.js";
 import { planeNormal as E } from "../utils/planeNormal.js";
 import { getTagCenterPosition as B } from "../utils/tagPosition.js";
 import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
@@ -28,11 +28,11 @@ import { isMediaPlaneTag as ce, isMediaModelTag as N, isPlaneTag as le, isPoint3
 import { VideoPlane as ue } from "../utils/model/mediaPlane.js";
 import { FiveDomEvents as me } from "../../shared-utils/five/FiveDomEvents.js";
 import z from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as S, isModelLike as $ } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as S, isModelLike as H } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "animejs";
-import { entries as H } from "../../shared-utils/typescript/entries.js";
+import { entries as $ } from "../../shared-utils/typescript/entries.js";
 import { getUrlExt as J } from "../../shared-utils/url/getUrl.js";
 import { transformPosition as G } from "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -72,6 +72,8 @@ class Ti extends ne {
   constructor(e) {
     super(e);
     f(this, "tags", []);
+    f(this, "renderWidthPx");
+    f(this, "renderHeightPx");
     f(this, "config", te);
     /** 插件参数 */
     f(this, "params");
@@ -187,7 +189,7 @@ class Ti extends ne {
       const o = this.getTagConfig(e);
       if (e.config = o, e.config.initialData) {
         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);
+        e.data = (t = o.initialData) != null && t.important ? P(e.data, n, o.initialData) : P(e.data, o.initialData, n);
       }
     });
   }
@@ -245,7 +247,7 @@ class Ti extends ne {
       const n = this.workUtil.getObserverPosition(o);
       if (n === void 0)
         throw new Error(`getAngle(): observerPosition is ${n}`);
-      const r = (() => e.stickType === "3DPoint" ? P(e.normal) : E(e.position))();
+      const r = (() => e.stickType === "3DPoint" ? y(e.normal) : E(e.position))();
       if (!r)
         return;
       const a = B(e);
@@ -272,7 +274,7 @@ class Ti extends ne {
       const g = d.distanceTo(a);
       return r && (r.distance = g), g;
     }
-    if ($(n))
+    if (H(n))
       return this.five.camera.position.distanceTo(a);
   }
   getPositions(e) {
@@ -281,7 +283,7 @@ class Ti extends ne {
     if (N(e))
       return e.data.mediaPosition;
     if (de(e))
-      return oe(this.five.camera.position, P(e.position), P(e.normal));
+      return oe(this.five.camera.position, y(e.position), y(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -299,7 +301,7 @@ class Ti extends ne {
   }
   getTagNormal(e) {
     if (e.normal)
-      return P(e.normal);
+      return y(e.normal);
     if (e.stickType === "Plane")
       return E(e.position);
     if (e.stickType === "Model")
@@ -309,7 +311,7 @@ class Ti extends ne {
     if (!e)
       return;
     const i = this.workUtil.transform;
-    return Array.isArray(e) && e.length === 4 ? e.map(P).map((o) => G(o, i)) : G(P(e), i);
+    return Array.isArray(e) && e.length === 4 ? e.map(y).map((o) => G(o, i)) : G(y(e), i);
   }
   getTransformedMatrix(e) {
     const i = new U.Matrix4().fromArray(e);
@@ -326,20 +328,20 @@ class Ti extends ne {
    * @description 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var w, A, x, O, I;
+    var w, x, A, O, I;
     const o = (w = i == null ? void 0 : i.useCache) != null ? w : !0;
     if (!e)
-      return (A = this.config.globalConfig) != null ? A : {};
+      return (x = this.config.globalConfig) != null ? x : {};
     if (o) {
-      if ((x = e == null ? void 0 : e.computedConfig) != null && x._isMerged)
+      if ((A = e == null ? void 0 : e.computedConfig) != null && A._isMerged)
         return e.computedConfig;
       if ((O = e == null ? void 0 : e.config) != null && O._isMerged)
         return e.config;
     }
     const t = {}, n = {}, r = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, m]) => {
-      var W, R;
-      const c = u, _ = c.split("-"), j = u.startsWith("["), T = j ? _[0].slice(1, -1) : void 0, h = j ? _.slice(1) : _, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (W = n[T]) != null ? W : n[T] = {} : (R = r[T]) != null ? R : r[T] = {} : t;
+      var j, R;
+      const c = u, _ = c.split("-"), W = u.startsWith("["), T = W ? _[0].slice(1, -1) : void 0, h = W ? _.slice(1) : _, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (j = n[T]) != null ? j : n[T] = {} : (R = r[T]) != null ? R : r[T] = {} : t;
       if (!v[c]) {
         if (h.length === 0 && (v[c] = m), h.length === 1) {
           const [p] = h;
@@ -358,14 +360,14 @@ class Ti extends ne {
         }
       }
     });
-    const a = (I = e.initialConfig) != null ? I : {}, d = y({}, ie, this.config.globalConfig, ...Object.values(t)), g = y({}, d, a), C = {}, X = Object.values(ae.Mode);
-    H(n).forEach(([u, m]) => {
+    const a = (I = e.initialConfig) != null ? I : {}, d = P({}, ie, this.config.globalConfig, ...Object.values(t)), g = P({}, d, a), C = {}, X = Object.values(ae.Mode);
+    $(n).forEach(([u, m]) => {
       X.forEach((c) => {
-        (u === "PanoramaLike" && S(c) || u === "ModelLike" && $(c)) && (C[c] = y({}, d, ...Object.values(m), a, { _isMerged: !0 }));
+        (u === "PanoramaLike" && S(c) || u === "ModelLike" && H(c)) && (C[c] = P({}, d, ...Object.values(m), a, { _isMerged: !0 }));
       });
-    }), H(r).forEach(([u, m]) => {
+    }), $(r).forEach(([u, m]) => {
       const c = C[u];
-      C[u] = y({}, d, c, ...Object.values(m), a, { _isMerged: !0 });
+      C[u] = P({}, d, c, ...Object.values(m), a, { _isMerged: !0 });
     });
     const b = V(D({}, g), { configWithFiveMode: C });
     return z(b), Object.values(C).forEach((u) => z(u)), b._isMerged = !0, b;

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

@@ -148,6 +148,7 @@ declare class PanoTagPluginController extends TagRender {
      */
     private clickhandler;
     private handleFiveCameraUpdate;
+    private handleFiveCameraFovUpdate;
     private handleFivePanoArrived;
     /** 楼层切换时，需要更新标签可见性 */
     private handleFiveModelShownFloorChange;