@realsee/dnalogel 3.30.3 → 3.30.5

package/libs/PanoTagPlugin/controller/index.js

@@ -2,32 +2,32 @@ var V = Object.defineProperty, E = Object.defineProperties;
 var R = Object.getOwnPropertyDescriptors;
 var D = Object.getOwnPropertySymbols;
 var F = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
-var v = (h, d, e) => d in h ? V(h, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[d] = e, m = (h, d) => {
-  for (var e in d || (d = {}))
-    F.call(d, e) && v(h, e, d[e]);
+var C = (d, a, e) => a in d ? V(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, m = (d, a) => {
+  for (var e in a || (a = {}))
+    F.call(a, e) && C(d, e, a[e]);
   if (D)
-    for (var e of D(d))
-      O.call(d, e) && v(h, e, d[e]);
-  return h;
-}, T = (h, d) => E(h, R(d));
-var f = (h, d, e) => (v(h, typeof d != "symbol" ? d + "" : d, e), e);
-var c = (h, d, e) => new Promise((t, i) => {
-  var s = (n) => {
+    for (var e of D(a))
+      O.call(a, e) && C(d, e, a[e]);
+  return d;
+}, A = (d, a) => E(d, R(a));
+var f = (d, a, e) => (C(d, typeof a != "symbol" ? a + "" : a, e), e);
+var c = (d, a, e) => new Promise((t, i) => {
+  var s = (r) => {
     try {
-      r(e.next(n));
-    } catch (a) {
-      i(a);
+      n(e.next(r));
+    } catch (l) {
+      i(l);
     }
-  }, o = (n) => {
+  }, o = (r) => {
     try {
-      r(e.throw(n));
-    } catch (a) {
-      i(a);
+      n(e.throw(r));
+    } catch (l) {
+      i(l);
     }
-  }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, o);
-  r((e = e.apply(h, d)).next());
+  }, 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 P from "three";
 import { Subscribe as M } from "@realsee/five";
 import { objectAssignDeepExports as g } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { addDebugPoints as _ } from "../utils/addDebugPoints.js";
@@ -174,7 +174,7 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const U = "Dnalogel-PanoTagPlugin", Gi = (h) => `${U}--${h}`;
+const U = "Dnalogel-PanoTagPlugin", Gi = (d) => `${U}--${d}`;
 class zi extends j {
   constructor(e, t) {
     super(e);
@@ -203,8 +203,8 @@ class zi extends j {
       if (t.stickType === "Model" || t.stickType === "Plane")
         return { reason: "maybe blocked by the five model" };
       if (!t.state.visible) {
-        const r = (s = (i = this.getPanoIndexCache({ panoIndex: this.five.panoIndex, id: e })) == null ? void 0 : i.__debug_visible_reason__) == null ? void 0 : s.reason;
-        return { reason: (o = r == null ? void 0 : r.type) != null ? o : r, reasonObj: r };
+        const n = (s = (i = this.getPanoIndexCache({ panoIndex: this.five.panoIndex, id: e })) == null ? void 0 : i.__debug_visible_reason__) == null ? void 0 : s.reason;
+        return { reason: (o = n == null ? void 0 : n.type) != null ? o : n, reasonObj: n };
       }
       return { reason: "check your eyes" };
     });
@@ -250,22 +250,22 @@ class zi extends j {
     });
     f(this, "handleFivePanoArrived", () => c(this, null, function* () {
       this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
-        e.temporaryState = T(m({}, e.temporaryState), { visible: !0 });
+        e.temporaryState = A(m({}, e.temporaryState), { visible: !0 });
       }), this.tags.filter(N).filter((e) => {
         var t;
         return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
-        var a;
-        const t = new y.Mesh(new y.BoxGeometry(), new y.MeshBasicMaterial()), i = (a = e.model) == null ? void 0 : a.object;
+        var l;
+        const t = new P.Mesh(new P.BoxGeometry(), new P.MeshBasicMaterial()), i = (l = e.model) == null ? void 0 : l.object;
         if (!i)
           return;
         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(), r = t.quaternion.clone(), n = Y();
-        n.onUpdate(({ progress: l }) => {
-          i.quaternion.copy(o.clone().slerp(r, l));
-        }), n.play();
+        const o = i.quaternion.clone(), n = t.quaternion.clone(), r = Y();
+        r.onUpdate(({ progress: h }) => {
+          i.quaternion.copy(o.clone().slerp(n, h));
+        }), r.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     }));
     /** 楼层切换时，需要更新标签可见性 */
@@ -296,8 +296,8 @@ class zi extends j {
       if (this.store.visibleWithAnimation = void 0, this.debug)
         try {
           _(this.five, this.tags);
-        } catch (r) {
-          console.error(r);
+        } catch (n) {
+          console.error(n);
         }
       return i;
     });
@@ -308,29 +308,29 @@ class zi extends j {
   addTag(e, t) {
     return c(this, null, function* () {
       const s = (Array.isArray(e) ? e : [e]).filter((o) => o.position).map((o) => {
-        var b, C, A, P;
+        var b, v, T, y;
         o.stickType = W(o);
-        const r = JSON.parse(JSON.stringify(o.data)), n = (b = o.initialConfig) != null ? b : o.config ? JSON.parse(JSON.stringify(o.config)) : {};
-        o.initialConfig = n;
-        const a = this.calculateTagConfig(o), l = this.getTagConfig(o);
-        o.config = l;
-        const p = T(m({}, o), {
-          enabled: (C = o.enabled) != null ? C : !0,
-          id: (A = o.id) != null ? A : J(),
-          data: (P = l.initialData) != null && P.important ? g(o.data, r, l.initialData) : g(o.data, l.initialData, r),
+        const n = JSON.parse(JSON.stringify(o.data)), r = (b = o.initialConfig) != null ? b : o.config ? JSON.parse(JSON.stringify(o.config)) : {};
+        o.initialConfig = r;
+        const l = this.calculateTagConfig(o), h = this.getTagConfig(o);
+        o.config = h;
+        const p = A(m({}, o), {
+          enabled: (v = o.enabled) != null ? v : !0,
+          id: (T = o.id) != null ? T : J(),
+          data: (y = h.initialData) != null && y.important ? g(o.data, n, h.initialData) : g(o.data, h.initialData, n),
           state: m({
             visible: void 0,
             unfolded: !this.can("fold", o)
-          }, l.initialState),
+          }, h.initialState),
           hooks: new M(),
           originPosition: o.position,
           position: (() => {
             const u = this.getTransformedPostion(o.position);
             return Array.isArray(u) ? u.map((B) => B.toArray()) : u.toArray();
           })(),
-          initialConfig: n,
-          computedConfig: a,
-          config: l,
+          initialConfig: r,
+          computedConfig: l,
+          config: h,
           unfold: () => this.changeUnfoldedById(p.id, !0),
           fold: () => this.changeUnfoldedById(p.id, !1),
           enable: () => this.changeEnabledById(p.id, !0),
@@ -343,8 +343,8 @@ class zi extends j {
         return p;
       });
       return s.forEach(z), this.tags.push(...s), this.tagsLengthWillUpdate = !0, Z(this.five).then(() => c(this, null, function* () {
-        var o, r, n;
-        this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.addMediaModelTag(s), this.setVisibleAndUnfolded({ withAnimation: (n = t == null ? void 0 : t.withAnimation) != null ? n : !0 }), this.updatePointTagPosition(), this.updateRenderAllTags();
+        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();
       }));
     });
   }
@@ -404,11 +404,11 @@ class zi extends j {
    * @description 销毁
    */
   dispose() {
-    var e, t, i, s, o, r;
-    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((n) => {
-      var a;
-      return (a = n.tag3DContentSvelte) == null ? void 0 : a.svelteApp.$destroy();
-    }), this.tags = [], (t = this.store.disposers) == null || t.forEach((n) => n == null ? void 0 : n()), this.store.disposers = [], (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (r = (o = this.store).resizeObserverDisposer) == null || r.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.imagePlaneGroup.remove(...this.imagePlaneGroup.children), this.clearCache(), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
+    var e, t, i, s, o, n;
+    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((r) => {
+      var l;
+      return (l = r.tag3DContentSvelte) == null ? void 0 : l.svelteApp.$destroy();
+    }), this.tags = [], (t = this.store.disposers) == null || t.forEach((r) => r == null ? void 0 : r()), this.store.disposers = [], (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (n = (o = this.store).resizeObserverDisposer) == null || n.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.imagePlaneGroup.remove(...this.imagePlaneGroup.children), this.clearCache(), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
   }
   /**
    * @description 闪烁标签
@@ -417,24 +417,27 @@ class zi extends j {
    */
   blinkTagById(e, t) {
     return c(this, null, function* () {
-      var n;
+      var h, p;
       const i = this.getTagById(e);
       if (!i)
         return;
-      const s = (n = i.state) == null ? void 0 : n.visible;
-      s === !1 && (i.state.visible = !0, this.setPointTagPosition(), this.updateDomView(), yield X(1));
-      const o = (() => {
-        var l, p, b;
-        const a = [];
-        return a.push((p = (l = i.dom) == null ? void 0 : l.getElementsByClassName("wrapper")) == null ? void 0 : p[0]), i.stickType !== "2DPoint" && a.push(i.contentDom), a.push((b = i.model) == null ? void 0 : b.object), a.push(i.mediaPlane), a.filter(Boolean);
+      const s = (h = i.enabled) != null ? h : !0, o = (p = i.state) == null ? void 0 : p.visible, n = s && o;
+      n === !1 && (i.state.visible = !0, i.enabled = !0, this.setPointTagPosition(), this.updateDomView(), yield X(0), i.dom && (i.dom.style.visibility = "hidden"));
+      const r = (() => {
+        var v, T, y;
+        const b = [];
+        return b.push((T = (v = i.dom) == null ? void 0 : v.getElementsByClassName("wrapper")) == null ? void 0 : T[0]), i.stickType !== "2DPoint" && b.push(i.contentDom), b.push((y = i.model) == null ? void 0 : y.object), b.push(i.mediaPlane), b.filter(Boolean);
       })();
-      if (!o.length)
+      if (!r.length)
         return;
-      yield (s ? H : Q)(o, m({
-        update: () => {
+      yield (n ? H : Q)(r, m({
+        begin: () => {
+          n === !1 && i.dom && (i.dom.style.visibility = "");
+        },
+        updateRender: () => {
           this.five.needsRender = !0;
         }
-      }, t)), s === !1 && (this.setVisible(i), this.updateDomView());
+      }, t)), s === !1 && (i.enabled = !1, this.updateDomView()), o === !1 && (this.setVisible(i), this.updateDomView());
     });
   }
   /**
@@ -443,15 +446,15 @@ class zi extends j {
    * @param {boolean} unfolded
    */
   changeUnfoldedById(e, t) {
-    var r;
+    var n;
     const i = this.getTagById(e);
     if (!i)
       return;
     const s = this.can("fold", i), o = this.can("unfold", i);
     if (s && o) {
       i.state.unfolded = t;
-      const n = this.filterPointTag;
-      (r = this.TagContainerSvelte) == null || r.$set({ tags: n });
+      const r = this.filterPointTag;
+      (n = this.TagContainerSvelte) == null || n.$set({ tags: r });
     } else
       console.warn(`tag ${e} cannot be ${t ? "unfolded" : "folded"}`);
   }
@@ -582,12 +585,12 @@ class zi extends j {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: r, unobserve: n } = k(
+    ), { observe: n, unobserve: r } = k(
       G(() => t(), 400),
       e
     );
-    return s(), r(), () => {
-      o(), n();
+    return s(), n(), () => {
+      o(), r();
     };
   }
   setUnfoldedByCamera() {
@@ -607,8 +610,8 @@ class zi extends j {
     });
   }
   changeTagMode(e, t) {
-    var i, s, o, r, n, a;
-    ((i = e.config) == null ? void 0 : i.renderType) !== "Mesh" && ((r = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : r.mode) !== t && ((n = e.config) != null && n.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (a = this.store.css3DRenderDisposer.get(e.id)) == null || a.forEach((l) => l == null ? void 0 : l()), e.tag3DContentSvelte = void 0);
+    var i, s, o, n, r, l;
+    ((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 } }, (l = this.store.css3DRenderDisposer.get(e.id)) == null || l.forEach((h) => h == null ? void 0 : h()), e.tag3DContentSvelte = void 0);
   }
 }
 export {

package/libs/base/BasePlugin.js

@@ -15,7 +15,7 @@ let C = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.30.3");
+    i(this, "VERSION", "3.30.5");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.30.3",
+    "%c %c@realsee/dnalogel %cv3.30.5",
     [
       "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/libs/shared-utils/three/blink.js

@@ -16,28 +16,28 @@ var E = (e, a, t) => new Promise((r, s) => {
     } catch (i) {
       s(i);
     }
-  }, f = (y) => {
+  }, c = (y) => {
     try {
       d(t.throw(y));
     } catch (i) {
       s(i);
     }
-  }, d = (y) => y.done ? r(y.value) : Promise.resolve(y.value).then(l, f);
+  }, d = (y) => y.done ? r(y.value) : Promise.resolve(y.value).then(l, c);
   d((t = t.apply(e, a)).next());
 });
 import D from "animejs";
 import { toArray as v } from "../util.js";
-const c = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
+const f = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
 function b(e) {
   v(e).forEach((t) => {
     var r, s;
-    c.has(t) || (t instanceof HTMLElement ? c.set(t, {
+    f.has(t) || (t instanceof HTMLElement ? f.set(t, {
       opacity: t.style.opacity === "" ? void 0 : t.style.opacity,
       visible: {
         display: t.style.display,
         visibility: t.style.visibility
       }
-    }) : t.isObject3D && c.set(t, {
+    }) : t.isObject3D && f.set(t, {
       opacity: (r = t.material) == null ? void 0 : r.opacity,
       transparent: (s = t.material) == null ? void 0 : s.transparent,
       visible: t.visible
@@ -46,11 +46,11 @@ function b(e) {
 }
 function k(e) {
   v(e).forEach((t) => {
-    const r = c.get(t);
-    r && (t instanceof HTMLElement && (t.style.opacity = r.opacity, t.style.display = r.visible.display, t.style.visibility = r.visible.visibility, t.style.display = r.visible.display), t.isObject3D && (t.visible = r.visible, t.material && (t.material.opacity = r.opacity, t.material.transparent = r.transparent)), c.delete(t));
+    const r = f.get(t);
+    r && (t instanceof HTMLElement && (t.style.opacity = r.opacity === void 0 ? "" : r.opacity, t.style.display = r.visible.display, t.style.visibility = r.visible.visibility, t.style.display = r.visible.display), t.isObject3D && (t.visible = r.visible, t.material && (t.material.opacity = r.opacity, t.material.transparent = r.transparent)), f.delete(t));
   });
 }
-function N(e, a) {
+function o(e, a) {
   return E(this, null, function* () {
     var d, y;
     const t = (d = a == null ? void 0 : a.traverseTHREEObject) != null ? d : !0;
@@ -73,27 +73,27 @@ function N(e, a) {
         i.animatables.forEach((L) => {
           var M;
           const p = L.target;
-          if (!c.has(p))
+          if (!f.has(p))
             return;
-          const h = Number((M = c.get(p).opacity) != null ? M : 1) * (100 - i.progress) / 100;
+          const h = Number((M = f.get(p).opacity) != null ? M : 1) * (100 - i.progress) / 100;
           p instanceof HTMLElement ? p.style.opacity = String(h) : p.material && (p.material.opacity = h, p.material.transparent = !0);
         }), (u = a == null ? void 0 : a.updateRender) == null || u.call(a);
       }
-    }, a)), f = T.get(e);
-    f == null || f.pause(), f == null || f.seek(0), T.set(e, l), l.play(), yield l.finished, k(r), (y = a == null ? void 0 : a.updateRender) == null || y.call(a);
+    }, a)), c = T.get(e);
+    c == null || c.pause(), c == null || c.seek(0), T.set(e, l), l.play(), yield l.finished, k(r), (y = a == null ? void 0 : a.updateRender) == null || y.call(a);
   });
 }
 function C(e, a) {
   return E(this, null, function* () {
-    return N(e, g({
+    return o(e, g({
       update: (t) => {
         var r;
         t.animatables.forEach((s) => {
           var i, u;
           const l = s.target;
-          if (!c.has(l))
+          if (!f.has(l))
             return;
-          const f = c.get(l), y = ((u = (i = f == null ? void 0 : f.opacity) != null ? i : a == null ? void 0 : a.maxOpacity) != null ? u : 1) * (t.progress / 100);
+          const c = f.get(l), y = ((u = (i = c == null ? void 0 : c.opacity) != null ? i : a == null ? void 0 : a.maxOpacity) != null ? u : 1) * (t.progress / 100);
           l instanceof HTMLElement ? (l.style.opacity = String(y), l.style.visibility = "visible") : l.isObject3D && (v(e).includes(l) && (l.visible = !0), l.material && (l.material.opacity = y, l.material.transparent = !0));
         }), (r = a == null ? void 0 : a.updateRender) == null || r.call(a);
       }
@@ -101,6 +101,6 @@ function C(e, a) {
   });
 }
 export {
-  N as blink,
+  o as blink,
   C as reblink
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.30.3",
+  "version": "3.30.5",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",