@realsee/dnalogel 3.5.0-tag-dev.1 → 3.5.0

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

@@ -5,9 +5,9 @@ import type { Object3D } from 'three';
 import TagContainerSvelte from '../Components/TagContainer.svelte';
 import type { Five } from '@realsee/five';
 export declare abstract class TagRender extends TagComputer {
+    rendererMap: TagRendererMap;
+    contentTypeMap: TagContentTypeMapping;
     protected group: TagObjectGroup;
-    protected rendererMap: TagRendererMap;
-    protected contentTypeMap: TagContentTypeMapping;
     protected imagePlaneGroup: ImagePlaneGroup;
     protected gltfObjectGroup: TagGLTFObjectGroup;
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -163,9 +163,9 @@ const $ = /* @__PURE__ */ new Map(), q = /* @__PURE__ */ new Map();
 class fi extends I {
   constructor(t) {
     super(t);
-    h(this, "group", new y());
     h(this, "rendererMap", /* @__PURE__ */ new Map());
     h(this, "contentTypeMap", /* @__PURE__ */ new Map());
+    h(this, "group", new y());
     h(this, "imagePlaneGroup", new y());
     h(this, "gltfObjectGroup", new y());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */

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

@@ -73,5 +73,7 @@ export declare abstract class TagUtil extends TagCache {
     /**
      * @description: 获取merge后的配置
      */
-    private calculateTagConfig;
+    protected calculateTagConfig(tag: Tag | TagInstance, params?: {
+        useCache?: boolean;
+    }): TagInstance['computedConfig'];
 }

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,39 +1,39 @@
-var X = Object.defineProperty, q = Object.defineProperties;
-var K = Object.getOwnPropertyDescriptors;
+var q = Object.defineProperty, K = Object.defineProperties;
+var Q = Object.getOwnPropertyDescriptors;
 var R = Object.getOwnPropertySymbols;
-var Q = Object.prototype.hasOwnProperty, Y = Object.prototype.propertyIsEnumerable;
-var w = (a, s, e) => s in a ? X(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, b = (a, s) => {
+var Y = Object.prototype.hasOwnProperty, Z = Object.prototype.propertyIsEnumerable;
+var w = (a, s, e) => s in a ? q(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, M = (a, s) => {
   for (var e in s || (s = {}))
-    Q.call(s, e) && w(a, e, s[e]);
+    Y.call(s, e) && w(a, e, s[e]);
   if (R)
     for (var e of R(s))
-      Y.call(s, e) && w(a, e, s[e]);
+      Z.call(s, e) && w(a, e, s[e]);
   return a;
-}, _ = (a, s) => q(a, K(s));
+}, B = (a, s) => K(a, Q(s));
 var d = (a, s, e) => (w(a, typeof s != "symbol" ? s + "" : s, e), e);
-import { defaultGlobalConfig as Z } from "../typings/tag/TagConfig.js";
+import { defaultGlobalConfig as ee } from "../typings/tag/TagConfig.js";
 import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as ee from "three";
-import { DefaultConfig as ie } from "../tag.config.js";
+import * as ie from "three";
+import { DefaultConfig as te } from "../tag.config.js";
 import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
 import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as B } from "../utils/tagPosition.js";
-import { normalPositionToPositions as te } from "../utils/normalPositionToPositions.js";
-import { TagCache as oe } from "./TagCache.js";
-import { writable as re } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as ne } from "../../shared-utils/device.js";
-import { Five as se } from "@realsee/five";
-import { isMediaPlaneTag as fe, isMediaModelTag as N, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
-import { VideoPlane as le } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as de } from "../../shared-utils/five/FiveDomEvents.js";
-import $ from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as A, isModelLike as z } from "../../shared-utils/five/mode.js";
+import { getTagCenterPosition as N } from "../utils/tagPosition.js";
+import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
+import { TagCache as re } from "./TagCache.js";
+import { writable as ne } from "../../vendor/svelte/store/index.js";
+import { isIOSWX as se } from "../../shared-utils/device.js";
+import { Five as fe } from "@realsee/five";
+import { isMediaPlaneTag as ae, isMediaModelTag as $, isPlaneTag as ce, isPoint3DTag as le } from "../utils/tag/tagCheck.js";
+import { VideoPlane as de } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as ue } from "../../shared-utils/five/FiveDomEvents.js";
+import z from "../utils/tag/adaptConfig.js";
+import { isPanoramaLike as A, isModelLike as H } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { entries as H } from "../../shared-utils/typescript/entries.js";
-import { getUrlExt as J } from "../../shared-utils/url/getUrl.js";
+import { entries as J } from "../../shared-utils/typescript/entries.js";
+import { getUrlExt as U } from "../../shared-utils/url/getUrl.js";
 import { transformPosition as O } from "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
@@ -60,12 +60,12 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
-class fi extends oe {
+class ai extends re {
   constructor(e) {
     super(e);
     d(this, "tags", []);
-    d(this, "config", ie);
-    d(this, "mediaStore", re({
+    d(this, "config", te);
+    d(this, "mediaStore", ne({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
@@ -76,7 +76,7 @@ class fi extends oe {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new de(this.five));
+    d(this, "domEvents", new ue(this.five));
     d(this, "_workCode");
     d(this, "getObserverPosition", (e) => {
       var o, t;
@@ -85,12 +85,12 @@ class fi extends oe {
         return O(i.position, (t = this.work) == null ? void 0 : t.options.transform);
     });
     d(this, "loadVideoFirstFrame", () => {
-      ne && this.hooks.emit("loadVideoFirstFrame");
+      se && this.hooks.emit("loadVideoFirstFrame");
     });
     this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((o) => {
         var t;
-        if (o.mediaPlane instanceof le && i !== o.mediaPlane.videoInstance) {
+        if (o.mediaPlane instanceof de && i !== o.mediaPlane.videoInstance) {
           if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
             return;
           o.mediaPlane.pause();
@@ -172,15 +172,15 @@ class fi extends oe {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (fe(e)) {
+        if (ae(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return "Mesh";
             if (t[0].type === "Image")
-              return J(t[0].url) === "gif" ? "Dom" : "Mesh";
+              return U(t[0].url) === "gif" ? "Dom" : "Mesh";
           }
-        } else if (N(e))
-          return t.length === 1 && t[0].type === "Image" ? J(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
+        } else if ($(e))
+          return t.length === 1 && t[0].type === "Image" ? U(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
     return i != null ? i : "Dom";
@@ -202,10 +202,10 @@ class fi extends oe {
       const r = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
       if (!r)
         return;
-      const f = B(e);
+      const f = N(e);
       if (!f)
         return;
-      const c = new ee.Vector3().copy(n).sub(f), g = r.angleTo(c) * 180 / Math.PI;
+      const c = new ie.Vector3().copy(n).sub(f), g = r.angleTo(c) * 180 / Math.PI;
       return t.angle = g, t.angle;
     }
   }
@@ -213,10 +213,10 @@ class fi extends oe {
    * @description: 获取距离
    */
   getDistance(e, i) {
-    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    const o = M(M({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((r == null ? void 0 : r.distance) !== void 0)
       return r.distance;
-    const f = B(e);
+    const f = N(e);
     if (!f)
       return -1;
     if (A(n)) {
@@ -226,16 +226,16 @@ class fi extends oe {
       const g = c.distanceTo(f);
       return r && (r.distance = g), g;
     }
-    if (z(n))
+    if (H(n))
       return this.five.camera.position.distanceTo(f);
   }
   getPositions(e) {
-    if (ae(e))
+    if (ce(e))
       return e.position;
-    if (N(e))
+    if ($(e))
       return e.data.mediaPosition;
-    if (ce(e))
-      return te(this.five.camera.position, C(e.position), C(e.normal));
+    if (le(e))
+      return oe(this.five.camera.position, C(e.position), C(e.normal));
   }
   addObjectClickHandler(e, i, o) {
     if (!i || !this.domEvents)
@@ -300,16 +300,20 @@ class fi extends oe {
    * @description: 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var j, S, I, W;
+    var j, S, I, W, F;
     const o = (j = i == null ? void 0 : i.useCache) != null ? j : !0;
     if (!e)
       return (S = this.config.globalConfig) != null ? S : {};
-    if (o && ((I = e.config) != null && I._isMerged))
-      return e.config;
+    if (o) {
+      if ((I = e == null ? void 0 : e.computedConfig) != null && I._isMerged)
+        return e.computedConfig;
+      if ((W = e == null ? void 0 : e.config) != null && W._isMerged)
+        return e.config;
+    }
     const t = {}, n = {}, r = {};
     this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, p]) => {
-      var V, L;
-      const l = u, D = l.split("-"), F = u.startsWith("["), T = F ? D[0].slice(1, -1) : void 0, h = F ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (V = n[T]) != null ? V : n[T] = {} : (L = r[T]) != null ? L : r[T] = {} : t;
+      var L, _;
+      const l = u, D = l.split("-"), V = u.startsWith("["), T = V ? D[0].slice(1, -1) : void 0, h = V ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (L = n[T]) != null ? L : n[T] = {} : (_ = r[T]) != null ? _ : r[T] = {} : t;
       if (!v[l]) {
         if (h.length === 0 && (v[l] = p), h.length === 1) {
           const [m] = h;
@@ -320,26 +324,26 @@ class fi extends oe {
           m === "Mixin" && e.contentType === P && (v[l] = p), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (v[l] = p);
         }
         if (h.length === 3) {
-          const [m = "Any", P, G] = h;
+          const [m = "Any", P, X] = h;
           if (P === "Audio" && e.contentType === "Audio") {
             const x = e;
-            (x.stickType === m || m === "Any") && x.data.appearance === G && (v[l] = p);
+            (x.stickType === m || m === "Any") && x.data.appearance === X && (v[l] = p);
           }
         }
       }
     });
-    const f = (W = e.config) != null && W._isMerged ? e.initialConfig : e.config, c = y({}, Z, this.config.globalConfig, ...Object.values(t)), g = y({}, c, f), k = {}, U = Object.values(se.Mode);
-    H(n).forEach(([u, p]) => {
-      U.forEach((l) => {
-        (u === "PanoramaLike" && A(l) || u === "ModelLike" && z(l)) && (k[l] = y({}, c, ...Object.values(p), f));
+    const f = (F = e.initialConfig) != null ? F : {}, c = y({}, ee, this.config.globalConfig, ...Object.values(t)), g = y({}, c, f), k = {}, G = Object.values(fe.Mode);
+    J(n).forEach(([u, p]) => {
+      G.forEach((l) => {
+        (u === "PanoramaLike" && A(l) || u === "ModelLike" && H(l)) && (k[l] = y({}, c, ...Object.values(p), f, { _isMerged: !0 }));
       });
-    }), H(r).forEach(([u, p]) => {
-      k[u] = y({}, c, ...Object.values(p), f);
+    }), J(r).forEach(([u, p]) => {
+      k[u] = y({}, c, ...Object.values(p), f, { _isMerged: !0 });
     });
-    const M = _(b({}, g), { configWithFiveMode: k });
-    return $(M, e), Object.values(k).forEach((u) => $(u, e)), M._isMerged = !0, M;
+    const b = B(M({}, g), { configWithFiveMode: k });
+    return z(b, e), Object.values(k).forEach((u) => z(u, e)), b._isMerged = !0, b;
   }
 }
 export {
-  fi as TagUtil
+  ai as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -2,7 +2,7 @@ var E = Object.defineProperty, U = Object.defineProperties;
 var I = Object.getOwnPropertyDescriptors;
 var A = Object.getOwnPropertySymbols;
 var R = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, c = (d, a) => {
+var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, g = (d, a) => {
   for (var e in a || (a = {}))
     R.call(a, e) && u(d, e, a[e]);
   if (A)
@@ -11,7 +11,7 @@ var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writab
   return d;
 }, v = (d, a) => U(d, I(a));
 var l = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
-var f = (d, a, e) => new Promise((t, i) => {
+var c = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
     try {
       n(e.next(r));
@@ -29,15 +29,15 @@ var f = (d, a, e) => new Promise((t, i) => {
 });
 import * as b from "three";
 import { Subscribe as F } from "@realsee/five";
-import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { addDebugPoints as M } from "../utils/addDebugPoints.js";
 import { arrayPositionToVector3 as P } from "../../shared-utils/positionToVector3.js";
-import { isMediaModelTag as _, isModelTag as k } from "../utils/tag/tagCheck.js";
-import { debounce as O } from "../utils/debounce.js";
+import { isMediaModelTag as O, isModelTag as _ } from "../utils/tag/tagCheck.js";
+import { debounce as k } from "../utils/debounce.js";
 import { throttle as V } from "../utils/throttle.js";
 import { resizeObserver as D } from "../utils/resizeObserver.js";
 import L from "../utils/tag/format.js";
-import { generateBlankAudio as G, AudioNamespace as N } from "../../shared-utils/audio.js";
+import { generateBlankAudio as N, AudioNamespace as G } from "../../shared-utils/audio.js";
 import { TagRender as z } from "./TagRender.js";
 import { uuid as x } from "../../shared-utils/uuid.js";
 import { isModelLike as $ } from "../../shared-utils/five/mode.js";
@@ -46,7 +46,7 @@ import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import { tweenProgress as W } from "../../shared-utils/animationFrame/BetterTween.js";
-import { waitFiveModelLoaded as j } from "../../shared-utils/five/fiveModelLoad.js";
+import { waitFiveModelLoaded as J } from "../../shared-utils/five/fiveModelLoad.js";
 import "./TagComputer.js";
 import "../utils/tagPosition.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -169,8 +169,8 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const S = "Dnalogel-PanoTagPlugin", Ei = (d) => `${S}--${d}`;
-class Ui extends z {
+const S = "Dnalogel-PanoTagPlugin", Ui = (d) => `${S}--${d}`;
+class Ii extends z {
   constructor(e, t) {
     super(e);
     /** state */
@@ -180,8 +180,8 @@ class Ui extends z {
     /** debug */
     l(this, "debug");
     /** 更改 tag 模型 */
-    l(this, "changeTagModel", (e, t) => f(this, null, function* () {
-      e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
+    l(this, "changeTagModel", (e, t) => c(this, null, function* () {
+      e.data = f({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
     l(this, "whyHide", (e) => {
       var i, s, o;
@@ -205,7 +205,7 @@ class Ui extends z {
     l(this, "updateVisible", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        _(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
+        O(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
       }), this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "handleFiveWantsMoveToPano", (e) => {
@@ -244,10 +244,10 @@ class Ui extends z {
     l(this, "handleFiveCameraUpdate", () => {
       this.updatePointTagPosition();
     });
-    l(this, "handleFivePanoArrived", () => f(this, null, function* () {
+    l(this, "handleFivePanoArrived", () => c(this, null, function* () {
       this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
-        e.temporaryState = v(c({}, e.temporaryState), { visible: !0 });
-      }), this.tags.filter(k).filter((e) => {
+        e.temporaryState = v(g({}, e.temporaryState), { visible: !0 });
+      }), this.tags.filter(_).filter((e) => {
         var t;
         return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
@@ -259,8 +259,8 @@ class Ui extends z {
         const s = this.five.camera.position;
         t.lookAt(s.clone().setY(t.position.y));
         const o = i.quaternion.clone(), n = t.quaternion.clone(), r = W();
-        r.onUpdate(({ progress: g }) => {
-          i.quaternion.copy(o.clone().slerp(n, g));
+        r.onUpdate(({ progress: p }) => {
+          i.quaternion.copy(o.clone().slerp(n, p));
         }), r.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     }));
@@ -271,7 +271,7 @@ class Ui extends z {
     l(this, "onFiveEveryReady", () => {
       this.setUnfoldedByCamera(), $(this.five.getCurrentState().mode) && (this.setTagZIndex(this.filterPointTag), this.setVisible(), this.setPointTagPosition()), this.updateDomView({ withAnimation: !0 }), this.updateRenderVideoPlane(), this.updateRenderImagePlane(), this.updateTagModelVisible();
     });
-    this.params = p({}, { debug: !1, config: this.config }, c({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: N.PlayAudio });
+    this.params = f({}, { debug: !1, config: this.config }, g({}, t)), this.debug = this.params.debug, this.config = this.params.config, N(1, { namespace: G.PlayAudio });
     try {
       const i = window;
       Array.isArray(i.__PANOTAGPLUGIN_DEBUG_LIST__) || (i.__PANOTAGPLUGIN_DEBUG_LIST__ = []), i.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), i.__PANOTAGPLUGIN_DEBUG__ = this;
@@ -282,9 +282,9 @@ class Ui extends z {
    * @description: 加载数据
    */
   load(e, t) {
-    return f(this, null, function* () {
+    return c(this, null, function* () {
       var s, o;
-      this.clearTags(), console.debug(S, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
+      this.clearTags(), console.debug(S, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
@@ -302,26 +302,27 @@ class Ui extends z {
    * @description: 添加标签
    */
   addTag(e, t) {
-    return f(this, null, function* () {
+    return c(this, null, function* () {
       const s = (Array.isArray(e) ? e : [e]).filter((o) => o.position).map((o) => {
         var T, y, C;
-        const n = this.getTagConfig(o), r = JSON.parse(JSON.stringify(o.data)), h = o.config;
-        return o.config = n, v(c({}, o), {
+        const n = JSON.parse(JSON.stringify(o.data)), r = o.config ? JSON.parse(JSON.stringify(o.config)) : void 0, h = this.calculateTagConfig(o), p = this.getTagConfig(o);
+        return o.config = p, v(g({}, o), {
           enabled: (T = o.enabled) != null ? T : !0,
           id: (y = o.id) != null ? y : x(),
-          data: (C = n.initialData) != null && C.important ? p(o.data, r, n.initialData) : p(o.data, n.initialData, r),
-          state: c({
+          data: (C = p.initialData) != null && C.important ? f(o.data, n, p.initialData) : f(o.data, p.initialData, n),
+          state: g({
             visible: void 0,
             unfolded: !this.can("fold", o)
-          }, n.initialState),
+          }, p.initialState),
           hooks: new F(),
           originPosition: o.position,
           position: (() => {
             const m = this.getTransformedPostion(o.position);
             return Array.isArray(m) ? m.map((w) => w.toArray()) : m.toArray();
           })(),
-          initialConfig: h,
-          config: n,
+          initialConfig: r,
+          computedConfig: h,
+          config: p,
           unfold: () => this.changeUnfoldedById(o.id, !0),
           fold: () => this.changeUnfoldedById(o.id, !1),
           enable: () => this.changeEnabledById(o.id, !0),
@@ -330,7 +331,7 @@ class Ui extends z {
           changeData: (m) => this.changeDataById(o.id, m)
         });
       });
-      return s.forEach(L), this.tags.push(...s), j(this.five).then(() => f(this, null, function* () {
+      return s.forEach(L), this.tags.push(...s), J(this.five).then(() => c(this, null, function* () {
         var o, n, r;
         this.store.eventListenerDisposer && ((n = (o = this.store).eventListenerDisposer) == null || n.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.addMediaModelTag(s), this.setVisibleAndUnfolded({ withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : !0 }), this.updatePointTagPosition(), this.updateRenderAllTags();
       }));
@@ -340,22 +341,22 @@ class Ui extends z {
    * @description: 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig(), this.updateRenderAllTags();
+    t ? this.config = f({}, 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(), this.updateRenderAllTags();
+    t ? this.config.globalConfig = f({}, 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(), this.updateRenderAllTags();
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = f({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig(), this.updateRenderAllTags();
   }
   show(e) {
-    return f(this, null, function* () {
+    return c(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -363,7 +364,7 @@ class Ui extends z {
     });
   }
   hide(e) {
-    return f(this, null, function* () {
+    return c(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -385,7 +386,7 @@ class Ui extends z {
   setState(e, t) {
     if (this.checkDisposed())
       return;
-    const { userAction: i = !0, visibleWithAnimation: s = !1 } = t != null ? t : {}, o = c({}, this.state);
+    const { userAction: i = !0, visibleWithAnimation: s = !1 } = t != null ? t : {}, o = g({}, this.state);
     this.state = Object.assign(this.state, e), this.store.visibleWithAnimation = s, o.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), o.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: i });
   }
   /**
@@ -428,7 +429,7 @@ class Ui extends z {
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
     let o = !1;
-    s && (s.data && (o = !0), i ? s.data = p(s.data, t) : s.data = c(c({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), o && s.hooks.emit("dataChanged", s.data));
+    s && (s.data && (o = !0), i ? s.data = f(s.data, t) : s.data = g(g({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 改变tag的stickType
@@ -442,7 +443,7 @@ class Ui extends z {
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
     let o = !1;
-    t && (t.data && (o = !0), i ? p(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = P(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
+    t && (t.data && (o = !0), i ? f(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = P(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 销毁tag
@@ -457,7 +458,7 @@ class Ui extends z {
    * @description: 设置 visible 和 unfolded
    */
   setVisibleAndUnfolded() {
-    return f(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
+    return c(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
       return this.setVisible(), e ? new Promise((t) => {
         setTimeout(() => {
           this.setUnfoldedByPanoIndex(), t();
@@ -520,7 +521,7 @@ class Ui extends z {
       }, 500),
       e
     ), { observe: n, unobserve: r } = D(
-      O(() => t(), 400),
+      k(() => t(), 400),
       e
     );
     return s(), n(), () => {
@@ -539,11 +540,11 @@ class Ui extends z {
   }
   changeTagMode(e, t) {
     var i, s, o, n, r, h;
-    ((i = e.config) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.forEach((g) => g == null ? void 0 : g()), e.tag3DContentSvelte = void 0);
+    ((i = e.config) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.forEach((p) => p == null ? void 0 : p()), e.tag3DContentSvelte = void 0);
   }
 }
 export {
-  Ui as PanoTagPluginController,
-  Ui as default,
-  Ei as pluginFlag
+  Ii as PanoTagPluginController,
+  Ii as default,
+  Ui as pluginFlag
 };

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

@@ -43,7 +43,8 @@ export type TagInstance<C extends TagContentType = TagContentType, S extends Sti
         visible?: boolean;
         unfolded: boolean;
     };
-    config: TagConfig<C> & {
+    config: TagConfig<C>;
+    computedConfig: TagConfig<C> & {
         configWithFiveMode?: {
             [key in Mode]?: TagConfig<C>;
         };

package/libs/PanoTagPlugin/utils/tag/adaptConfig.d.ts

@@ -1,2 +1,2 @@
 import type { Tag, TagConfig } from '../..';
-export default function adaptConfig(config: TagConfig, tag?: Tag): void;
+export default function adaptConfig(config: TagConfig, tag?: Tag): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;

package/libs/PanoTagPlugin/utils/tag/adaptConfig.js

@@ -2,7 +2,7 @@ function v(e, l) {
   var d, f, o, s, b;
   typeof e.visibleConfig == "object" && (e.visibleConfig.visibleFiveMode = (o = (f = e.visibleConfig.visibleFiveMode) != null ? f : (d = l == null ? void 0 : l.fiveState) == null ? void 0 : d.mode) != null ? o : "Panorama", e.visibleConfig.keep && (e.visibleConfig.keep === "visible" ? e.visibleConfig = { keep: e.visibleConfig.keep, visibleFiveMode: (s = e.visibleConfig) == null ? void 0 : s.visibleFiveMode } : e.visibleConfig.keep === "hidden" && (e.visibleConfig = { keep: e.visibleConfig.keep }))), typeof e.unfoldedConfig == "object" && (e.unfoldedConfig.disableFold && (e.unfoldedConfig = { keep: "unfolded" }), e.unfoldedConfig.disableUnfold && (e.unfoldedConfig = { keep: "folded" }), e.unfoldedConfig.keep && (e.unfoldedConfig = { keep: e.unfoldedConfig.keep }));
   const i = (b = e.initialState) != null ? b : {};
-  typeof e.unfoldedConfig == "object" && (e.unfoldedConfig.keep === "unfolded" ? i.unfolded = !0 : e.unfoldedConfig.keep === "folded" && (i.unfolded = !1)), typeof e.visibleConfig == "object" && (e.visibleConfig.keep === "visible" ? i.visible = !0 : e.visibleConfig.keep === "hidden" && (i.visible = !1)), e.initialState = i;
+  return typeof e.unfoldedConfig == "object" && (e.unfoldedConfig.keep === "unfolded" ? i.unfolded = !0 : e.unfoldedConfig.keep === "folded" && (i.unfolded = !1)), typeof e.visibleConfig == "object" && (e.visibleConfig.keep === "visible" ? i.visible = !0 : e.visibleConfig.keep === "hidden" && (i.visible = !1)), e.initialState = i, e;
 }
 export {
   v as default

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.5.0-tag-dev.1");
+    i(this, "VERSION", "3.5.0");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.5.0-tag-dev.1",
+    "%c %c@realsee/dnalogel %cv3.5.0",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.5.0-tag-dev.1",
+  "version": "3.5.0",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",

package/docs/.nojekyll

@@ -1 +0,0 @@
-TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.