@realsee/dnalogel 2.16.2-alpha.0 → 2.17.0-aplha.1

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,7 +1,7 @@
 var w = Object.defineProperty;
-var O = (d, p, e) => p in d ? w(d, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[p] = e;
-var c = (d, p, e) => (O(d, typeof p != "symbol" ? p + "" : p, e), e);
-var P = (d, p, e) => new Promise((t, i) => {
+var E = (c, d, e) => d in c ? w(c, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[d] = e;
+var h = (c, d, e) => (E(c, typeof d != "symbol" ? d + "" : d, e), e);
+var T = (c, d, e) => new Promise((t, i) => {
   var o = (s) => {
     try {
       a(e.next(s));
@@ -15,14 +15,14 @@ var P = (d, p, e) => new Promise((t, i) => {
       i(r);
     }
   }, a = (s) => s.done ? t(s.value) : Promise.resolve(s.value).then(o, n);
-  a((e = e.apply(d, p)).next());
+  a((e = e.apply(c, d)).next());
 });
-import { TagComputer as x } from "./TagComputer.js";
-import { Group as b, Quaternion as I, Vector3 as D, Matrix4 as T } from "three";
-import E from "../Components/TagContainer.js";
+import { TagComputer as O } from "./TagComputer.js";
+import { Group as b, Quaternion as k, Vector3 as D, Matrix4 as P } from "three";
+import x from "../Components/TagContainer.js";
 import G from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as v } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { centerPoint as k } from "../../shared-utils/three/centerPoint.js";
+import { centerPoint as I } from "../../shared-utils/three/centerPoint.js";
 import "@realsee/five/gltf-loader";
 import { VideoPlane as R, ImagePlane as j } from "../utils/model/mediaPlane.js";
 import { isMediaModelTag as S } from "../utils/tag/tagCheck.js";
@@ -67,12 +67,14 @@ import "../utils/normalPositionToPositions.js";
 import "./TagCache.js";
 import "../../base/BasePlugin.js";
 import "../../vendor/svelte/store/index.js";
+import "../../shared-utils/five/FiveDomEvents.js";
+import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/three/Quadrangle.js";
 import "../../shared-utils/math/pointIsRectangle.js";
 import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
-import "../../shared-utils/five/FiveDomEvents.js";
+import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../Components/TagItem.js";
 import "../utils/noTypecheck.js";
 import "../Components/Common/TagPoint.js";
@@ -138,16 +140,16 @@ import "../Components/Tag/CustomTag.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 const F = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class Zt extends x {
+class ei extends O {
   constructor(e) {
     super(e);
-    c(this, "group", new b());
-    c(this, "imagePlaneGroup", new b());
-    c(this, "gltfObjectGroup", new b());
-    c(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
-    c(this, "temporaryState", { visible: !0 });
-    c(this, "TagContainerSvelte");
-    c(this, "loadModel", (e) => P(this, null, function* () {
+    h(this, "group", new b());
+    h(this, "imagePlaneGroup", new b());
+    h(this, "gltfObjectGroup", new b());
+    h(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    h(this, "temporaryState", { visible: !0 });
+    h(this, "TagContainerSvelte");
+    h(this, "loadModel", (e) => T(this, null, function* () {
       var s;
       const t = e.data.modelUrl;
       if (!t)
@@ -157,7 +159,7 @@ class Zt extends x {
       const o = yield i;
       if (((s = e.model) == null ? void 0 : s.promise) !== i || (e.model.object = o, !this.tags.includes(e)))
         return;
-      o.visible = this.getCurrentVisibleState(e), new T().fromArray(e.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), o.visible = this.getVisibleByFloorIndex(e);
+      o.visible = this.getCurrentVisibleState(e), new P().fromArray(e.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), o.visible = this.getVisibleByFiveMode(e);
       const a = this.gltfObjectGroup.children.find((r) => r.customID === e.id);
       if (a && this.gltfObjectGroup.remove(a), this.getRenderType(e) === "Mesh") {
         if (!e.mediaPlane) {
@@ -185,26 +187,31 @@ class Zt extends x {
   }
   updateRenderImagePlane() {
     this.sort(this.filterImagePlane).forEach((t) => {
-      var s, r, m;
+      var s, r, m, u;
       const i = t.data.mediaData[0];
       if (!i)
         return;
-      const o = i.url, n = i.type;
-      if (!o || (t.mediaPlane && (t.mediaPlane.visible = (r = (s = t.state) == null ? void 0 : s.visible) != null ? r : !0, t.mediaPlane instanceof R && !t.mediaPlane.visible && t.mediaPlane.pause()), ((m = t.mediaPlane) == null ? void 0 : m.src) === o))
+      const { url: o, type: n } = i;
+      if (!o || (t.mediaPlane && (t.mediaPlane.visible = (r = (s = t.state) == null ? void 0 : s.visible) != null ? r : !0, t.mediaPlane.visible || t.mediaPlane instanceof R && t.mediaPlane.pause()), ((m = t.mediaPlane) == null ? void 0 : m.src) === o))
         return;
       const a = t.position.map(v);
       if (t.mediaPlane && t.mediaPlane.removeFromParent(), n === "Image")
-        t.mediaPlane = new j(o, a);
+        t.mediaPlane = new j(o, a), this.domEvents.addAutoBindEventListener(t.mediaPlane, "click", (p) => {
+          this.hooks.emit("click", { tag: t, target: "TagContent", event: p.origDomEvent });
+        });
       else if (n === "Video") {
-        const l = new R(o, a, {
+        const p = new R(o, a, {
           videoCoverSrc: i.videoCoverUrl,
           playButton: t.data.playIcon,
+          paused: !((u = t.data.autoplayConfig) != null && u.autoplayVideo),
           videoTextureMap: F,
           ImageTextureMap: B
         });
-        l.videoInstance.addEventListener("play", () => {
-          this.mediaStore.set({ currentMediaElement: l.videoInstance });
-        }), l.initialDomEvents(this.five), l.initialRenderHooks(this.five), t.mediaPlane = l;
+        p.onVideoReady = (l) => {
+          l.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: p.videoInstance }));
+        }, p.initialDomEvents(this.domEvents);
+        const f = (l) => (this.five.on("renderFrame", l), () => this.five.off("renderFrame", l));
+        p.initialRenderHooks(f), t.mediaPlane = p;
       }
       this.imagePlaneGroup.add(t.mediaPlane);
     });
@@ -215,7 +222,7 @@ class Zt extends x {
       if (t.tag3DContentSvelte) {
         const { svelteApp: n, css3DInstance: a, initialNormal: s, currentNormal: r } = t.tag3DContentSvelte;
         if (n.$set({ tag: t, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(r)) {
-          const m = new I().setFromUnitVectors(s, r);
+          const m = new k().setFromUnitVectors(s, r);
           a.css3DObject.setRotationFromQuaternion(m);
         }
         return;
@@ -233,14 +240,14 @@ class Zt extends x {
         const r = (o = this.getTagConfig(t).tag3DConfig) != null ? o : {};
         if (this.getRenderType(t) === "BehindDom") {
           r.mode = "behind", r.container = document.createElement("div");
-          const f = "black";
-          r.container.style.backgroundColor = f, r.container.style.border = `3px solid ${f}`, this.css3DRenderPlugin.hooks.on("render", () => {
-            var u;
+          const p = "black";
+          r.container.style.backgroundColor = p, r.container.style.border = `3px solid ${p}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            var f;
             if (m.css3DObject.opacityMesh) {
-              const h = this.addObjectClickHandler(t, m.css3DObject.opacityMesh, (g) => {
+              const l = this.addObjectClickHandler(t, m.css3DObject.opacityMesh, (g) => {
                 this.hooks.emit("click", { event: g, target: "TagContent", tag: t });
               });
-              (u = this.store.css3DRenderDisposer.get(t.id)) == null || u.push(h);
+              (f = this.store.css3DRenderDisposer.get(t.id)) == null || f.push(l);
             }
           });
         }
@@ -248,7 +255,7 @@ class Zt extends x {
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(t.id, [m.dispose]);
-        const l = new G({
+        const u = new G({
           target: m.container,
           props: {
             tag: t,
@@ -259,13 +266,13 @@ class Zt extends x {
           }
         });
         t.tag3DContentSvelte = {
-          svelteApp: l,
+          svelteApp: u,
           domContainer: m,
           css3DInstance: m,
           initialNormal: a,
           currentNormal: a,
           dispose: () => {
-            l.$destroy(), m.dispose();
+            u.$destroy(), m.dispose();
           }
         };
       }
@@ -287,19 +294,19 @@ class Zt extends x {
     });
   }
   updateTagCss3DObjectMatrix(e, t) {
-    var g, C, M, y;
-    const i = (M = (C = (g = e.mergedConfig) == null ? void 0 : g.tag3DConfig) == null ? void 0 : C.ratio) != null ? M : 216e-5, o = (y = e.tag3DContentSvelte) == null ? void 0 : y.css3DInstance.css3DObject;
+    var g, C, y, M;
+    const i = (y = (C = (g = e.mergedConfig) == null ? void 0 : g.tag3DConfig) == null ? void 0 : C.ratio) != null ? y : 216e-5, o = (M = e.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
     if (!o)
       return;
     const n = S(e) ? e.data.mediaPosition : e.position;
     t.updateWorldMatrix(!1, !1);
-    const a = t.matrixWorld, s = new D().fromArray(n[0]), r = new D().fromArray(n[2]), m = k(s, r).add(new D(0, 0, 5e-4)), l = new T().setPosition(m), f = new T().makeScale(i, i, i), u = new T().multiply(a).multiply(l).multiply(f);
-    u.decompose(o.position, o.quaternion, o.scale);
-    const h = o.opacityMesh;
-    h && u.decompose(h.position, h.quaternion, h.scale);
+    const a = t.matrixWorld, s = new D().fromArray(n[0]), r = new D().fromArray(n[2]), m = I(s, r).add(new D(0, 0, 5e-4)), u = new P().setPosition(m), p = new P().makeScale(i, i, i), f = new P().multiply(a).multiply(u).multiply(p);
+    f.decompose(o.position, o.quaternion, o.scale);
+    const l = o.opacityMesh;
+    l && f.decompose(l.position, l.quaternion, l.scale);
   }
   addMediaModelTag(e) {
-    return P(this, null, function* () {
+    return T(this, null, function* () {
       const t = e.filter(S).map((i) => this.loadModel(i));
       yield Promise.all(t), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
@@ -313,7 +320,7 @@ class Zt extends x {
       const i = (t = this.five.getElement()) == null ? void 0 : t.parentElement;
       if (!i)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new E({
+      this.TagContainerSvelte = new x({
         target: i,
         props: { hooks: this.hooks, tags: e, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });
@@ -351,5 +358,5 @@ class Zt extends x {
   }
 }
 export {
-  Zt as TagRender
+  ei as TagRender
 };

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

@@ -4,6 +4,7 @@ import type { Tag, Tags, Point2DElement, Point3DElement, PlaneTagElement, PointT
 import { TagCache } from './TagCache';
 import { CSS3DRenderPluginExportType } from '../../CSS3DRenderPlugin';
 import { Five } from '@realsee/five';
+import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
     tags: TagElement[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
@@ -21,7 +22,7 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected get isPanorama(): boolean;
-    private domEvents?;
+    protected domEvents: FiveDomEvents;
     private mouseInfo?;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S> | undefined;

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,9 +1,9 @@
 var T = Object.defineProperty;
-var y = (u, m, e) => m in u ? T(u, m, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[m] = e;
-var l = (u, m, e) => (y(u, typeof m != "symbol" ? m + "" : m, e), e);
+var y = (m, u, e) => u in m ? T(m, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[u] = e;
+var l = (m, u, e) => (y(m, typeof u != "symbol" ? u + "" : u, e), e);
 import D from "object-assign-deep";
-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 g } from "../utils/planeNormal.js";
 import { tagPosition as E, getTagPosition as k } from "../utils/tagPosition.js";
@@ -15,8 +15,9 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five";
 import { isMediaPlaneTag as x, isMediaModelTag as v, isPlaneTag as V } from "../utils/tag/tagCheck.js";
-import { DomEvents as L } from "../../shared-utils/threex/domevents/index.js";
-import { VideoPlane as S } from "../utils/model/mediaPlane.js";
+import "../../shared-utils/threex/domevents/index.js";
+import { VideoPlane as F } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as L } from "../../shared-utils/five/FiveDomEvents.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/three/loadTexture.js";
 import "hammerjs";
@@ -49,12 +50,12 @@ import "../../shared-utils/math/pointIsRectangle.js";
 import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
-import "../../shared-utils/five/FiveDomEvents.js";
-class Ae extends b {
+import "../../shared-utils/three/FragmentTransparencyMaterial.js";
+class xe extends b {
   constructor(e) {
     super(e);
     l(this, "tags", []);
-    l(this, "config", P);
+    l(this, "config", C);
     l(this, "mediaStore", I({
       currentMediaElement: null
     }));
@@ -65,17 +66,21 @@ class Ae extends b {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents");
+    l(this, "domEvents", new L(this.five));
     l(this, "mouseInfo");
     l(this, "preventWhenMouseDown", () => {
       var e;
       if ((e = this.mouseInfo) != null && e.isDown)
         return !1;
     });
-    const i = this.five.getElement();
-    i && (this.domEvents = new L(this.five.camera, i)), this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: o }) => {
-      this.tags.forEach((t) => {
-        t.mediaPlane instanceof S && o !== t.mediaPlane.videoInstance && t.mediaPlane.pause();
+    this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
+      this.tags.forEach((o) => {
+        var t;
+        if (o.mediaPlane instanceof F && i !== o.mediaPlane.videoInstance) {
+          if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
+            return;
+          o.mediaPlane.pause();
+        }
       });
     }), this.store.disposers.push(() => {
       this.five.off("wantsMoveToPano", this.preventWhenMouseDown), this.five.off("wantsTapGesture", this.preventWhenMouseDown);
@@ -187,7 +192,7 @@ class Ae extends b {
       const n = E(e.position);
       if (!n)
         return;
-      const c = new C.Vector3().copy(f).sub(n), p = s.angleTo(c) * 180 / Math.PI;
+      const c = new P.Vector3().copy(f).sub(n), p = s.angleTo(c) * 180 / Math.PI;
       return t.angle = p, t.angle;
     }
   }
@@ -308,5 +313,5 @@ class Ae extends b {
   }
 }
 export {
-  Ae as TagUtil
+  xe as TagUtil
 };

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

@@ -1,5 +1,5 @@
 import type { Tag, PartialDeep, TagId, Tags, TagElement, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
-import type { TagContentType } from '..';
+import type { PickTagContentTypeInContentTypeConfigKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
 import { Five } from '@realsee/five';
 import { TagRender } from './TagRender';
@@ -37,7 +37,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 改变类型配置
      */
-    changeContentTypeConfig(key: ContentTypeConfigKey, contentTypeConfig: TagConfig, merge?: boolean): void;
+    changeContentTypeConfig<T extends ContentTypeConfigKey>(key: ContentTypeConfigKey, contentTypeConfig: PickTagContentTypeInContentTypeConfigKey<T> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<T>> : unknown, merge?: boolean): void;
     show(params?: {
         userAction?: boolean;
         withAnimation?: boolean;

package/libs/PanoTagPlugin/controller/index.js

@@ -1,16 +1,16 @@
-var S = Object.defineProperty, P = Object.defineProperties;
-var U = Object.getOwnPropertyDescriptors;
-var T = Object.getOwnPropertySymbols;
-var F = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var S = Object.defineProperty, F = Object.defineProperties;
+var P = Object.getOwnPropertyDescriptors;
+var b = Object.getOwnPropertySymbols;
+var M = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
 var u = (d, a, e) => a in d ? S(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, l = (d, a) => {
   for (var e in a || (a = {}))
-    F.call(a, e) && u(d, e, a[e]);
-  if (T)
-    for (var e of T(a))
-      E.call(a, e) && u(d, e, a[e]);
+    M.call(a, e) && u(d, e, a[e]);
+  if (b)
+    for (var e of b(a))
+      U.call(a, e) && u(d, e, a[e]);
   return d;
-}, m = (d, a) => P(d, U(a));
-var p = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
+}, m = (d, a) => F(d, P(a));
+var c = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
 var f = (d, a, e) => new Promise((t, i) => {
   var s = (n) => {
     try {
@@ -27,15 +27,15 @@ var f = (d, a, e) => new Promise((t, i) => {
   }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, o);
   r((e = e.apply(d, a)).next());
 });
-import { Subscribe as M } from "@realsee/five";
-import c from "object-assign-deep";
-import { arrayPositionToVector3 as C } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { addDebugPoints as w } from "../utils/addDebugPoints.js";
+import { Subscribe as w } from "@realsee/five";
+import p from "object-assign-deep";
+import { arrayPositionToVector3 as T } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { addDebugPoints as E } from "../utils/addDebugPoints.js";
 import "three";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/threex/domevents/index.js";
-import { isMediaModelTag as v } from "../utils/tag/tagCheck.js";
+import { isMediaModelTag as C } from "../utils/tag/tagCheck.js";
 import { waitFiveModelLoaded as I } from "../utils/actionAfterFiveModelLoad.js";
 import { debounce as A } from "../utils/debounce.js";
 import { throttle as B } from "../utils/throttle.js";
@@ -87,7 +87,9 @@ import "../../shared-utils/math/pointIsRectangle.js";
 import "../../shared-utils/three/loadVideoTexture.js";
 import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
+import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/five/FiveDomEvents.js";
+import "../../shared-utils/five/getFloorIndex.js";
 import "../Components/TagContainer.js";
 import "../Components/TagItem.js";
 import "../Components/Tag/index.js";
@@ -154,25 +156,26 @@ import "../Components/Common/TagPoint.js";
 import "../../CSS3DRenderPlugin/index.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
-const D = "Dnalogel-PanoTagPlugin", si = (d) => `${D}--${d}`;
-class oi extends k {
+const D = "Dnalogel-PanoTagPlugin", ni = (d) => `${D}--${d}`;
+class ri extends k {
   constructor(e, t) {
     super(e);
-    p(this, "state", { enabled: !0, visible: !0 });
-    p(this, "params");
-    p(this, "debug");
-    p(this, "changeTagModel", (e, t) => f(this, null, function* () {
-      e.data = c({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
+    c(this, "state", { enabled: !0, visible: !0 });
+    c(this, "params");
+    c(this, "debug");
+    c(this, "changeTagModel", (e, t) => f(this, null, function* () {
+      e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
-    p(this, "handleFiveInitAnimationEnded", () => {
+    c(this, "handleFiveInitAnimationEnded", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        v(t) && e === "Panorama" && this.changeTagMode(t, "front"), t.state.visible = this.getVisible(t);
+        C(t) && e === "Panorama" && this.changeTagMode(t, "front"), t.state.visible = this.getVisible(t);
       }), this.updateRenderAllTags();
     });
-    p(this, "handleFiveModelShownFloorChange", () => {
+    c(this, "handleFiveModelShownFloorChange", () => {
       this.tags.forEach((e) => {
-        !v(e) || (e.state.visible = this.getVisible(e));
+        const t = this.getTagConfig(e).visibleConfig;
+        typeof t == "object" && (t.visibleFiveMode.includes("Floorplan") || t.visibleFiveMode.includes("Mapview")) && (e.state.visible = this.getVisibleByFiveMode(e));
       }), this.updateRenderAllTags();
     });
     this.params = l({ debug: !1, config: this.config }, t), this.debug = this.params.debug, this.config = this.params.config, O(1, { namespace: _.PlayAudio });
@@ -185,14 +188,14 @@ class oi extends k {
   load(e, t) {
     return f(this, null, function* () {
       var s, o;
-      this.clearTags(), console.info(D, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = c({}, this.config, {
+      this.clearTags(), console.info(D, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
       const i = yield this.addTag(e.tagList, t);
       if (this.debug)
         try {
-          w(this.five, this.tags);
+          E(this.five, this.tags);
         } catch (r) {
           console.error(r);
         }
@@ -204,11 +207,12 @@ class oi extends k {
       const s = (Array.isArray(e) ? e : [e]).map((o) => {
         const r = this.getTagConfig(o);
         return m(l({}, o), {
+          data: p({}, r.initialData, o.data),
           state: l({
             visible: void 0,
             unfolded: !this.can("fold", o)
           }, r.initialState),
-          hooks: new M(),
+          hooks: new w(),
           mergedConfig: r,
           unfold: () => this.changeUnfoldedById(o.id, !0),
           fold: () => this.changeUnfoldedById(o.id, !1),
@@ -224,13 +228,13 @@ class oi extends k {
     });
   }
   changeConfig(e, t = !0) {
-    t ? this.config = c({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = c({}, 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({ force: !0 }), this.updateRenderAllTags();
   }
   changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = c({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.clearCache(), 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.clearCache(), this.updateRenderAllTags();
   }
   show(e) {
     return f(this, null, function* () {
@@ -292,18 +296,18 @@ class oi extends k {
   }
   changeTagNormalById(e, t) {
     const i = this.getTagById(e);
-    !i || !i.tag3DContentSvelte || (i.tag3DContentSvelte.currentNormal = C(t));
+    !i || !i.tag3DContentSvelte || (i.tag3DContentSvelte.currentNormal = T(t));
   }
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
-    !s || (i ? s.data = c({}, s.data, t) : s.data = l(l({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags());
+    !s || (i ? s.data = p({}, s.data, t) : s.data = l(l({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags());
   }
   changeStickTypeById(e, t, i = !0) {
     this.changeTagById(e, t, i);
   }
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
-    !t || (i ? c(s, t) : Object.assign(s, t), (s == null ? void 0 : s.tag3DContentSvelte) && (t == null ? void 0 : t.normal) && (s.tag3DContentSvelte.currentNormal = C(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
+    !t || (i ? p(s, t) : Object.assign(s, t), (s == null ? void 0 : s.tag3DContentSvelte) && (t == null ? void 0 : t.normal) && (s.tag3DContentSvelte.currentNormal = T(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
   }
   destroyTagById(e) {
     (Array.isArray(e) ? e : [e]).forEach((i) => {
@@ -341,8 +345,8 @@ class oi extends k {
     }), this.five.needsRender = !0;
   }
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), h = this.loadVideoFirstFrame.bind(this), g = this.clickhandler.bind(this), b = this.five.currentMode;
-    return b && this.handleFiveModeChange(b), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", h), t.on("click", g), () => {
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), h = this.loadVideoFirstFrame.bind(this), g = this.clickhandler.bind(this), v = this.five.currentMode;
+    return v && this.handleFiveModeChange(v), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", h), t.on("click", g), () => {
       e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", r), e.off("panoArrived", n), e.off("panoArrived", h), t.off("click", g), this.store.eventListenerDisposer = void 0;
     };
   }
@@ -376,7 +380,7 @@ class oi extends k {
   }
   handleFiveModeChange(e) {
     this.setModelMedialVisible(), this.tags.forEach((t) => {
-      v(t) && e !== "Panorama" && this.changeTagMode(t, "behind"), t.state.visible = this.getVisible(t);
+      C(t) && e !== "Panorama" && this.changeTagMode(t, "behind"), t.state.visible = this.getVisible(t);
     }), this.updateRenderAllTags();
   }
   handleFiveWantsMoveToPano() {
@@ -426,7 +430,7 @@ class oi extends k {
   }
 }
 export {
-  oi as PanoTagPluginController,
-  oi as default,
-  si as pluginFlag
+  ri as PanoTagPluginController,
+  ri as default,
+  ni as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import t from "./controller/index.js";
-import { default as kr, pluginFlag as qr } from "./controller/index.js";
-import { ContentType as zr } from "./typings/tag/TagData.js";
-import { DimensionType as Br } from "./typings/tag/Utils.js";
+import { default as vr, pluginFlag as zr } from "./controller/index.js";
+import { ContentType as Br } from "./typings/tag/TagData.js";
+import { DimensionType as Gr } from "./typings/tag/Utils.js";
 import "@realsee/five";
 import "object-assign-deep";
 import "../CSS3DRenderPlugin/utils/positionToVector3.js";
@@ -62,7 +62,9 @@ import "../shared-utils/math/pointIsRectangle.js";
 import "../shared-utils/three/loadVideoTexture.js";
 import "./Assets/Icon.js";
 import "../shared-utils/three/getPositionsByObjectFit.js";
+import "../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../shared-utils/five/FiveDomEvents.js";
+import "../shared-utils/five/getFloorIndex.js";
 import "./Components/TagContainer.js";
 import "./Components/TagItem.js";
 import "./Components/Tag/index.js";
@@ -129,12 +131,12 @@ import "./Components/Common/TagPoint.js";
 import "../CSS3DRenderPlugin/index.js";
 import "../CSS3DRenderPlugin/Controller.js";
 import "../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
-const br = (o, r) => new t(o, r);
+const jr = (o, r) => new t(o, r);
 export {
-  zr as ContentType,
-  Br as DimensionType,
-  br as PanoTagPlugin,
-  kr as PanoTagPluginController,
-  br as default,
-  qr as pluginFlag
+  Br as ContentType,
+  Gr as DimensionType,
+  jr as PanoTagPlugin,
+  vr as PanoTagPluginController,
+  jr as default,
+  zr as pluginFlag
 };

package/libs/PanoTagPlugin/tag.config.js

@@ -49,6 +49,13 @@ const e = {
       },
       visibleConfig: {
         alwaysShowWhenMovePano: !0
+      },
+      initialData: {
+        autoplayConfig: {
+          autoplayCarousel: !0,
+          autoplayVideo: !1,
+          autoplayVideoInCarousel: !1
+        }
       }
     },
     MediaModel: {

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

@@ -28,7 +28,7 @@ export interface EventMap extends BasePlugin.EventMap<State> {
         tag: PointTagElement<any>;
     } | {
         target: 'TagContent';
-        tag: TagElement;
+        tag: TagElement<any, any>;
     } | {
         target: 'AudioTagPlayIcon';
         tag: TagElement;

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

@@ -1,7 +1,8 @@
 import type { State as FiveState } from '@realsee/five';
 import type { TagConfig } from './TagConfig';
 import { ContentTypeMap, ContentType, TagContentType } from './TagData';
-import type { ContentTypeConfigKey, Position, TagId, StickType, TagStyle, ElementRenderer } from './Utils';
+import type { Position, TagId, StickType, TagStyle, ElementRenderer, PickTagContentTypeInContentTypeConfigKey, ContentTypeConfigKey } from './Utils';
+import { DeprecatedTagProperty } from '../../Archive/deprecated';
 export type { ContentTypeMap, TagContentType };
 export { ContentType };
 export interface Tags {
@@ -10,21 +11,19 @@ export interface Tags {
     /** 全局配置 */
     globalConfig?: TagConfig;
     /** 按type配置 */
-    contentTypeConfig?: Partial<Record<ContentTypeConfigKey, TagConfig>>;
+    contentTypeConfig?: {
+        [key in ContentTypeConfigKey]?: PickTagContentTypeInContentTypeConfigKey<key> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<key>> : unknown;
+    };
     /** 标签列表配置 */
     tagList: Tag[];
 }
-export declare type Tag<C extends TagContentType = TagContentType, S extends StickType = StickType> = {
+export declare type Tag<C extends TagContentType = TagContentType, S extends StickType = StickType> = DeprecatedTagProperty & {
     /** 开启/禁用 */
     enabled?: boolean;
     /** 唯一标识 */
     id: TagId;
-    /** @deprecated 一个点的标签/4个点的标签，已废弃，使用 stickType 代替 */
-    pointType?: 'PlaneTag' | 'PointTag';
     /** @type {StickType} 附着方式 */
     stickType: S;
-    /**  @deprecated 2维/3维类型，已废弃，使用 stickType 代替 */
-    dimensionType?: '2D' | '3D';
     /** @type {TagContentType} 内容类型，根据内容类型展示对应UI */
     contentType: C;
     /** 点 */