@realsee/dnalogel 3.0.0-10 → 3.0.0-12

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,19 +1,19 @@
-var $ = Object.defineProperty, E = Object.defineProperties;
+var E = Object.defineProperty, $ = Object.defineProperties;
 var L = Object.getOwnPropertyDescriptors;
 var k = Object.getOwnPropertySymbols;
 var _ = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var M = (p, e, i) => e in p ? $(p, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : p[e] = i, y = (p, e) => {
+var M = (p, e, i) => e in p ? E(p, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : p[e] = i, y = (p, e) => {
   for (var i in e || (e = {}))
     _.call(e, i) && M(p, i, e[i]);
   if (k)
     for (var i of k(e))
       z.call(e, i) && M(p, i, e[i]);
   return p;
-}, D = (p, e) => E(p, L(e));
+}, D = (p, e) => $(p, L(e));
 import * as j from "three";
 import { is3DTag as O, isMediaModelTag as R } from "../utils/tag/tagCheck.js";
 import { getTagCenterPosition as I, getTagPosition as Z } from "../utils/tagPosition.js";
-import { checkRange as g } from "../utils/checkRange.js";
+import { checkRange as h } from "../utils/checkRange.js";
 import { isPanoramaLike as b, isModelLike as H } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "@realsee/five";
@@ -114,7 +114,7 @@ class Ge extends q {
         }
         if (b(n) && s.visibleDistance !== void 0 && (o.push("visibleDistance"), s.visibleDistance !== "unLimited")) {
           const a = this.getDistance(e);
-          if (g(a, s.visibleDistance) === !1)
+          if (h(a, s.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: o,
@@ -124,7 +124,7 @@ class Ge extends q {
         if (b(n) && s.angleRange && O(e)) {
           o.push("angleRange");
           const a = this.getAngle(e);
-          if (g(a, s.angleRange) === !1)
+          if (h(a, s.angleRange) === !1)
             return { value: !1, checkedList: o, reason: `angle is not in angleRange. angle: ${a}, angleRange: ${s.angleRange}` };
         }
         if (s.intersectRaycaster !== !1 && (typeof s.intersectRaycaster != "object" || s.intersectRaycaster.enabled !== !1)) {
@@ -167,7 +167,7 @@ class Ge extends q {
           return !1;
         if (n.keep === "unfolded")
           return !0;
-        if (n.unfoldDistance && g(this.getDistance(e), n.unfoldDistance) === !1)
+        if (n.unfoldDistance && h(this.getDistance(e), n.unfoldDistance) === !1)
           return !1;
       })();
       t.unfolded = d;
@@ -193,7 +193,7 @@ class Ge extends q {
           return;
         if (t.autoUnfold.strategy === "ScreenPostion") {
           const d = this.getTagProject(e);
-          if (d && g(d.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+          if (d && h(d.x, t.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (t.autoUnfold.strategy === "MinimumDistance") {
@@ -208,7 +208,7 @@ class Ge extends q {
             return !(typeof f == "function" || f.keep || f.autoUnfold === !1 || ((u = f.autoUnfold) == null ? void 0 : u.enable) === !1 || ((a = f.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
           }).map((r) => D(y({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: f }) => {
             const u = f.autoUnfold.distance;
-            return !(u && g(r, u) === !1);
+            return !(u && h(r, u) === !1);
           }).sort((r, f) => r.distance - f.distance).findIndex((r) => r.id === e.id);
           if (c === -1 || c <= ((n = t.autoUnfold.maxNumber) != null ? n : 1) - 1 === !1)
             return !1;
@@ -218,7 +218,9 @@ class Ge extends q {
     })() : void 0;
   }
   setTagZIndex(e) {
-    console.log("🐶 ==> setTagZIndex:");
+    return e.forEach((i) => {
+      i.zIndex = this.calculateTagZIndex(i);
+    });
   }
   calculateTagZIndex(e) {
     const i = this.getDistance(e);
@@ -281,15 +283,15 @@ class Ge extends q {
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
     const d = X(
       (() => {
-        var h;
-        const m = (h = l.checkPoints) != null ? h : "center";
+        var g;
+        const m = (g = l.checkPoints) != null ? g : "center";
         return m === "center" ? I(e) : m === "corner" ? Z(e) : Array.isArray(m) ? m : [];
       })()
     );
     let o = 0, c = 0;
     for (const m of d) {
-      const h = new j.Vector3().subVectors(m, n).normalize();
-      T.set(n, h);
+      const g = new j.Vector3().subVectors(m, n).normalize();
+      T.set(n, g);
       const F = n.distanceTo(m), [P] = this.five.model.intersectRaycaster(T), x = (() => {
         if (!R(e))
           return;

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,16 +1,16 @@
-var A = Object.defineProperty;
+var V = Object.defineProperty;
 var j = Object.getOwnPropertySymbols;
-var V = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
-var y = (c, d, t) => d in c ? A(c, d, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[d] = t, w = (c, d) => {
-  for (var t in d || (d = {}))
-    V.call(d, t) && y(c, t, d[t]);
+var A = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
+var y = (d, p, t) => p in d ? V(d, p, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[p] = t, w = (d, p) => {
+  for (var t in p || (p = {}))
+    A.call(p, t) && y(d, t, p[t]);
   if (j)
-    for (var t of j(d))
-      x.call(d, t) && y(c, t, d[t]);
-  return c;
+    for (var t of j(p))
+      x.call(p, t) && y(d, t, p[t]);
+  return d;
 };
-var b = (c, d, t) => (y(c, typeof d != "symbol" ? d + "" : d, t), t);
-var M = (c, d, t) => new Promise((e, o) => {
+var P = (d, p, t) => (y(d, typeof p != "symbol" ? p + "" : p, t), t);
+var M = (d, p, t) => new Promise((e, o) => {
   var i = (r) => {
     try {
       a(t.next(r));
@@ -24,7 +24,7 @@ var M = (c, d, t) => new Promise((e, o) => {
       o(n);
     }
   }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, s);
-  a((t = t.apply(c, d)).next());
+  a((t = t.apply(d, p)).next());
 });
 import { TagComputer as O } from "./TagComputer.js";
 import { Group as R, Quaternion as I, Vector3 as D, Matrix4 as g } from "three";
@@ -160,34 +160,34 @@ const B = /* @__PURE__ */ new Map(), N = /* @__PURE__ */ new Map();
 class hi extends O {
   constructor(t) {
     super(t);
-    b(this, "group", new R());
-    b(this, "renderMap", /* @__PURE__ */ new Map());
-    b(this, "imagePlaneGroup", new R());
-    b(this, "gltfObjectGroup", new R());
+    P(this, "group", new R());
+    P(this, "renderMap", /* @__PURE__ */ new Map());
+    P(this, "imagePlaneGroup", new R());
+    P(this, "gltfObjectGroup", new R());
     /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
-    b(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    P(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     /** 临时状态 */
-    b(this, "temporaryState", { visible: !0 });
+    P(this, "temporaryState", { visible: !0 });
     /** 点标签 */
-    b(this, "TagContainerSvelte");
+    P(this, "TagContainerSvelte");
     /** 加载外部模型 */
-    b(this, "loadModel", (t) => M(this, null, function* () {
+    P(this, "loadModel", (t) => M(this, null, function* () {
       var a;
       const e = t.data.modelUrl;
       if (!e)
         return;
       t.loading = !0;
       const o = W(e).then((r) => {
-        var m, h, f, p, P;
+        var m, c;
         const n = Object.assign(r.scene, {
           customID: t.id,
           isTagModel: !0,
           removeEventListener: t.config.clickable === !1 ? () => {
-          } : this.addObjectClickHandler(t, r.scene, (u) => {
-            this.hooks.emit("click", { target: "TagModel", tag: t, event: u });
+          } : this.addObjectClickHandler(t, r.scene, (h) => {
+            this.hooks.emit("click", { target: "TagModel", tag: t, event: h });
           })
         });
-        return n.visible = this.getCurrentVisibleState(t), new g().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(t), (f = (h = (m = this.config) == null ? void 0 : m.globalConfig) == null ? void 0 : h.modelConfig) != null && f.autoLookAtEnabled && ((P = (p = t.config) == null ? void 0 : p.modelConfig) != null && P.autoLookAtEnabled) && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
+        return n.visible = this.getCurrentVisibleState(t), new g().fromArray(t.matrix).decompose(n.position, n.quaternion, n.scale), n.updateWorldMatrix(!0, !0), n.visible = this.getVisible(t), (c = (m = t.config) == null ? void 0 : m.modelConfig) != null && c.autoLookAtEnabled && n.lookAt(this.five.camera.position.clone().setY(n.position.y)), n;
       });
       t.model = { promise: o };
       const i = yield o;
@@ -238,30 +238,30 @@ class hi extends O {
       var o, i;
       return ((i = (o = e.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : i.type) === "Video";
     }).forEach((e) => {
-      var m, h, f, p, P;
+      var m, c, h, u, b;
       const o = e.data.mediaData[0];
       if (!o)
         return;
       const { url: i } = o;
       if (!i)
         return;
-      e.mediaPlane && !((h = (m = e.state) == null ? void 0 : m.visible) == null || h) && e.mediaPlane instanceof k && e.mediaPlane.pause();
+      e.mediaPlane && !((c = (m = e.state) == null ? void 0 : m.visible) == null || c) && e.mediaPlane instanceof k && e.mediaPlane.pause();
       const s = e.position.map(C), a = this.getCurrentVisibleState(e), r = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), l = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
-      if ((r || l) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (f = e.mediaPlane) == null || f.dispose(), (p = e.mediaPlane) == null || p.removeFromParent(), e.mediaPlane = void 0), n || l) {
-        const u = new k(i, s, {
+      if ((r || l) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (h = e.mediaPlane) == null || h.dispose(), (u = e.mediaPlane) == null || u.removeFromParent(), e.mediaPlane = void 0), n || l) {
+        const f = new k(i, s, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
-          paused: !((P = e.data.autoplayConfig) != null && P.autoplayVideo),
+          paused: !((b = e.data.autoplayConfig) != null && b.autoplayVideo),
           objectFit: e.data.objectFit,
           videoTextureMap: B,
           ImageTextureMap: N,
           domEvents: this.domEvents
         });
-        u.onVideoReady = (T) => {
-          T.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: u.videoInstance }));
+        f.onVideoReady = (T) => {
+          T.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: f.videoInstance }));
         };
         const v = (T) => (this.five.on("renderFrame", T), () => this.five.off("renderFrame", T));
-        u.initialRenderHooks(v), e.mediaPlane = u, this.imagePlaneGroup.add(e.mediaPlane);
+        f.initialRenderHooks(v), e.mediaPlane = f, this.imagePlaneGroup.add(e.mediaPlane);
       }
     });
   }
@@ -278,8 +278,8 @@ class hi extends O {
       if (!o)
         return;
       const i = e.position.map(C), s = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !s))(), r = (() => !!(!e.mediaPlane && s))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
-      (a || n) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (l = e.mediaPlane) == null || l.dispose(), (m = e.mediaPlane) == null || m.removeFromParent(), e.mediaPlane = void 0), (r || n) && (e.mediaPlane = new E(o, i, { objectFit: e.data.objectFit }), e.config.clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (h) => {
-        this.hooks.emit("click", { tag: e, target: "TagContent", event: h.origDomEvent });
+      (a || n) && (e.mediaPlane && this.imagePlaneGroup.remove(e.mediaPlane), (l = e.mediaPlane) == null || l.dispose(), (m = e.mediaPlane) == null || m.removeFromParent(), e.mediaPlane = void 0), (r || n) && (e.mediaPlane = new E(o, i, { objectFit: e.data.objectFit }), e.config.clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (c) => {
+        this.hooks.emit("click", { tag: e, target: "TagContent", event: c.origDomEvent });
       }), this.imagePlaneGroup.add(e.mediaPlane));
     });
   }
@@ -310,14 +310,14 @@ class hi extends O {
         const n = this.getTagConfig(e), l = w({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
         if (this.getRenderType(e) === "BehindDom" || l.mode === "behind") {
           l.mode = "behind", l.container = document.createElement("div");
-          const f = "black";
-          l.container.style.backgroundColor = f, l.container.style.border = `3px solid ${f}`, this.css3DRenderPlugin.hooks.on("render", () => {
-            var p;
+          const h = "black";
+          l.container.style.backgroundColor = h, l.container.style.border = `3px solid ${h}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            var u;
             if (m.css3DObject.opacityMesh && n.clickable !== !1) {
-              const P = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (u) => {
-                this.hooks.emit("click", { event: u, target: "TagContent", tag: e });
+              const b = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (f) => {
+                this.hooks.emit("click", { event: f, target: "TagContent", tag: e });
               });
-              (p = this.store.css3DRenderDisposer.get(e.id)) == null || p.push(P);
+              (u = this.store.css3DRenderDisposer.get(e.id)) == null || u.push(b);
             }
           });
         }
@@ -325,7 +325,7 @@ class hi extends O {
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
-        const h = new F({
+        const c = new F({
           target: m.container,
           props: {
             tag: e,
@@ -337,13 +337,13 @@ class hi extends O {
           }
         });
         e.tag3DContentSvelte = {
-          svelteApp: h,
+          svelteApp: c,
           domContainer: m,
           css3DInstance: m,
           initialNormal: r,
           currentNormal: r,
           dispose: () => {
-            h.$destroy(), m.dispose();
+            c.$destroy(), m.dispose();
           }
         }, S(e) && ((s = e.model) != null && s.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
@@ -376,18 +376,18 @@ class hi extends O {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var P, u, v;
-    const o = (u = (P = t.config.tag3DConfig) == null ? void 0 : P.ratio) != null ? u : 216e-5, i = (v = t.tag3DContentSvelte) == null ? void 0 : v.css3DInstance.css3DObject;
+    var b, f, v;
+    const o = (f = (b = t.config.tag3DConfig) == null ? void 0 : b.ratio) != null ? f : 216e-5, i = (v = t.tag3DContentSvelte) == null ? void 0 : v.css3DInstance.css3DObject;
     if (!i)
       return;
     const s = S(t) ? t.data.mediaPosition : t.position;
     if (!s || s.length !== 4 || !Array.isArray(s[0]) || !Array.isArray(s[2]))
       return;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new D().fromArray(s[0]), n = new D().fromArray(s[2]), l = q(r, n).add(new D(0, 0, 5e-4)), m = new g().setPosition(l), h = new g().makeScale(o, o, o), f = new g().multiply(a).multiply(m).multiply(h);
-    f.decompose(i.position, i.quaternion, i.scale);
-    const p = i.opacityMesh;
-    p && f.decompose(p.position, p.quaternion, p.scale);
+    const a = e.matrixWorld, r = new D().fromArray(s[0]), n = new D().fromArray(s[2]), l = q(r, n).add(new D(0, 0, 5e-4)), m = new g().setPosition(l), c = new g().makeScale(o, o, o), h = new g().multiply(a).multiply(m).multiply(c);
+    h.decompose(i.position, i.quaternion, i.scale);
+    const u = i.opacityMesh;
+    u && h.decompose(u.position, u.quaternion, u.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {

package/libs/PanoTagPlugin/controller/index.js

@@ -2,15 +2,15 @@ var w = Object.defineProperty, E = Object.defineProperties;
 var U = Object.getOwnPropertyDescriptors;
 var C = Object.getOwnPropertySymbols;
 var I = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var b = (d, a, e) => a in d ? w(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, c = (d, a) => {
+var m = (d, a, e) => a in d ? w(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, c = (d, a) => {
   for (var e in a || (a = {}))
-    I.call(a, e) && b(d, e, a[e]);
+    I.call(a, e) && m(d, e, a[e]);
   if (C)
     for (var e of C(a))
-      B.call(a, e) && b(d, e, a[e]);
+      B.call(a, e) && m(d, e, a[e]);
   return d;
-}, T = (d, a) => E(d, U(a));
-var l = (d, a, e) => (b(d, typeof a != "symbol" ? a + "" : a, e), e);
+}, u = (d, a) => E(d, U(a));
+var l = (d, a, e) => (m(d, typeof a != "symbol" ? a + "" : a, e), e);
 var p = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
     try {
@@ -27,13 +27,13 @@ var p = (d, a, e) => new Promise((t, i) => {
   }, n = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(s, o);
   n((e = e.apply(d, a)).next());
 });
-import * as y from "three";
+import * as v from "three";
 import { Subscribe as F } from "@realsee/five";
 import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { addDebugPoints as k } from "../utils/addDebugPoints.js";
+import { addDebugPoints as M } from "../utils/addDebugPoints.js";
 import { arrayPositionToVector3 as A } from "../../shared-utils/positionToVector3.js";
-import { isMediaModelTag as M, isModelTag as R } from "../utils/tag/tagCheck.js";
-import { debounce as _ } from "../utils/debounce.js";
+import { isMediaModelTag as R, isModelTag as _ } from "../utils/tag/tagCheck.js";
+import { debounce as k } from "../utils/debounce.js";
 import { throttle as O } from "../utils/throttle.js";
 import { resizeObserver as D } from "../utils/resizeObserver.js";
 import V from "../utils/tag/format.js";
@@ -200,7 +200,7 @@ class Di extends N {
     l(this, "updateVisible", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        M(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
+        R(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
       }), this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "handleFiveWantsMoveToPano", (e) => {
@@ -240,24 +240,23 @@ class Di extends N {
       this.updatePointTagPosition();
     });
     l(this, "handleFivePanoArrived", () => p(this, null, function* () {
-      var e, t, i;
-      this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((s) => {
-        s.temporaryState = T(c({}, s.temporaryState), { visible: !0 });
-      }), (i = (t = (e = this.config) == null ? void 0 : e.globalConfig) == null ? void 0 : t.modelConfig) != null && i.autoLookAtEnabled && this.tags.filter(R).filter((s) => {
-        var o, n;
-        return (n = (o = s.config) == null ? void 0 : o.modelConfig) == null ? void 0 : n.autoLookAtEnabled;
-      }).forEach((s) => {
-        var u;
-        const o = new y.Mesh(new y.BoxGeometry(), new y.MeshBasicMaterial()), n = (u = s.model) == null ? void 0 : u.object;
-        if (!n)
+      this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
+        e.temporaryState = u(c({}, e.temporaryState), { visible: !0 });
+      }), this.tags.filter(_).filter((e) => {
+        var t, i;
+        return (i = (t = e.config) == null ? void 0 : t.modelConfig) == null ? void 0 : i.autoLookAtEnabled;
+      }).forEach((e) => {
+        var h;
+        const t = new v.Mesh(new v.BoxGeometry(), new v.MeshBasicMaterial()), i = (h = e.model) == null ? void 0 : h.object;
+        if (!i)
           return;
-        o.position.copy(n.position), o.quaternion.copy(n.quaternion);
-        const r = this.five.camera.position;
-        o.lookAt(r.clone().setY(o.position.y));
-        const h = n.quaternion.clone(), g = o.quaternion.clone(), m = $();
-        m.onUpdate(({ progress: v }) => {
-          n.quaternion.copy(h.clone().slerp(g, v));
-        }), m.play();
+        t.position.copy(i.position), t.quaternion.copy(i.quaternion);
+        const s = this.five.camera.position;
+        t.lookAt(s.clone().setY(t.position.y));
+        const o = i.quaternion.clone(), n = t.quaternion.clone(), r = $();
+        r.onUpdate(({ progress: g }) => {
+          i.quaternion.copy(o.clone().slerp(n, g));
+        }), r.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     }));
     /** 楼层切换时，需要更新标签可见性 */
@@ -287,7 +286,7 @@ class Di extends N {
       const i = yield this.addTag(e.tagList, t);
       if (this.debug)
         try {
-          k(this.five, this.tags);
+          M(this.five, this.tags);
         } catch (n) {
           console.error(n);
         }
@@ -300,12 +299,12 @@ class Di extends N {
   addTag(e, t) {
     return p(this, null, function* () {
       const s = (Array.isArray(e) ? e : [e]).map((o) => {
-        var m, u, v;
+        var b, T, y;
         const n = this.getTagConfig(o), r = JSON.parse(JSON.stringify(o.data)), h = o.config;
-        return o.config = n, T(c({}, o), {
-          enabled: (m = o.enabled) != null ? m : !0,
-          id: (u = o.id) != null ? u : z(),
-          data: (v = n.initialData) != null && v.important ? f(o.data, r, n.initialData) : f(o.data, n.initialData, r),
+        return o.config = n, u(c({}, o), {
+          enabled: (b = o.enabled) != null ? b : !0,
+          id: (T = o.id) != null ? T : z(),
+          data: (y = n.initialData) != null && y.important ? f(o.data, r, n.initialData) : f(o.data, n.initialData, r),
           state: c({
             visible: void 0,
             unfolded: !this.can("fold", o)
@@ -511,7 +510,7 @@ class Di extends N {
       }, 500),
       e
     ), { observe: n, unobserve: r } = D(
-      _(() => t(), 400),
+      k(() => t(), 400),
       e
     );
     return s(), n(), () => {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.0.0-10");
+    i(this, "VERSION", "3.0.0-12");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/five/FiveDomEvents.d.ts

@@ -8,12 +8,23 @@
  */
 import type { Five } from '@realsee/five';
 import type * as THREE from 'three';
-type EventName = 'click';
+interface EventMap {
+    /**
+     * @description 点击事件
+     * @return {PreventFiveEvent} 返回 false 可以不阻止 five 的 tap 事件; default: true
+     */
+    click: (event: CallbackEvent) => PreventFiveEvent | void;
+    /**
+     * @description 鼠标移入事件
+     */
+    hover: (event: CallbackEvent) => void;
+    /**
+     * @description 鼠标移出事件
+     */
+    unHover: (event: CallbackEvent) => void;
+}
+type EventName = keyof EventMap;
 type PreventFiveEvent = boolean;
-/**
- * @return {PreventFiveEvent} 返回 false 可以不阻止 five 的 tap 事件; default: true
- */
-type Callback = (event: CallbackEvent) => PreventFiveEvent | void;
 interface EventHandlerConfig {
     /**
      * @default true
@@ -29,8 +40,9 @@ interface CallbackEvent {
 }
 type Object3DWithEvent = THREE.Object3D & {
     _domEvent?: {
-        [key in `${EventName}Handler`]?: Array<[Function, EventHandlerConfig]>;
+        [key in `${EventName}Handler`]?: Array<[EventMap[EventName], EventHandlerConfig]>;
     };
+    _hovered?: boolean;
 };
 export declare class FiveDomEvents {
     private five;
@@ -41,7 +53,7 @@ export declare class FiveDomEvents {
      * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
      * @todo: added 和 removed 还是不太智能
      */
-    addAutoBindEventListener(...params: Parameters<InstanceType<typeof FiveDomEvents>['addEventListener']>): void;
+    addAutoBindEventListener<T extends EventName>(object: Object3DWithEvent, event: T, callback: EventMap[T], config?: EventHandlerConfig): () => void;
     /**
      * @description: add event listener
      * @param params.object: object
@@ -49,10 +61,11 @@ export declare class FiveDomEvents {
      * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
      * @return {void}
      */
-    addEventListener(object: Object3DWithEvent, event: EventName, callback: Callback, config?: EventHandlerConfig): void;
+    addEventListener<T extends EventName>(object: Object3DWithEvent, event: T, callback: EventMap[T], config?: EventHandlerConfig): void;
     removeEventListener(object: Object3DWithEvent, event: EventName, callback: (e: CallbackEvent) => any, ...args: any[]): void;
     dispose(): void;
-    private handleWantsTapGesture;
+    private handleWantsGesture;
+    private onDomEvent;
     private objectIsBound;
     private notify;
 }