@realsee/dnalogel 3.8.5 → 3.8.7

package/libs/AreaMakerPlugin/Controller.js

@@ -1,13 +1,13 @@
 var C = Object.defineProperty, M = Object.defineProperties;
 var I = Object.getOwnPropertyDescriptors;
 var p = Object.getOwnPropertySymbols;
-var A = Object.prototype.hasOwnProperty, S = Object.prototype.propertyIsEnumerable;
+var S = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
 var u = (h, r, t) => r in h ? C(h, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[r] = t, d = (h, r) => {
   for (var t in r || (r = {}))
-    A.call(r, t) && u(h, t, r[t]);
+    S.call(r, t) && u(h, t, r[t]);
   if (p)
     for (var t of p(r))
-      S.call(r, t) && u(h, t, r[t]);
+      A.call(r, t) && u(h, t, r[t]);
   return h;
 }, f = (h, r) => M(h, I(r));
 var o = (h, r, t) => (u(h, typeof r != "symbol" ? r + "" : r, t), t);
@@ -165,10 +165,10 @@ class at extends _ {
   load(t) {
     return m(this, null, function* () {
       const i = this.data;
-      this.data = this.formatData(t), this.hooks.emit("dataChange", this.data, i), this.modelGroup.remove(...this.modelGroup.children), this.itemMap.clear(), this.data.list.forEach((e) => {
+      this.data = this.formatData(t), this.hooks.emit("dataChange", this.data, i), this.modelGroup.remove(...this.modelGroup.children), this.itemMap.clear(), this.childrenMountedState = !1, this.checkMsg.childrenMountedState = "", this.data.list.forEach((e) => {
         const s = new y(this, e);
         s.itemRenderer = this.itemRenderer, this.modelGroup.add(s.modelGroup), this.itemMap.set(e.id, s), s.hooks.on("tagClick", this.onMakerTagClick);
-      });
+      }), this.updateChildrenMountedState();
     });
   }
   /** 将插件的 DOM 容器添加到指定的 DOM 元素上 */

package/libs/AreaMakerPlugin/utils/Item.js

@@ -212,23 +212,24 @@ class Q {
   }
   /** 挂载标注 */
   mount() {
+    var t;
     if (this.mounted = !0, this.updateVisible(), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline.material.depthTest = this.plugin.config.modelDepthTest, this.modelGroup.add(this.makerObject, this.outline), !!this.name) {
-      const t = this.plugin.tagDomContainer, s = {
+      const s = this.plugin.tagDomContainer, o = {
         data: this.data,
         content: this.name,
         visible: this.tagVisible,
         renderer: this.itemRenderer,
         transform: `translate(${this.tagTransform.left}px, ${this.tagTransform.top}px)`,
-        onClick: (o) => this.hooks.emit("tagClick", { target: this, nativeEvent: o })
+        onClick: (r) => this.hooks.emit("tagClick", { target: this, nativeEvent: r })
       };
-      this.tagApp = new T({ target: t, props: s }), this.updateTag();
+      this.tagApp = new T({ target: s, props: o }), this.updateTag();
     }
-    this.plugin.five.needsRender = !0, this.plugin.hooks.on("stateChange", this.onPluginStateChange), this.plugin.hooks.on("configChange", this.onPluginConfigChange), this.plugin.five.on("modeChange", this.updateVisible), this.plugin.five.on("modelShownFloorChange", this.updateVisible), this.plugin.five.on("cameraUpdate", this.onFiveCameraUpdate), this.plugin.resizeIframe.contentWindow.addEventListener("resize", this.onContainerResize);
+    this.plugin.five.needsRender = !0, this.plugin.hooks.on("stateChange", this.onPluginStateChange), this.plugin.hooks.on("configChange", this.onPluginConfigChange), this.plugin.five.on("modeChange", this.updateVisible), this.plugin.five.on("modelShownFloorChange", this.updateVisible), this.plugin.five.on("cameraUpdate", this.onFiveCameraUpdate), (t = this.plugin.resizeIframe.contentWindow) == null || t.addEventListener("resize", this.onContainerResize);
   }
   /** 卸载标注 */
   unmount() {
-    var e;
-    this.mounted = !1, this.modelGroup.remove(...this.modelGroup.children), (e = this.tagApp) == null || e.$destroy(), this.tagApp = null, this.plugin.hooks.off("stateChange", this.onPluginStateChange), this.plugin.hooks.off("configChange", this.onPluginConfigChange), this.plugin.five.off("modeChange", this.updateVisible), this.plugin.five.off("modelShownFloorChange", this.updateVisible), this.plugin.five.off("cameraUpdate", this.onFiveCameraUpdate), this.plugin.resizeIframe.contentWindow.removeEventListener("resize", this.onContainerResize);
+    var e, t;
+    this.mounted = !1, this.modelGroup.remove(...this.modelGroup.children), (e = this.tagApp) == null || e.$destroy(), this.tagApp = null, this.plugin.hooks.off("stateChange", this.onPluginStateChange), this.plugin.hooks.off("configChange", this.onPluginConfigChange), this.plugin.five.off("modeChange", this.updateVisible), this.plugin.five.off("modelShownFloorChange", this.updateVisible), this.plugin.five.off("cameraUpdate", this.onFiveCameraUpdate), (t = this.plugin.resizeIframe.contentWindow) == null || t.removeEventListener("resize", this.onContainerResize);
   }
   /** 更改标注透明度
    * @param opacity 标注透明度，范围：0-1

package/libs/CruisePlugin/Move.js

@@ -2,30 +2,30 @@ var C = Object.defineProperty, P = Object.defineProperties;
 var b = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
 var k = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
-var d = (i, t, e) => t in i ? C(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, u = (i, t) => {
+var u = (r, t, e) => t in r ? C(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e, d = (r, t) => {
   for (var e in t || (t = {}))
-    k.call(t, e) && d(i, e, t[e]);
+    k.call(t, e) && u(r, e, t[e]);
   if (y)
     for (var e of y(t))
-      O.call(t, e) && d(i, e, t[e]);
-  return i;
-}, c = (i, t) => P(i, b(t));
-var f = (i, t, e) => (d(i, typeof t != "symbol" ? t + "" : t, e), e);
-var S = (i, t, e) => new Promise((s, h) => {
-  var p = (o) => {
+      O.call(t, e) && u(r, e, t[e]);
+  return r;
+}, c = (r, t) => P(r, b(t));
+var f = (r, t, e) => (u(r, typeof t != "symbol" ? t + "" : t, e), e);
+var S = (r, t, e) => new Promise((s, h) => {
+  var o = (i) => {
     try {
-      r(e.next(o));
+      n(e.next(i));
     } catch (a) {
       h(a);
     }
-  }, n = (o) => {
+  }, p = (i) => {
     try {
-      r(e.throw(o));
+      n(e.throw(i));
     } catch (a) {
       h(a);
     }
-  }, r = (o) => o.done ? s(o.value) : Promise.resolve(o.value).then(p, n);
-  r((e = e.apply(i, t)).next());
+  }, n = (i) => i.done ? s(i.value) : Promise.resolve(i.value).then(o, p);
+  n((e = e.apply(r, t)).next());
 });
 import w from "./BaseController.js";
 import { objectAssignDeepExports as l } from "../vendor/object-assign-deep/objectAssignDeep.js";
@@ -59,7 +59,7 @@ import "../shared-utils/vectorToCoordinate.js";
 import "../shared-utils/formatRad.js";
 class re extends w {
   constructor(e, s) {
-    var n;
+    var p;
     super(e, s);
     f(this, "curve");
     f(this, "baseCurveOffset");
@@ -70,16 +70,19 @@ class re extends w {
       this.state.speed = e, this.hooks.emit("speedChange", e, { userAction: s });
     });
     f(this, "moveToStart", () => {
-      this.five.setState(c(u({}, g(this.curve, 0, this.curveOffset)), { mode: "Model" }));
+      this.five.setState(c(d({}, g(this.curve, 0, this.curveOffset)), { mode: "Model" }));
     });
     f(this, "playFromStart", () => {
       this.clearPauseData(), this.setState({ playing: !0 });
     });
     f(this, "getDuration", () => this.getSpeededDuration(this.duration));
     f(this, "getProgress", () => {
-      var r;
-      const e = this.getPauseData(), s = 1 - ((r = e == null ? void 0 : e.playedProgress) != null ? r : 0), h = this.getDuration(), n = (performance.now() - this.playStartedTime) / h;
-      return 1 - s + n;
+      var i;
+      const e = this.getPauseData();
+      let s = (i = e == null ? void 0 : e.playedProgress) != null ? i : 0;
+      (s < 0 || s >= 1) && (s = 0);
+      const h = 1 - s, o = this.getDuration(), n = (performance.now() - this.playStartedTime) / o;
+      return 1 - h + n;
     });
     const h = {
       config: {
@@ -88,44 +91,47 @@ class re extends w {
           moveSpeedUnit: "m/s"
         }
       }
-    }, p = {
+    }, o = {
       allowBroke: !0
     };
-    this.state = l({}, h, this.state), this.config = l({}, p, this.config), this.baseCurveOffset = l({ x: 0, y: 0, z: 0 }, { y: 2 }, (n = this.config) == null ? void 0 : n.offset);
+    this.state = l({}, h, this.state), this.config = l({}, o, this.config), this.baseCurveOffset = l({ x: 0, y: 0, z: 0 }, { y: 2 }, (p = this.config) == null ? void 0 : p.offset);
   }
   load(e, s) {
-    var n, r, o, a, m, v;
-    if (this.handlePause(), this.clear(), this.data = u({ id: x() }, e), this.curve = this.data.path.curves[0], this.curveOffset = {
-      x: this.baseCurveOffset.x + ((r = (n = this.data.offset) == null ? void 0 : n.x) != null ? r : 0),
-      y: this.baseCurveOffset.y + ((a = (o = this.data.offset) == null ? void 0 : o.y) != null ? a : 0),
+    var p, n, i, a, m, v;
+    if (this.handlePause(), this.clear(), this.data = d({ id: x() }, e), this.curve = this.data.path.curves[0], this.curveOffset = {
+      x: this.baseCurveOffset.x + ((n = (p = this.data.offset) == null ? void 0 : p.x) != null ? n : 0),
+      y: this.baseCurveOffset.y + ((a = (i = this.data.offset) == null ? void 0 : i.y) != null ? a : 0),
       z: this.baseCurveOffset.z + ((v = (m = this.data.offset) == null ? void 0 : m.z) != null ? v : 0)
     }, !this.curve)
       throw new Error("curve is not defined");
-    const h = this.curve.getLength(), p = this.state.config.speedConfig.moveSpeedUnit === "m/ms" ? 1 : 1e3;
-    return this.duration = h / (this.state.config.speedConfig.moveSpeed / p), s ? this.setState(s) : (this.setState({ playing: !1 }), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), this.changePlayState(this.state.playing), this.changeSpeed(this.state.speed)), Promise.resolve();
+    const h = this.curve.getLength(), o = this.state.config.speedConfig.moveSpeedUnit === "m/ms" ? 1 : 1e3;
+    return this.duration = h / (this.state.config.speedConfig.moveSpeed / o), s ? this.setState(s) : (this.setState({ playing: !1 }), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), this.changePlayState(this.state.playing), this.changeSpeed(this.state.speed)), Promise.resolve();
   }
   handlePlay() {
     return new Promise((e, s) => S(this, null, function* () {
-      var o;
+      var i;
       this.hooks.emit("play", { userAction: !0 });
-      const h = this.getPauseData(), p = (o = h == null ? void 0 : h.playedProgress) != null ? o : 0, n = g(this.curve, p, this.curveOffset);
-      if (this.hooks.emit("progressChange", p), this.five.setState(c(u({}, n), { mode: "Model" })), yield this.five.ready(), this.playStartedTime = performance.now(), this.config.allowBroke) {
+      const h = this.getPauseData();
+      let o = (i = h == null ? void 0 : h.playedProgress) != null ? i : 0;
+      (o < 0 || o >= 1) && (o = 0);
+      const p = g(this.curve, o, this.curveOffset);
+      if (this.hooks.emit("progressChange", o), this.five.setState(c(d({}, p), { mode: "Model" })), yield this.five.ready(), this.playStartedTime = performance.now(), this.config.allowBroke) {
         const a = this.addInterruptListener(() => {
           this.state.playing && (this.hooks.emit("broke"), this.handlePause(), a(), s(new Error("broke")));
         });
       }
-      const r = () => {
+      const n = () => {
         const a = this.getProgress();
         if (a >= 1)
-          this.five.off("renderFrame", r), this.setState({ playing: !1 }, { userAction: !1 }), this.hooks.emit("end"), this.hooks.emit("progressChange", 1), e("end");
+          this.five.off("renderFrame", n), this.setState({ playing: !1 }, { userAction: !1 }), this.hooks.emit("end"), this.hooks.emit("progressChange", 1), e("end");
         else if (this.state.playing === !1)
-          this.five.off("renderFrame", r);
+          this.five.off("renderFrame", n);
         else if (a >= 0) {
           const m = g(this.curve, a, this.curveOffset);
           this.hooks.emit("progressChange", a), this.five.setState(m, !0);
         }
       };
-      this.five.on("renderFrame", r);
+      this.five.on("renderFrame", n);
     }));
   }
   handlePause(e) {

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.8.5",
+    "%c %c@realsee/dnalogel %cv3.8.7",
     [
       "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.8.5",
+  "version": "3.8.7",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",