@realsee/dnalogel 2.27.0-dev.0 → 2.27.0-dev.1

package/libs/PanoSpatialTagPlugin/index.js

@@ -4,13 +4,13 @@ import "@realsee/five";
 import "../CSS3DRenderPlugin/index.js";
 import "../CSS3DRenderPlugin/Controller.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../CSS3DRenderPlugin/utils/even.js";
 import "../shared-utils/Subscribe.js";
-import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../shared-utils/three/centerPoint.js";

package/libs/PanoTagPlugin/Components/Tag/MarketingTag.js

@@ -19,13 +19,13 @@ import "../../../vendor/svelte/src/runtime/internal/loop.js";
 import "../../../vendor/svelte/src/runtime/internal/style_manager.js";
 import "../../../vendor/svelte/src/runtime/internal/lifecycle.js";
 import "../../../vendor/svelte/src/shared/version.js";
+import "../../../shared-utils/positionToVector3.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../../CSS3DRenderPlugin/utils/even.js";
 import "../../../shared-utils/Subscribe.js";
-import "../../../shared-utils/positionToVector3.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../../shared-utils/three/centerPoint.js";

package/libs/PanoTagPlugin/Components/Tag/index.js

@@ -79,13 +79,13 @@ import "hammerjs";
 import "@realsee/five";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../../shared-utils/positionToVector3.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../../CSS3DRenderPlugin/utils/even.js";
 import "../../../shared-utils/Subscribe.js";
-import "../../../shared-utils/positionToVector3.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../../shared-utils/three/centerPoint.js";

package/libs/PanoTagPlugin/Components/TagContainer.js

@@ -74,13 +74,13 @@ import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
 import "../../shared-utils/Subscribe.js";
-import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../shared-utils/three/centerPoint.js";

package/libs/PanoTagPlugin/Components/TagItem.js

@@ -76,13 +76,13 @@ import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
 import "../../shared-utils/Subscribe.js";
-import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../shared-utils/three/centerPoint.js";

package/libs/PanoTagPlugin/controller/TagCache.js

@@ -8,12 +8,12 @@ import "three";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../CSS3DRenderPlugin/utils/even.js";
-import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../shared-utils/three/centerPoint.js";

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -74,9 +74,9 @@ class Ne extends q {
     {
       const s = (() => {
         var f, d, m;
-        const o = (f = e.config.visibleConfig) != null ? f : {}, a = this.getDistance(e);
+        const o = (f = e.config.visibleConfig) != null ? f : {}, l = this.getDistance(e);
         if (typeof o == "function")
-          return { value: o(this.five, { tag: e, distance: a }), reason: "config function result" };
+          return { value: o(this.five, { tag: e, distance: l }), reason: "config function result" };
         if (o.keep === "hidden")
           return { value: !1, reason: "config.keep is hidden" };
         if (o.keep === "visible")
@@ -93,10 +93,10 @@ class Ne extends q {
               reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${n}, tag.panoIndex: ${(m = e.fiveState) == null ? void 0 : m.panoIndex}`
             };
         }
-        if (o.visibleDistance !== void 0 && o.visibleDistance !== "unLimited" && p(a, o.visibleDistance) === !1)
+        if (o.visibleDistance !== void 0 && o.visibleDistance !== "unLimited" && p(l, o.visibleDistance) === !1)
           return {
             value: !1,
-            reason: `distance is not in visibleDistance. distance: ${a}, visibleDistance: ${o.visibleDistance}`
+            reason: `distance is not in visibleDistance. distance: ${l}, visibleDistance: ${o.visibleDistance}`
           };
         if (o.intersectRaycaster !== !1 && (typeof o.intersectRaycaster != "object" || o.intersectRaycaster.enabled !== !1)) {
           if (n === void 0)
@@ -113,7 +113,7 @@ class Ne extends q {
           if (p(r, o.angleRange) === !1)
             return { value: !1, reason: `angle is not in angleRange. angle: ${r}, angleRange: ${o.angleRange}` };
         }
-        return console.debug(e.id, "全部检测通过", e), {
+        return {
           value: !0,
           reason: "all check passed"
         };
@@ -133,8 +133,8 @@ class Ne extends q {
       return t === "Panorama";
   }
   getVisible(e, i) {
-    var a, f;
-    const t = (a = i == null ? void 0 : i.panoIndex) != null ? a : this.five.getCurrentState().panoIndex, n = (f = i == null ? void 0 : i.mode) != null ? f : this.five.getCurrentState().mode, s = this.getVisibleByFiveMode(e), o = n === "Panorama" ? this.getVisibleByPanoIndex(e, t) : !0;
+    var l, f;
+    const t = (l = i == null ? void 0 : i.panoIndex) != null ? l : this.five.getCurrentState().panoIndex, n = (f = i == null ? void 0 : i.mode) != null ? f : this.five.getCurrentState().mode, s = this.getVisibleByFiveMode(e), o = n === "Panorama" ? this.getVisibleByPanoIndex(e, t) : !0;
     return s && o;
   }
   /** 获取当前点位上模型中的多媒体是否应该展示 */
@@ -172,8 +172,8 @@ class Ne extends q {
           return !1;
       })();
       n.unfolded = o;
-      const a = this.getUnfoldedByCamera(e);
-      return a !== void 0 ? a : n.unfolded;
+      const l = this.getUnfoldedByCamera(e);
+      return l !== void 0 ? l : n.unfolded;
     }
   }
   /**
@@ -193,24 +193,24 @@ class Ne extends q {
         if (s.autoUnfold === void 0 || s.autoUnfold === !1 || s.autoUnfold.enable === !1 || !s.autoUnfold.strategy)
           return;
         if (s.autoUnfold.strategy === "ScreenPostion") {
-          const a = this.getTagProject(e);
-          if (a && p(a.x, s.autoUnfold.autoUnfoldProjectX) === !1)
+          const l = this.getTagProject(e);
+          if (l && p(l.x, s.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (s.autoUnfold.strategy === "MinimumDistance") {
           const d = this.filterPointTag.filter((r) => this.getVisible(r)).filter((r) => {
-            const l = this.getTagProject(r);
-            if (!l)
+            const a = this.getTagProject(r);
+            if (!a)
               return !1;
-            const { x: u, y: v, z: b } = l;
+            const { x: u, y: v, z: b } = a;
             return !(Math.abs(b) > 1 || Math.abs(u) > 1 || Math.abs(v) > 1);
-          }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: l }) => {
+          }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: a }) => {
             var u, v;
-            return !(typeof l != "object" || l.keep || l.autoUnfold === !1 || ((u = l.autoUnfold) == null ? void 0 : u.enable) === !1 || ((v = l.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance");
-          }).map((r) => U(M({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: l }) => {
+            return !(typeof a != "object" || a.keep || a.autoUnfold === !1 || ((u = a.autoUnfold) == null ? void 0 : u.enable) === !1 || ((v = a.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance");
+          }).map((r) => U(M({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
             var u, v;
-            return !(r === void 0 || typeof l != "object" || l.autoUnfold === !1 || ((u = l.autoUnfold) == null ? void 0 : u.enable) === !1 || ((v = l.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance" || l.autoUnfold.distance && p(r, l.autoUnfold.distance) === !1);
-          }).sort((r, l) => r.distance - l.distance).findIndex((r) => r.id === e.id);
+            return !(r === void 0 || typeof a != "object" || a.autoUnfold === !1 || ((u = a.autoUnfold) == null ? void 0 : u.enable) === !1 || ((v = a.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance" || a.autoUnfold.distance && p(r, a.autoUnfold.distance) === !1);
+          }).sort((r, a) => r.distance - a.distance).findIndex((r) => r.id === e.id);
           if (d === -1 || d <= ((o = s.autoUnfold.maxNumber) != null ? o : 1) - 1 === !1)
             return !1;
         }
@@ -299,7 +299,7 @@ class Ne extends q {
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
-    var d, m, r, l, u, v;
+    var d, m, r, a, u, v;
     const t = k(k((d = this.getTagConfig(e).visibleConfig) != null ? d : {}).intersectRaycaster), n = i != null ? i : this.five.getCurrentState().panoIndex, s = (m = this.five.work.observers[n]) == null ? void 0 : m.position;
     if (s === void 0)
       return { value: !1, reason: { type: "observerPosition is undefined", fivePanoIndex: n } };
@@ -310,7 +310,7 @@ class Ne extends q {
         return b === "center" ? x(e) : b === "corner" ? N(e) : Array.isArray(b) ? b : [];
       })()
     );
-    let a = 0, f = 0;
+    let l = 0, f = 0;
     for (const b of o) {
       const h = new B.Vector3().subVectors(b, s).normalize();
       I.set(s, h);
@@ -323,28 +323,28 @@ class Ne extends q {
         }).filter(O), [E] = I.intersectObjects(S, !0);
         return E;
       })(), j = (r = t.distanceAccuracy) != null ? r : 0.01;
-      Math.min((l = g == null ? void 0 : g.distance) != null ? l : 1 / 0, (u = y == null ? void 0 : y.distance) != null ? u : 1 / 0) + j >= D ? a++ : f++;
+      Math.min((a = g == null ? void 0 : g.distance) != null ? a : 1 / 0, (u = y == null ? void 0 : y.distance) != null ? u : 1 / 0) + j >= D ? l++ : f++;
       const R = (v = t.needPassed) != null ? v : 1;
-      if (a >= R)
+      if (l >= R)
         return { value: !0 };
     }
     return f === 0 ? { value: !0 } : {
       value: !1,
       reason: {
         type: "intersectRaycaster check failed",
-        passedCount: a,
+        passedCount: l,
         needPassed: t.needPassed
       }
     };
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
-    var s, o, a, f, d, m, r;
+    var s, o, l, f, d, m, r;
     let i = 0;
     const t = (s = e.fiveState) == null ? void 0 : s.panoIndex;
     t !== void 0 ? i = (o = this.five.work.observers[t]) == null ? void 0 : o.floorIndex : i = L(
       this.five.work.observers,
-      (r = (m = (f = (a = e.model) == null ? void 0 : a.object) == null ? void 0 : f.position) != null ? m : (d = e.mediaPlane) == null ? void 0 : d.position) != null ? r : x(e)
+      (r = (m = (f = (l = e.model) == null ? void 0 : l.object) == null ? void 0 : f.position) != null ? m : (d = e.mediaPlane) == null ? void 0 : d.position) != null ? r : x(e)
     );
     const n = this.five.model.shownFloor;
     return n === null || n === i;

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

@@ -39,9 +39,7 @@ export declare abstract class TagUtil extends TagCache {
      */
     getCurrentVisibleState(tag: TagInstance): boolean;
     protected loadVideoFirstFrame(): void;
-    protected updateTagConfig(params?: {
-        force?: boolean;
-    }): void;
+    protected updateTagConfig(): void;
     protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
     protected getRenderType(tag: TagInstance): 'Dom' | 'Mesh' | 'BehindDom';
     /**
@@ -58,10 +56,8 @@ export declare abstract class TagUtil extends TagCache {
     protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
     protected get filterPointTag(): PointTagInstance[];
     protected get filter2DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "2DPoint">[];
-    protected get filter3DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">[];
     protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
     protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
-    protected get filterModelTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model">[];
     protected get filterCSS3DTag(): (TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
     /**
      * @description 检查是否已经销毁

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -2,19 +2,19 @@ var P = Object.defineProperty;
 var w = (h, c, e) => c in h ? P(h, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[c] = e;
 var u = (h, c, e) => (w(h, typeof c != "symbol" ? c + "" : c, e), e);
 import { defaultGlobalConfig as M } 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 b from "three";
 import { DefaultConfig as E } from "../tag.config.js";
-import { anyPositionToVector3 as k, arrayPositionToVector3 as p } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as g } from "../utils/planeNormal.js";
+import { anyPositionToVector3 as k, arrayPositionToVector3 as g } from "../../shared-utils/positionToVector3.js";
+import { planeNormal as v } from "../utils/planeNormal.js";
 import { getTagCenterPosition as D } from "../utils/tagPosition.js";
 import { normalPositionToPositions as I } from "../utils/normalPositionToPositions.js";
-import { TagCache as A } from "./TagCache.js";
-import { writable as S } from "../../vendor/svelte/src/runtime/store/index.js";
+import { TagCache as S } from "./TagCache.js";
+import { writable as A } from "../../vendor/svelte/src/runtime/store/index.js";
 import { isIOSWX as V } from "../../shared-utils/device.js";
-import { isMediaPlaneTag as F, isMediaModelTag as v, isPlaneTag as L, isPoint3DTag as W } from "../utils/tag/tagCheck.js";
-import { VideoPlane as R } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as H } from "../../shared-utils/five/FiveDomEvents.js";
+import { isMediaPlaneTag as F, isMediaModelTag as T, isPlaneTag as L, isPoint3DTag as O } from "../utils/tag/tagCheck.js";
+import { VideoPlane as W } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as R } from "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -42,12 +42,12 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/threex/domevents/index.js";
-class Me extends A {
+class Me extends S {
   constructor(e) {
     super(e);
     u(this, "tags", []);
     u(this, "config", E);
-    u(this, "mediaStore", S({
+    u(this, "mediaStore", A({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
@@ -58,7 +58,7 @@ class Me extends A {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    u(this, "domEvents", new H(this.five));
+    u(this, "domEvents", new R(this.five));
     u(this, "mouseInfo");
     u(this, "preventWhenMouseDown", () => {
       var e;
@@ -68,7 +68,7 @@ class Me extends A {
     this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: t }) => {
       this.tags.forEach((o) => {
         var i;
-        if (o.mediaPlane instanceof R && t !== o.mediaPlane.videoInstance) {
+        if (o.mediaPlane instanceof W && t !== o.mediaPlane.videoInstance) {
           if (!((i = o.mediaPlane.videoInstance) != null && i.src) || t === o.mediaPlane.videoInstance)
             return;
           o.mediaPlane.pause();
@@ -97,14 +97,14 @@ class Me extends A {
    * @description: 获取merge后的配置
    */
   getTagConfig(e, t = { useCache: !0 }) {
-    var l, a, r;
+    var a, d, r;
     if (!e)
-      return (l = this.config.globalConfig) != null ? l : {};
-    if (t.useCache && ((a = e.config) != null && a.isMerged))
+      return (a = this.config.globalConfig) != null ? a : {};
+    if (t.useCache && ((d = e.config) != null && d.isMerged))
       return e.config;
     const o = {};
-    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((d) => {
-      const n = d;
+    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((l) => {
+      const n = l;
       if (o[n])
         return;
       const s = n.split("-");
@@ -119,19 +119,19 @@ class Me extends A {
       if (s.length === 3) {
         const [f = "Any", m, C] = s;
         if (m === "Audio" && e.contentType === "Audio") {
-          const T = e;
-          (T.stickType === f || f === "Any") && T.data.appearance === C && (o[n] = this.config.contentTypeConfig[n]);
+          const y = e;
+          (y.stickType === f || f === "Any") && y.data.appearance === C && (o[n] = this.config.contentTypeConfig[n]);
         }
       }
     });
-    const i = y(
+    const i = p(
       {},
       M,
       this.config.globalConfig,
       ...Object.values(o),
       e.config
     );
-    return typeof i.unfoldedConfig == "object" && (i.unfoldedConfig.disableFold && (i.unfoldedConfig = { keep: "unfolded" }), i.unfoldedConfig.disableUnfold && (i.unfoldedConfig = { keep: "folded" }), i.unfoldedConfig.keep && (i.unfoldedConfig = { keep: i.unfoldedConfig.keep })), typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep, visibleFiveMode: (r = i.visibleConfig) == null ? void 0 : r.visibleFiveMode }), i.isMerged = !0, i;
+    return typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep, visibleFiveMode: (r = i.visibleConfig) == null ? void 0 : r.visibleFiveMode }), typeof i.unfoldedConfig == "object" && (i.unfoldedConfig.disableFold && (i.unfoldedConfig = { keep: "unfolded" }), i.unfoldedConfig.disableUnfold && (i.unfoldedConfig = { keep: "folded" }), i.unfoldedConfig.keep && (i.unfoldedConfig = { keep: i.unfoldedConfig.keep })), i.isMerged = !0, i;
   }
   /**
    * @description 获取标签当前状态
@@ -142,10 +142,12 @@ class Me extends A {
   loadVideoFirstFrame() {
     V && this.hooks.emit("loadVideoFirstFrame");
   }
-  updateTagConfig(e) {
-    e != null && e.force && this.clearCache(), this.tags.forEach((t) => {
-      const o = this.getTagConfig(t, { useCache: !1 });
-      t.config = o, t.data = y({}, o.initialData, t.data);
+  updateTagConfig() {
+    this.clearCache(), this.tags.forEach((e) => {
+      const t = this.getTagConfig(e, { useCache: !1 });
+      e.config = t;
+      const o = JSON.parse(JSON.stringify(e.data));
+      e.data = t.initialData.important ? p(e.data, o, t.initialData) : p(e.data, t.initialData, o);
     });
   }
   can(e, t) {
@@ -178,7 +180,7 @@ class Me extends A {
         if (F(e)) {
           if (i.length === 1 && (i[0].type === "Image" || i[0].type === "Video"))
             return "Mesh";
-        } else if (v(e))
+        } else if (T(e))
           return i.length === 1 && i[0].type === "Image" ? "Mesh" : "BehindDom";
       }
     })();
@@ -188,7 +190,7 @@ class Me extends A {
    * @description: 获取角度
    */
   getAngle(e, t) {
-    var l, a;
+    var a, d;
     const o = t != null ? t : this.five.getCurrentState().panoIndex;
     if (o === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${o}`);
@@ -196,16 +198,16 @@ class Me extends A {
     if (i.angle !== void 0)
       return i.angle;
     {
-      const r = (a = (l = this.five.work) == null ? void 0 : l.observers[o]) == null ? void 0 : a.position;
+      const r = (d = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : d.position;
       if (r === void 0)
         throw new Error(`getAngleRange(): observerPosition is ${r}`);
-      const d = (() => e.stickType === "3DPoint" ? k(e.normal) : g(e.position))();
-      if (!d)
+      const l = (() => e.stickType === "3DPoint" ? k(e.normal) : v(e.position))();
+      if (!l)
         return;
       const n = D(e);
       if (!n)
         return;
-      const s = new b.Vector3().copy(r).sub(n), f = d.angleTo(s) * 180 / Math.PI;
+      const s = new b.Vector3().copy(r).sub(n), f = l.angleTo(s) * 180 / Math.PI;
       return i.angle = f, i.angle;
     }
   }
@@ -213,7 +215,7 @@ class Me extends A {
    * @description: 获取距离
    */
   getDistance(e, t) {
-    var l, a;
+    var a, d;
     const o = t != null ? t : this.five.getCurrentState().panoIndex;
     if (o === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${o}`);
@@ -221,29 +223,29 @@ class Me extends A {
     if (i.distance !== void 0)
       return i.distance;
     {
-      const r = (a = (l = this.five.work) == null ? void 0 : l.observers[o]) == null ? void 0 : a.position;
+      const r = (d = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : d.position;
       if (r === void 0)
         throw new Error(`getDistance(): observerPosition is ${r}`);
-      const d = D(e);
-      if (!d)
+      const l = D(e);
+      if (!l)
         return -1;
-      const n = r.distanceTo(d);
+      const n = r.distanceTo(l);
       return i.distance = n, n;
     }
   }
   getPositions(e) {
     if (L(e))
       return e.position;
-    if (v(e))
+    if (T(e))
       return e.data.mediaPosition;
-    if (W(e))
-      return I(this.five.camera.position, p(e.position), p(e.normal));
+    if (O(e))
+      return I(this.five.camera.position, g(e.position), g(e.normal));
   }
   addObjectClickHandler(e, t, o) {
     if (!t || !this.domEvents)
       return () => {
       };
-    const i = () => !(!this.getCurrentVisibleState(e) || v(e) && !e.mediaVisible), l = (n) => {
+    const i = () => !(!this.getCurrentVisibleState(e) || T(e) && !e.mediaVisible), a = (n) => {
       if (!i()) {
         this.mouseInfo = void 0;
         return;
@@ -255,7 +257,7 @@ class Me extends A {
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, a = (n) => {
+    }, d = (n) => {
       if (!i()) {
         this.mouseInfo = void 0;
         return;
@@ -276,7 +278,7 @@ class Me extends A {
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, d = (n) => {
+    }, l = (n) => {
       if (!i()) {
         this.mouseInfo = void 0;
         return;
@@ -286,18 +288,18 @@ class Me extends A {
       const s = n.origDomEvent;
       this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(s.changedTouches[s.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(s.changedTouches[s.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(s), this.mouseInfo = void 0;
     };
-    return this.domEvents.addEventListener(t, "mousedown", l, !1), this.domEvents.addEventListener(t, "mouseup", a, !1), this.domEvents.addEventListener(t, "touchstart", r, !1), this.domEvents.addEventListener(t, "touchend", d, !1), () => {
+    return this.domEvents.addEventListener(t, "mousedown", a, !1), this.domEvents.addEventListener(t, "mouseup", d, !1), this.domEvents.addEventListener(t, "touchstart", r, !1), this.domEvents.addEventListener(t, "touchend", l, !1), () => {
       var n, s, f, m;
-      this.mouseInfo = void 0, (n = this.domEvents) == null || n.removeEventListener(t, "mousedown", l), (s = this.domEvents) == null || s.removeEventListener(t, "mouseup", a), (f = this.domEvents) == null || f.removeEventListener(t, "touchstart", r), (m = this.domEvents) == null || m.removeEventListener(t, "touchend", d);
+      this.mouseInfo = void 0, (n = this.domEvents) == null || n.removeEventListener(t, "mousedown", a), (s = this.domEvents) == null || s.removeEventListener(t, "mouseup", d), (f = this.domEvents) == null || f.removeEventListener(t, "touchstart", r), (m = this.domEvents) == null || m.removeEventListener(t, "touchend", l);
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return p(e.normal);
+      return g(e.normal);
     if (e.stickType === "Plane")
-      return g(e.position);
+      return v(e.position);
     if (e.stickType === "Model")
-      return g(this.getPositions(e));
+      return v(this.getPositions(e));
   }
   // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
@@ -306,9 +308,6 @@ class Me extends A {
   get filter2DPointTag() {
     return this.tags.filter((e) => e.stickType === "2DPoint").filter((e) => e.position);
   }
-  get filter3DPointTag() {
-    return this.tags.filter((e) => e.stickType === "3DPoint").filter((e) => e.position);
-  }
   get filterImagePlane() {
     return this.tags.filter(
       (e) => e.contentType === "MediaPlane" && e.stickType === "Plane" && this.getRenderType(e) === "Mesh"
@@ -317,9 +316,6 @@ class Me extends A {
   get filterMediaModel() {
     return this.tags.filter((e) => e.stickType === "Model" && e.contentType === "MediaModel");
   }
-  get filterModelTag() {
-    return this.tags.filter((e) => e.stickType === "Model");
-  }
   get filterCSS3DTag() {
     return this.tags.filter(
       (t) => t.stickType === "3DPoint" || t.stickType === "Plane" || t.stickType === "Model" && t.contentType === "MediaModel"

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

@@ -38,7 +38,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 改变类型配置
      */
-    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: ContentTypeConfigKey, contentTypeConfig: TagConfigByKey<T>, merge?: boolean): void;
+    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: T, contentTypeConfig: TagConfigByKey<T>, merge?: boolean): void;
     show(params?: {
         userAction?: boolean;
         withAnimation?: boolean;

package/libs/PanoTagPlugin/controller/index.js

@@ -237,10 +237,10 @@ class wi extends N {
       const o = (Array.isArray(e) ? e : [e]).map((s) => {
         var l, c;
         const n = this.getTagConfig(s), r = JSON.parse(JSON.stringify(s.data));
-        return b(m({}, s), {
+        return s.config = n, b(m({}, s), {
           enabled: (l = s.enabled) != null ? l : !0,
           id: (c = s.id) != null ? c : z(),
-          data: p(s.data, n.initialData, r),
+          data: n.initialData.important ? p(s.data, r, n.initialData) : p(s.data, n.initialData, r),
           state: m({
             visible: void 0,
             unfolded: !this.can("fold", s)
@@ -266,19 +266,19 @@ class wi extends N {
    * @description: 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig(), this.updateRenderAllTags();
   }
   /**
    * @description: 改变全局配置
    */
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = p({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config.globalConfig = p({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig(), this.updateRenderAllTags();
   }
   /**
    * @description: 改变类型配置
    */
   changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = p({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = p({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig(), this.updateRenderAllTags();
   }
   show(e) {
     return f(this, null, function* () {
@@ -458,9 +458,9 @@ class wi extends N {
   }
   handleFiveWantsMoveToPano(e) {
     this.tags.forEach((t) => {
-      t.state.visible = this.getVisible(t, { panoIndex: e });
-      const i = this.getTagConfig(t);
-      typeof i.visibleConfig == "object" && (i.visibleConfig.keep ? t.temporaryState.visible = i.visibleConfig.keep === "visible" : t.temporaryState.visible = !!i.visibleConfig.alwaysShowWhenMovePano);
+      this.getVisible(t, { panoIndex: e }) && (t.state.visible = !0);
+      const o = this.getTagConfig(t);
+      typeof o.visibleConfig == "object" && (o.visibleConfig.keep ? t.temporaryState.visible = o.visibleConfig.keep === "visible" : t.temporaryState.visible = !!o.visibleConfig.alwaysShowWhenMovePano);
     }), this.updateTagContainerVisible(), this.updateRenderImagePlane(), this.updateRenderVideoPlane();
   }
   /**

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

@@ -4,7 +4,6 @@ import type * as BasePlugin from '../../base/BasePlugin';
 import type { Writable } from 'svelte/store';
 import type { TagId } from './tag/Utils';
 import type { TagContentType } from './tag/TagData';
-import type { Vector3 } from 'three';
 export type TagHooks = InstanceType<typeof PanoTagPluginController>['hooks'];
 export interface State extends BasePlugin.State {
 }
@@ -70,7 +69,6 @@ export interface TagCacheInterface {
     unfolded?: boolean;
     minimumDistanceResult?: boolean;
     distance?: number;
-    distanceMap?: Map<Vector3, number>;
     angle?: number;
     /** MedialModelTag 中，多媒体的隐藏 & 展示 */
     modelMedialVisible?: boolean;

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -17,9 +17,9 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
     visibleConfig?: {
         /**
          * @description 保持可见/不可见, 设置后visibleConfig下所有其他配置都不生效
-         * @default undefined
+         * @default null
          */
-        keep?: 'visible' | 'hidden';
+        keep?: 'visible' | 'hidden' | null;
         /**
          * @description 在哪些 five mode 下可见
          * @default ['Panorama']
@@ -134,7 +134,12 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         /** 展开/收起 */
         unfolded?: boolean;
     };
-    initialData?: C extends any ? {} : PartialObjectDeep<ContentTypeMap[C]>;
+    initialData?: C extends TagContentType ? PartialObjectDeep<ContentTypeMap[C]> & {
+        important?: boolean;
+    } : {
+        [key: string]: any;
+        important?: boolean;
+    };
     tag3DConfig?: Create3DDomContainerParamsType['config'];
     modelConfig?: {
         autoLookAtEnabled?: boolean;