@realsee/dnalogel 2.19.1 → 2.20.0-alpha.0

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -2,26 +2,26 @@ var M = Object.defineProperty, U = Object.defineProperties;
 var R = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
 var B = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var g = (c, l, e) => l in c ? M(c, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[l] = e, x = (c, l) => {
+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(c, e, l[e]);
+    B.call(l, e) && g(d, e, l[e]);
   if (P)
     for (var e of P(l))
-      C.call(l, e) && g(c, e, l[e]);
-  return c;
-}, I = (c, l) => U(c, R(l));
-var T = (c, l, e) => (g(c, typeof l != "symbol" ? l + "" : l, e), e);
+      C.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";
 import { is3DTag as j, isMediaModelTag as y } from "../utils/tag/tagCheck.js";
-import { tagPosition as V, getTagPosition as k } from "../utils/tagPosition.js";
+import { tagPosition as T, getTagPosition as k } from "../utils/tagPosition.js";
 import { checkRange as h } from "../utils/checkRange.js";
 import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { notNil as S } from "../../shared-utils/isNil.js";
-import { TagUtil as $ } from "./TagUtil.js";
+import { notNil as $ } from "../../shared-utils/isNil.js";
+import { TagUtil as S } from "./TagUtil.js";
 import { getFloorIndex as E } from "../../shared-utils/five/getFloorIndex.js";
 import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -55,10 +55,10 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/threex/domevents/index.js";
-class Ue extends $ {
+class Ue extends S {
   constructor(e) {
     super(e);
-    T(this, "raycaster", new D.Raycaster());
+    V(this, "raycaster", new D.Raycaster());
   }
   /**
    * @description: 获取是否可见
@@ -71,8 +71,8 @@ class Ue extends $ {
       return s.visible;
     {
       const i = (() => {
-        var d, u, v;
-        const o = (d = this.getTagConfig(e).visibleConfig) != null ? d : {}, f = this.getDistance(e);
+        var c, u, v;
+        const o = (c = this.getTagConfig(e).visibleConfig) != null ? c : {}, f = this.getDistance(e);
         if (typeof o == "function")
           return { value: o(this.five, { tag: e, distance: f }), reason: "config function result" };
         if (o.keep === "hidden")
@@ -172,14 +172,14 @@ class Ue extends $ {
       if (!i)
         return;
       const o = (() => {
-        const d = this.getDistance(e);
+        const c = this.getDistance(e);
         if (typeof i == "function")
-          return i(this.five, { tag: e, distance: d });
+          return i(this.five, { tag: e, distance: c });
         if (i.keep === "folded")
           return !1;
         if (i.keep === "unfolded")
           return !0;
-        if (i.unfoldDistance && h(d, i.unfoldDistance) === !1)
+        if (i.unfoldDistance && h(c, i.unfoldDistance) === !1)
           return !1;
       })();
       n.unfolded = o;
@@ -243,15 +243,15 @@ class Ue extends $ {
     e.length !== 0 && e.forEach((t) => {
       var n;
       if (!((n = t.state) != null && n.visible)) {
-        t.pointTagStyle = null;
+        t.screenPosition = null;
         return;
       }
       const s = this.getTagProject(t);
       if (!s) {
-        t.pointTagStyle = null;
+        t.screenPosition = null;
         return;
       }
-      t.pointTagStyle = { leftPercent: (s.x + 1) / 2 * 100, topPercent: (-s.y + 1) / 2 * 100 };
+      t.screenPosition = { leftPercent: (s.x + 1) / 2 * 100, topPercent: (-s.y + 1) / 2 * 100 };
     });
   }
   setVisible() {
@@ -295,7 +295,7 @@ class Ue extends $ {
   getTagProject(e) {
     if (!this.getVisible(e))
       return;
-    const s = V(e.position);
+    const s = T(e.position);
     if (!s)
       return;
     const { x: n, y: i, z: o } = s.project(this.five.camera);
@@ -311,16 +311,16 @@ class Ue extends $ {
       const a = this.tags.filter(y).map((b) => {
         var m;
         return (m = b.model) == null ? void 0 : m.object;
-      }).filter(S);
+      }).filter($);
       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;
-    })(), d = Math.min((v = i == null ? void 0 : i.distance) != null ? v : 1 / 0, (r = o == null ? void 0 : o.distance) != null ? r : 1 / 0);
-    return d + f < n ? {
+    })(), 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 ? {
       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()},
-        customModelIntersection.point is ${o == null ? void 0 : o.point.toArray()}, minIntersectionDistance is ${d}`
+        customModelIntersection.point is ${o == null ? void 0 : o.point.toArray()}, minIntersectionDistance is ${c}`
     } : { value: !0, reason: "" };
   }
   /** 获取点位看向标签的射线 */
@@ -329,7 +329,7 @@ class Ue extends $ {
     const s = (o = this.five.work.observers[t]) == null ? void 0 : o.position;
     if (s === void 0)
       throw new Error(`getVisible(): observerPosition is ${s}`);
-    const n = V(e.position);
+    const n = T(e.position);
     if (!n)
       return;
     const i = n.sub(s).normalize();
@@ -337,10 +337,10 @@ class Ue extends $ {
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
-    var i, o, f, d, u, v, r;
+    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 = (d = (f = e.model) == null ? void 0 : f.object) == null ? void 0 : d.position) != null ? v : (u = e.mediaPlane) == null ? void 0 : u.position) != null ? r : k(e));
+    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;
   }

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

@@ -1,9 +1,9 @@
 import { TagComputer } from './TagComputer';
-import type { Tag, TagElement, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup } from '../typings';
+import type { Tag, TagInstance, TagGLTFObject, TagObjectGroup, TagGLTFObjectGroup, ImagePlaneGroup, TagContentType } from '../typings';
 import type { TemporaryState } from '../typings';
-import { Object3D } from 'three';
+import { type Object3D } from 'three';
 import TagContainerSvelte from '../Components/TagContainer.svelte';
-import { Five } from '@realsee/five';
+import type { Five } from '@realsee/five';
 export declare abstract class TagRender extends TagComputer {
     protected group: TagObjectGroup;
     protected imagePlaneGroup: ImagePlaneGroup;
@@ -41,7 +41,7 @@ export declare abstract class TagRender extends TagComputer {
      * @param tag 标签
      * @param model 模型
      */
-    protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagElement<any, S>, model: Object3D): void;
+    protected updateTagCss3DObjectMatrix<S extends 'Model' | 'Plane' = 'Model'>(tag: TagInstance<TagContentType, S>, model: Object3D): void;
     /** 添加模型标签 */
     protected addMediaModelTag(tags: Tag[]): Promise<void>;
     /**
@@ -55,5 +55,5 @@ export declare abstract class TagRender extends TagComputer {
      */
     protected clearUnusedPanelTag(): void;
     /** 加载外部模型 */
-    protected loadModel: (tag: TagElement<'Model', 'Model'> | TagElement<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
+    protected loadModel: (tag: TagInstance<'Model', 'Model'> | TagInstance<'MediaModel', 'Model'>) => Promise<TagGLTFObject>;
 }

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -19,8 +19,8 @@ var C = (f, h, t) => new Promise((e, o) => {
 });
 import { TagComputer as w } from "./TagComputer.js";
 import { Group as S, Quaternion as O, Vector3 as v, Matrix4 as D } from "three";
-import x from "../Components/TagContainer.js";
-import A from "../Components/Tag/index.js";
+import A from "../Components/TagContainer.js";
+import x from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as y } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
 import { isMediaModelTag as P, isStickModelTag as I } from "../utils/tag/tagCheck.js";
@@ -164,7 +164,7 @@ class ti extends w {
           customID: t.id,
           isTagModel: !0,
           removeEventListener: this.addObjectClickHandler(t, r.scene, (g) => {
-            console.log("🐶 ==> tag:", t), this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
+            this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
           })
         });
         return s.visible = this.getCurrentVisibleState(t), new D().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (l = (m = (p = this.config) == null ? void 0 : p.globalConfig) == null ? void 0 : m.modelConfig) != null && l.autoLookAtEnabled && ((d = (c = t.config) == null ? void 0 : c.modelConfig) != null && d.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
@@ -279,7 +279,7 @@ class ti extends w {
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
-        const l = new A({
+        const l = new x({
           target: m.container,
           props: {
             tag: e,
@@ -335,6 +335,8 @@ class ti extends w {
     if (!i)
       return;
     const n = P(t) ? t.data.mediaPosition : t.position;
+    if (!n || n.length !== 4 || !Array.isArray(n[0]) || !Array.isArray(n[2]))
+      return;
     e.updateWorldMatrix(!1, !1);
     const a = e.matrixWorld, r = new v().fromArray(n[0]), s = new v().fromArray(n[2]), u = G(r, s).add(new v(0, 0, 5e-4)), p = new D().setPosition(u), m = new D().makeScale(o, o, o), l = new D().multiply(a).multiply(p).multiply(m);
     l.decompose(i.position, i.quaternion, i.scale);
@@ -360,7 +362,7 @@ class ti extends w {
       const o = (e = this.five.getElement()) == null ? void 0 : e.parentElement;
       if (!o)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new x({
+      this.TagContainerSvelte = new A({
         target: o,
         props: { hooks: this.hooks, tags: t, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });

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

@@ -1,21 +1,21 @@
-import type { TagElement, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
+import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
 import * as THREE from 'three';
-import type { Tag, Tags, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, ModelElement } from '../typings';
+import type { Tag, Tags, PointTagInstance, Point3DTag } from '../typings';
 import { TagCache } from './TagCache';
 import type { CSS3DRenderPluginExportType } from '../../CSS3DRenderPlugin';
 import type { Five } from '@realsee/five';
 import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
-    tags: TagElement[];
+    tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
     protected store: {
         /** 清理函数数组 */
-        disposers: (() => any)[];
+        disposers: (() => void)[];
         visibleWithAnimation?: boolean;
-        css3DRenderDisposer: Map<TagId, (() => any)[]>;
+        css3DRenderDisposer: Map<TagId, (() => void)[]>;
         eventListenerDisposer?: () => void;
         resizeObserverDisposer?: () => void;
         resizeObserverDisposerAdding: boolean;
@@ -25,20 +25,20 @@ export declare abstract class TagUtil extends TagCache {
     protected domEvents: FiveDomEvents;
     private mouseInfo?;
     protected constructor(five: Five);
-    getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S> | undefined;
+    getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
     pauseCurrentMedia(): void;
     /**
      * @description: 获取merge后的配置
      * TODO: 缓存
      */
-    getTagConfig(tag: Tag<any, any>): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", StickType>;
+    getTagConfig(tag: Tag): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
     protected loadVideoFirstFrame(): void;
     protected updateTagConfig(params?: {
         force?: boolean;
     }): void;
-    protected can<T extends TagElement<any, any>>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
-    protected getRenderType(tag: TagElement<any, any>): 'Dom' | 'Mesh' | 'BehindDom';
+    protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
+    protected getRenderType(tag: TagInstance): 'Dom' | 'Mesh' | 'BehindDom';
     /**
      * @description: 获取角度
      */
@@ -46,18 +46,18 @@ export declare abstract class TagUtil extends TagCache {
     /**
      * @description: 获取距离
      */
-    protected getDistance(tag: Tag<any, any>, panoIndex?: number): number;
-    protected getPositions(tag: TagElement<any, any>): any;
+    protected getDistance(tag: TagInstance, panoIndex?: number): number;
+    protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
     protected preventWhenMouseDown: () => false | void;
-    protected addObjectClickHandler(tag: TagElement<any, any>, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
-    protected getTagNormal(tag: TagElement<any, 'Plane'> | TagElement<any, 'Model'> | TagElement<any, '3DPoint'>): THREE.Vector3;
-    protected get filterPointTag(): PointTagElement[];
-    protected get filter2DPointTag(): Point2DElement[];
-    protected get filter3DPointTag(): Point3DElement[];
-    protected get filterImagePlane(): PlaneTagElement<"MediaPlane">[];
-    protected get filterMediaModel(): ModelElement<"MediaModel">[];
-    protected get filterModelTag(): ModelElement[];
-    protected get filterCSS3DTag(): (TagElement<any, "Plane"> | TagElement<any, "Model"> | TagElement<any, "3DPoint">)[];
+    protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
+    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 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -2,8 +2,8 @@ var y = Object.defineProperty;
 var D = (c, u, e) => u in c ? y(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e;
 var l = (c, u, e) => (D(c, typeof u != "symbol" ? u + "" : u, e), e);
 import { objectAssignDeepExports as T } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as C from "three";
-import { DefaultConfig as P } from "../tag.config.js";
+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";
@@ -11,9 +11,9 @@ import { normalPositionToPositions as k } from "../utils/normalPositionToPositio
 import { TagCache as b } from "./TagCache.js";
 import { writable as I } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as A } from "../../shared-utils/device.js";
-import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V } from "../utils/tag/tagCheck.js";
-import { VideoPlane as F } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as L } from "../../shared-utils/five/FiveDomEvents.js";
+import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V, isPoint3DTag as F } from "../utils/tag/tagCheck.js";
+import { VideoPlane as L } 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";
@@ -41,11 +41,11 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/threex/domevents/index.js";
-class De extends b {
+class Pe extends b {
   constructor(e) {
     super(e);
     l(this, "tags", []);
-    l(this, "config", P);
+    l(this, "config", C);
     l(this, "mediaStore", I({
       currentMediaElement: null
     }));
@@ -57,7 +57,7 @@ class De extends b {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents", new L(this.five));
+    l(this, "domEvents", new R(this.five));
     l(this, "mouseInfo");
     l(this, "preventWhenMouseDown", () => {
       var e;
@@ -67,7 +67,7 @@ class De extends b {
     this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((t) => {
         var o;
-        if (t.mediaPlane instanceof F && i !== t.mediaPlane.videoInstance) {
+        if (t.mediaPlane instanceof L && i !== t.mediaPlane.videoInstance) {
           if (!((o = t.mediaPlane.videoInstance) != null && o.src) || i === t.mediaPlane.videoInstance)
             return;
           t.mediaPlane.pause();
@@ -134,7 +134,6 @@ class De extends b {
       i.mergedConfig = t, i.data = T({}, i.data, t.initialData);
     });
   }
-  // eslint-disable-next-line complexity
   can(e, i) {
     const t = i, o = this.getTagConfig(t);
     if (!o || typeof o != "object")
@@ -192,7 +191,7 @@ class De extends b {
       const s = E(e.position);
       if (!s)
         return;
-      const n = new C.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
+      const n = new P.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
       return o.angle = m, o.angle;
     }
   }
@@ -223,12 +222,8 @@ class De extends b {
       return e.position;
     if (g(e))
       return e.data.mediaPosition;
-    const i = e;
-    return k(
-      this.five.camera.position,
-      h(i.position),
-      h(i.normal)
-    );
+    if (F(e))
+      return k(this.five.camera.position, h(e.position), h(e.normal));
   }
   addObjectClickHandler(e, i, t) {
     if (!i || !this.domEvents)
@@ -307,7 +302,9 @@ class De extends b {
     return this.tags.filter((e) => e.stickType === "Model");
   }
   get filterCSS3DTag() {
-    return this.tags.filter((i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel").filter((i) => {
+    return this.tags.filter(
+      (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
+    ).filter((i) => {
       const t = this.getRenderType(i);
       return t === "BehindDom" || t === "Dom";
     });
@@ -321,5 +318,5 @@ class De extends b {
   }
 }
 export {
-  De as TagUtil
+  Pe as TagUtil
 };

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

@@ -1,7 +1,7 @@
-import type { Tag, PartialDeep, TagId, Tags, TagElement, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
+import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig, PartialObjectDeep } from '../typings';
 import type { PickTagContentTypeInContentTypeConfigKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
-import { Five } from '@realsee/five';
+import { type Five } from '@realsee/five';
 import { TagRender } from './TagRender';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagRender {
@@ -25,7 +25,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 添加标签
      */
-    addTag(tag: Tag<any, any> | Tag<any, any>[], paramsConfig?: AddTagConfig): Promise<void>;
+    addTag(tag: Tag | Tag[], paramsConfig?: AddTagConfig): Promise<void>;
     /**
      * @description: 改变配置
      */
@@ -69,23 +69,23 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 改变data
      */
-    changeDataById<C extends TagContentType = any>(id: TagId, data: PartialDeep<Tag<C>['data']>, deepMerge?: boolean): void;
+    changeDataById<C extends TagContentType = TagContentType>(id: TagId, data: PartialObjectDeep<Tag<C>['data']>, deepMerge?: boolean): void;
     /**
      * @description: 改变tag的stickType
      */
-    changeStickTypeById<C extends TagContentType = any>(id: TagId, data: PartialDeep<{
+    changeStickTypeById<C extends TagContentType = TagContentType>(id: TagId, data: PartialObjectDeep<{
         [P in keyof Pick<Tag<C>, 'stickType' | 'position' | 'normal' | 'data'>]: Tag[P];
     }>, deepMerge?: boolean): void;
     /**
      * @description: 改变tag任意属性
      */
-    changeTagById<C extends TagContentType = any>(id: TagId, tag: PartialDeep<Tag<C>>, deepMerge?: boolean): void;
+    changeTagById<C extends TagContentType = TagContentType>(id: TagId, tag: PartialObjectDeep<Tag<C>>, deepMerge?: boolean): void;
     /**
      * @description: 销毁tag
      */
     destroyTagById(id: TagId | TagId[]): void;
     /** 更改 tag 模型 */
-    changeTagModel: (tag: TagElement<any, 'Model'>, data: PartialDeep<Tag<'MediaModel'>['data']>) => Promise<void>;
+    changeTagModel: (tag: TagInstance<'Model', 'Model'> | TagInstance<'MediaModel', 'Model'>, data: PartialObjectDeep<Tag<'MediaModel'>['data']>) => Promise<void>;
     /**
      * @description: 设置 visible 和 unfolded
      */

package/libs/PanoTagPlugin/controller/index.js

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

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,8 @@
 import t from "./controller/index.js";
 import { pluginFlag as Ar } from "./controller/index.js";
-import { ContentType as Er } from "./typings/tag/TagData.js";
-import { DimensionType as Hr } from "./typings/tag/Utils.js";
+import { DimensionType as Er } from "./typings/tag/Utils.js";
+import { ContentType as Hr } from "./typings/tag/TagData.js";
+import { PointType as Jr } from "./Archive/deprecated.js";
 import "three";
 import "@realsee/five";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
@@ -135,10 +136,11 @@ import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
 const qr = (o, r) => new t(o, r);
 export {
-  Er as ContentType,
-  Hr as DimensionType,
+  Hr as ContentType,
+  Er as DimensionType,
   qr as PanoTagPlugin,
   t as PanoTagPluginController,
+  Jr as PointType,
   qr as default,
   Ar as pluginFlag
 };

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

@@ -25,22 +25,22 @@ export interface EventMap extends BasePlugin.EventMap<State> {
         event: Event;
     } & ({
         target: 'TagPoint';
-        tag: PointTagElement<any>;
+        tag: PointTagInstance;
     } | {
         target: 'TagContent';
-        tag: TagElement<any, any>;
+        tag: TagInstance;
     } | {
         target: 'AudioTagPlayIcon';
-        tag: TagElement;
+        tag: TagInstance;
         audioInstance: HTMLAudioElement;
     } | {
         target: 'TagModel';
-        tag: TagElement<'Model', 'Model'> | TagElement<'MediaModel', 'Model'>;
+        tag: TagInstance<'Model', 'Model'> | TagInstance<'MediaModel', 'Model'>;
     })) => void;
     playStateChange: (params: {
         event: Event;
         state: 'playing' | 'paused';
-        tag: TagElement;
+        tag: TagInstance;
         mediaInstance: HTMLMediaElement;
     }) => void;
     exposure: (params: {
@@ -82,8 +82,8 @@ export interface TagCacheInterface {
         reason?: string;
     };
 }
-export type TagElement<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
-    pointTagStyle: {
+export type TagInstance<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
+    screenPosition: {
         leftPercent: number;
         topPercent: number;
     } | null;
@@ -113,7 +113,7 @@ export type TagElement<C extends TagContentType = TagContentType, S extends Stic
         unfolded: boolean;
     };
     hooks: Subscribe<TagEvents>;
-    mergedConfig: TagConfig<C, S>;
+    mergedConfig: TagConfig<C>;
     unfold: () => void;
     fold: () => void;
     enable: () => void;
@@ -123,9 +123,5 @@ export type TagElement<C extends TagContentType = TagContentType, S extends Stic
 export type MediaStore = Writable<{
     currentMediaElement: HTMLMediaElement | null;
 }>;
-export type PointTagElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint' | '2DPoint'>;
-export type PlaneTagElement<C extends TagContentType = TagContentType> = TagElement<C, 'Plane'>;
-export type Point2DElement<C extends TagContentType = TagContentType> = TagElement<C, '2DPoint'>;
-export type Point3DElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint'>;
-export type ModelElement<C extends TagContentType = TagContentType> = TagElement<C, 'Model'>;
+export type PointTagInstance<C extends TagContentType = TagContentType> = TagInstance<C, '3DPoint' | '2DPoint'>;
 export {};

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

@@ -3,4 +3,5 @@ export * from './tag/Tag';
 export * from './tag/Utils';
 export * from './tag/TagData';
 export * from './tag/TagConfig';
-export type { PartialDeep } from 'type-fest';
+export * from '../Archive/deprecated';
+export type { ContentTypeMap, TagContentType } from './tag/TagData';

package/libs/PanoTagPlugin/typings/index.js

@@ -1,6 +1,8 @@
-import { ContentType as n } from "./tag/TagData.js";
-import { DimensionType as r } from "./tag/Utils.js";
+import { DimensionType as p } from "./tag/Utils.js";
+import { ContentType as t } from "./tag/TagData.js";
+import { PointType as m } from "../Archive/deprecated.js";
 export {
-  n as ContentType,
-  r as DimensionType
+  t as ContentType,
+  p as DimensionType,
+  m as PointType
 };

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

@@ -1,10 +1,8 @@
 import type { State as FiveState } from '@realsee/five';
 import type { TagConfig } from './TagConfig';
-import { type ContentTypeMap, ContentType, type TagContentType } from './TagData';
+import type { ContentTypeMap, TagContentType } from './TagData';
 import type { Position, TagId, StickType, TagStyle, ElementRenderer, PickTagContentTypeInContentTypeConfigKey, ContentTypeConfigKey } from './Utils';
-import { type DeprecatedTagProperty } from '../../Archive/deprecated';
-export type { ContentTypeMap, TagContentType };
-export { ContentType };
+import type { DeprecatedTagProperty } from '../../Archive/deprecated';
 export interface Tags {
     version?: string;
     /** tag配置 > 按type配置 > 全局配置 */
@@ -15,13 +13,13 @@ export interface Tags {
         [key in ContentTypeConfigKey]?: PickTagContentTypeInContentTypeConfigKey<key> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<key>> : unknown;
     };
     /** 标签列表配置 */
-    tagList: Tag<any, any>[];
+    tagList: Tag[];
 }
 export type Tag<C extends TagContentType = TagContentType, S extends StickType = StickType> = DeprecatedTagProperty & {
     /** 开启/禁用 */
     enabled?: boolean;
     /** 唯一标识 */
-    id: TagId;
+    id?: TagId;
     /** @type {StickType} 附着方式 */
     stickType: S;
     /** @type {TagContentType} 内容类型，根据内容类型展示对应UI */
@@ -35,9 +33,9 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
     /** 标签 wrapper 的 classname */
     className?: string;
     /** 标签数据 */
-    data: C extends TagContentType ? ContentTypeMap[C] : ContentTypeMap[keyof ContentTypeMap];
+    data?: C extends TagContentType ? ContentTypeMap[C] : ContentTypeMap[keyof ContentTypeMap];
     /** 「展开/收起」 「可见/不可见」 的策略配置 */
-    config?: TagConfig<C, S>;
+    config?: TagConfig<C>;
     /** 打标签时的 five state */
     fiveState?: FiveState;
     /** 样式 */

package/libs/PanoTagPlugin/typings/tag/Tag.js

@@ -1,4 +1 @@
-import { ContentType as t } from "./TagData.js";
-export {
-  t as ContentType
-};
+