@realsee/dnalogel 3.27.5 → 3.27.6

package/libs/PanoTagPlugin/controller/index.js

@@ -1,16 +1,16 @@
-var E = Object.defineProperty, I = Object.defineProperties;
-var V = Object.getOwnPropertyDescriptors;
+var I = Object.defineProperty, V = Object.defineProperties;
+var O = 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, g = (d, a) => {
+var m = (d, a, e) => a in d ? I(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]);
+    R.call(a, e) && m(d, e, a[e]);
   if (A)
     for (var e of A(a))
-      B.call(a, e) && u(d, e, a[e]);
+      B.call(a, e) && m(d, e, a[e]);
   return d;
-}, b = (d, a) => I(d, V(a));
-var l = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
+}, b = (d, a) => V(d, O(a));
+var l = (d, a, e) => (m(d, typeof a != "symbol" ? a + "" : a, e), e);
 var c = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
     try {
@@ -29,25 +29,26 @@ var c = (d, a, e) => new Promise((t, i) => {
 });
 import * as v from "three";
 import { Subscribe as F } from "@realsee/five";
-import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { addDebugPoints as M } from "../utils/addDebugPoints.js";
 import { arrayPositionToVector3 as D } from "../../shared-utils/positionToVector3.js";
-import { isMediaModelTag as O, isModelTag as _ } from "../utils/tag/tagCheck.js";
-import { debounce as k } from "../utils/debounce.js";
+import { isMediaModelTag as k, isModelTag as _ } from "../utils/tag/tagCheck.js";
+import { debounce as L } from "../utils/debounce.js";
 import { throttle as P } from "../utils/throttle.js";
-import L from "../utils/tag/format.js";
-import { generateBlankAudio as N, AudioNamespace as G } from "../../shared-utils/audio.js";
+import N from "../utils/tag/format.js";
+import { generateBlankAudio as G, AudioNamespace as z } from "../../shared-utils/audio.js";
 import { resizeObserver as S } from "../../shared-utils/dom/resizeObserver.js";
-import { TagRender as z } from "./TagRender.js";
-import { uuid as W } from "../../shared-utils/uuid.js";
-import { isModelLike as x } from "../../shared-utils/five/mode.js";
+import { TagRender as W } from "./TagRender.js";
+import { uuid as x } from "../../shared-utils/uuid.js";
+import { isModelLike as $ } 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 { tweenProgress as $ } from "../../shared-utils/animationFrame/BetterTween.js";
+import { tweenProgress as j } from "../../shared-utils/animationFrame/BetterTween.js";
 import { waitFiveModelLoaded as J } from "../../shared-utils/five/fiveModelLoad.js";
-import { DebugUtil as j } from "../utils/DebugUtil.js";
+import { DebugUtil as q } from "../utils/DebugUtil.js";
+import { safeObj as U } from "../../shared-utils/safeObj.js";
 import "./TagComputer.js";
 import "../utils/tagPosition.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -94,7 +95,6 @@ import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/Utils/BaseUtil.js";
 import "../../shared-utils/five/getFloorIndex.js";
-import "../../shared-utils/safeObj.js";
 import "../Components/TagContainer.js";
 import "../Components/TagItem.js";
 import "../Components/Tag/index.js";
@@ -173,7 +173,7 @@ import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
 const w = "Dnalogel-PanoTagPlugin", Bi = (d) => `${w}--${d}`;
-class Fi extends z {
+class Fi extends W {
   constructor(e, t) {
     super(e);
     /** state */
@@ -182,10 +182,10 @@ class Fi extends z {
     l(this, "params");
     /** debug */
     l(this, "debug");
-    l(this, "debugUtil", new j(this));
+    l(this, "debugUtil", new q(this));
     /** 更改 tag 模型 */
     l(this, "changeTagModel", (e, t) => c(this, null, function* () {
-      e.data = f({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
+      e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
     l(this, "whyHide", (e) => {
       var i, s, o;
@@ -209,7 +209,7 @@ class Fi extends z {
     l(this, "updateVisible", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        O(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
+        k(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
       }), this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "handleFiveWantsMoveToPano", (e) => {
@@ -260,9 +260,9 @@ class Fi extends z {
         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: p }) => {
-          i.quaternion.copy(o.clone().slerp(n, p));
+        const o = i.quaternion.clone(), n = t.quaternion.clone(), r = j();
+        r.onUpdate(({ progress: f }) => {
+          i.quaternion.copy(o.clone().slerp(n, f));
         }), r.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     }));
@@ -271,9 +271,9 @@ class Fi extends z {
       this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "onFiveEveryReady", () => {
-      this.setUnfoldedByCamera(), x(this.five.getCurrentState().mode) && (this.setTagZIndex(this.filterPointTag), this.setVisible(), this.setPointTagPosition()), this.updateDomView({ withAnimation: !0 }), this.updateRenderVideoPlane(), this.updateRenderImagePlane(), this.updateTagModelVisible();
+      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 = f({}, { debug: !1, config: this.config }, g({}, t)), this.debug = this.params.debug, this.config = this.params.config, N(1, { namespace: G.PlayAudio });
+    this.params = p({}, { debug: !1, config: this.config }, g({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: z.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;
@@ -286,7 +286,7 @@ class Fi extends z {
   load(e, t) {
     return c(this, null, function* () {
       var s, o;
-      this.clearTags(), console.debug(w, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
+      this.clearTags(), console.debug(w, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       }), this.store.visibleWithAnimation = !0;
@@ -309,33 +309,33 @@ class Fi extends z {
         var T, y, C;
         const n = JSON.parse(JSON.stringify(o.data)), r = o.config ? JSON.parse(JSON.stringify(o.config)) : {};
         o.initialConfig = r;
-        const h = this.calculateTagConfig(o), p = this.getTagConfig(o);
-        return o.config = p, b(g({}, o), {
+        const h = this.calculateTagConfig(o), f = this.getTagConfig(o);
+        return o.config = f, b(g({}, o), {
           enabled: (T = o.enabled) != null ? T : !0,
-          id: (y = o.id) != null ? y : W(),
-          data: (C = p.initialData) != null && C.important ? f(o.data, n, p.initialData) : f(o.data, p.initialData, n),
+          id: (y = o.id) != null ? y : x(),
+          data: (C = f.initialData) != null && C.important ? p(o.data, n, f.initialData) : p(o.data, f.initialData, n),
           state: g({
             visible: void 0,
             unfolded: !this.can("fold", o)
-          }, p.initialState),
+          }, f.initialState),
           hooks: new F(),
           originPosition: o.position,
           position: (() => {
-            const m = this.getTransformedPostion(o.position);
-            return Array.isArray(m) ? m.map((U) => U.toArray()) : m.toArray();
+            const u = this.getTransformedPostion(o.position);
+            return Array.isArray(u) ? u.map((E) => E.toArray()) : u.toArray();
           })(),
           initialConfig: r,
           computedConfig: h,
-          config: p,
+          config: f,
           unfold: () => this.changeUnfoldedById(o.id, !0),
           fold: () => this.changeUnfoldedById(o.id, !1),
           enable: () => this.changeEnabledById(o.id, !0),
           disable: () => this.changeEnabledById(o.id, !1),
           destroy: () => this.destroyTagById(o.id),
-          changeData: (m) => this.changeDataById(o.id, m)
+          changeData: (u) => this.changeDataById(o.id, u)
         });
       });
-      return s.forEach(L), this.tags.push(...s), this.tagsLengthWillUpdate = !0, J(this.five).then(() => c(this, null, function* () {
+      return s.forEach(N), this.tags.push(...s), this.tagsLengthWillUpdate = !0, 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();
       }));
@@ -345,19 +345,19 @@ class Fi extends z {
    * @description: 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = f({}, this.config, e) : this.config = e, this.updateTagConfig(), this.setVisible(), this.updateRenderAllTags();
+    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig(), this.setVisible(), this.updateRenderAllTags();
   }
   /**
    * @description: 改变全局配置
    */
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = f({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig(), this.setVisible(), this.updateRenderAllTags();
+    t ? this.config.globalConfig = p({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig(), this.setVisible(), this.updateRenderAllTags();
   }
   /**
    * @description: 改变类型配置
    */
   changeContentTypeConfig(e, t, i = !0) {
-    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.setVisible(), 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.updateTagConfig(), this.setVisible(), this.updateRenderAllTags();
   }
   show(e) {
     return c(this, null, function* () {
@@ -433,7 +433,7 @@ class Fi extends z {
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
     let o = !1;
-    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));
+    s && (s.data && (o = !0), i ? s.data = p(s.data, t) : s.data = g(g({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 改变tag的stickType
@@ -447,7 +447,7 @@ class Fi extends z {
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
     let o = !1;
-    t && (this.tagsLengthWillUpdate = !0, t.data && (o = !0), i ? f(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = D(t.normal)), this.setVisible(), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
+    t && (this.tagsLengthWillUpdate = !0, t.data && (o = !0), i ? p(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = D(t.normal)), this.setVisible(), this.updateRenderAllTags(), this.clearUnusedPanelTag(), o && s.hooks.emit("dataChanged", s.data));
   }
   /**
    * @description: 销毁tag
@@ -525,7 +525,7 @@ class Fi extends z {
       }, 500),
       e
     ), { observe: n, unobserve: r } = S(
-      k(() => t(), 400),
+      L(() => t(), 400),
       e
     );
     return s(), n(), () => {
@@ -536,15 +536,21 @@ class Fi extends z {
     let e = !1;
     this.filterPointTag.forEach((t) => {
       const i = this.getUnfoldedByCamera(t);
-      t.state && i !== void 0 && (i === !0 && (e = !0), t.state.unfolded = i);
+      if (t.state && i !== void 0) {
+        if (i === !0 && t.screenPosition) {
+          const s = this.getTagConfig(t).unfoldedConfig;
+          U(s).keep !== "unfolded" && (e = !0);
+        }
+        t.state.unfolded = i;
+      }
     }), e && this.filterPointTag.forEach((t) => {
       const i = this.getTagConfig(t).unfoldedConfig;
-      typeof i == "object" && (i.autoUnfold || i.keep) || t.state && (t.state.unfolded = !1);
+      typeof i == "object" && (i.autoUnfold || i.autoUnfold === !1 || U(i.autoUnfold).enable === !1 || i.keep) || t.state && (t.state.unfolded = !1);
     });
   }
   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((p) => p == null ? void 0 : p()), 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((f) => f == null ? void 0 : f()), e.tag3DContentSvelte = void 0);
   }
 }
 export {

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.27.5",
+    "%c %c@realsee/dnalogel %cv3.27.6",
     [
       "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

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