@realsee/dnalogel 3.49.8 → 3.49.9

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -15,14 +15,14 @@ var f = (d, n, t) => new Promise((e, i) => {
   var s = (h) => {
     try {
       a(t.next(h));
-    } catch (c) {
-      i(c);
+    } catch (p) {
+      i(p);
     }
   }, r = (h) => {
     try {
       a(t.throw(h));
-    } catch (c) {
-      i(c);
+    } catch (p) {
+      i(p);
     }
   }, a = (h) => h.done ? e(h.value) : Promise.resolve(h.value).then(s, r);
   a((t = t.apply(d, n)).next());
@@ -91,9 +91,10 @@ import "../../vendor/three/build/three.module.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../shared-utils/five/vector3ToScreen.js";
 import "../../shared-utils/three/temp.js";
-class qt extends M {
+import "../../shared-utils/dom/resizeObserver.js";
+class Jt extends M {
   constructor(t, e) {
-    var h, c;
+    var h, p;
     super(t);
     // =============== public properties =================
     o(this, "name", "topviewFloorplanPlugin");
@@ -123,8 +124,8 @@ class qt extends M {
     o(this, "updateSize", () => {
       if (!this.data || !this.container || !this.wrapper || this.five.getCurrentState().mode !== "Topview")
         return !1;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, r = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = D(this.five, this.wrapper, this.floorIndex, r), h = Math.ceil(i * a), c = Math.ceil(s * a);
-      return this.size.width === h && this.size.height === c || (this.container.style.width = h + "px", this.container.style.height = c + "px", this.size = { width: h, height: c }), !0;
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, r = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = D(this.five, this.wrapper, this.floorIndex, r), h = Math.ceil(i * a), p = Math.ceil(s * a);
+      return this.size.width === h && this.size.height === p || (this.container.style.width = h + "px", this.container.style.height = p + "px", this.size = { width: h, height: p }), !0;
     });
     /** 销毁插件 */
     o(this, "dispose", () => {
@@ -189,7 +190,7 @@ class qt extends M {
       imageURL: this.staticPrefix + "/release/web/saas/missing-floorplan.e274c596.png",
       imageWidth: 200,
       imageHeight: 120,
-      text: (c = (h = e.i18n) == null ? void 0 : h.call(e, "暂无平面图")) != null ? c : "暂无平面图",
+      text: (p = (h = e.i18n) == null ? void 0 : h.call(e, "暂无平面图")) != null ? p : "暂无平面图",
       textFontSize: 14
     };
     const i = {
@@ -210,23 +211,23 @@ class qt extends M {
       attachedTo: _.BOUNDING_CENTER,
       getLabelElement: void 0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
-      i18n: (p) => p,
+      i18n: (c) => c,
       adaptiveRoomLabelVisibleEnable: !0,
-      getRoomAreaText: (p) => (p / 1e6).toFixed(1) + "㎡",
-      getRoomDimensionText: (p, w) => (p / 1e3).toFixed(1) + "m × " + (w / 1e3).toFixed(1) + "m",
-      getRuleDistanceText: (p) => p.toString()
+      getRoomAreaText: (c) => (c / 1e6).toFixed(1) + "㎡",
+      getRoomDimensionText: (c, w) => (c / 1e3).toFixed(1) + "m × " + (w / 1e3).toFixed(1) + "m",
+      getRuleDistanceText: (c) => c.toString()
     }, s = e ? T(e, ["selector", "scale"]) : {}, r = l(l({}, i.missingFloorConfig), s.missingFloorConfig), a = m(l(l({}, i), s), { missingFloorConfig: r });
     this.state = { enabled: !0, visible: !1, config: a }, this.initContainer(), t.model.loaded ? this.onFiveModelLoaded() : t.once("modelLoaded", this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
     return f(this, null, function* () {
-      function s(p) {
-        return Object.prototype.hasOwnProperty.apply(p, ["version"]);
+      function s(c) {
+        return Object.prototype.hasOwnProperty.apply(c, ["version"]);
       }
       const r = t;
       r && k(r.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
-      const a = JSON.parse(JSON.stringify(t)), h = s(a) ? a.data : a, c = this.data;
-      this.data = yield v(h), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, c), e && this.updateState(e, i), this.render();
+      const a = JSON.parse(JSON.stringify(t)), h = s(a) ? a.data : a, p = this.data;
+      this.data = yield v(h), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, p), e && this.updateState(e, i), this.render();
     });
   }
   /** 更新户型图位置 */
@@ -364,5 +365,5 @@ class qt extends M {
   }
 }
 export {
-  qt as Controller
+  Jt as Controller
 };

package/libs/floorplan/TopviewFloorplanPlugin/index.js

@@ -53,6 +53,7 @@ import "../../shared-utils/Utils/BaseUtil.js";
 import "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/three/temp.js";
+import "../../shared-utils/dom/resizeObserver.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "animejs";
 import "../../shared-utils/url/absoluteUrl.js";
@@ -63,8 +64,8 @@ import "../../shared-utils/to.js";
 import "../../shared-utils/getPxmm.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
 import "../../shared-utils/isNil.js";
-const co = (o, r) => new t(o, r);
+const go = (o, r) => new t(o, r);
 export {
-  co as TopviewFloorplanPlugin,
-  co as default
+  go as TopviewFloorplanPlugin,
+  go as default
 };

package/libs/index.js

@@ -93,6 +93,7 @@ import "./shared-utils/Subscribe.js";
 import "./shared-utils/Utils/WorkUtil.js";
 import "./shared-utils/five/transformPosition.js";
 import "./shared-utils/three/temp.js";
+import "./shared-utils/dom/resizeObserver.js";
 import "./shared-utils/three/core/Sphere.js";
 import "animejs";
 import "./shared-utils/url/absoluteUrl.js";
@@ -300,7 +301,6 @@ import "./PanoTagPlugin/utils/debounce.js";
 import "./PanoTagPlugin/utils/throttle.js";
 import "./PanoTagPlugin/utils/tag/format.js";
 import "./shared-utils/audio.js";
-import "./shared-utils/dom/resizeObserver.js";
 import "./PanoTagPlugin/controller/TagRender.js";
 import "./PanoTagPlugin/Components/Tag/index.js";
 import "./PanoTagPlugin/Components/Tag/TextTag/index.js";

package/libs/shared-utils/logger.js

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

@@ -24,6 +24,7 @@ export declare class LightTag {
     private disposer;
     private config;
     private fiveUtil;
+    private disposers;
     constructor(five: Five, position?: AnyPosition, config?: {
         wrapper?: HTMLElement;
         positionsForRotate?: AnyPosition[];
@@ -38,6 +39,7 @@ export declare class LightTag {
     updateScreenPosition(): void;
     private onCameraUpdate;
     private onFiveEveryReady;
+    private addResizeListener;
 }
 export declare function tag(five: Five, position: AnyPosition, config?: {
     wrapper?: HTMLElement;

package/libs/shared-utils/tag.js

@@ -4,11 +4,12 @@ var s = (h, t, e) => (g(h, typeof t != "symbol" ? t + "" : t, e), e);
 import { anyPositionToVector3 as d } from "./positionToVector3.js";
 import * as b from "three";
 import { vector3ToScreen as l } from "./five/vector3ToScreen.js";
-import { getFiveModel as x } from "./five/getFiveModel.js";
-import { FiveUtil as U } from "./Utils/FiveUtil.js";
+import { getFiveModel as U } from "./five/getFiveModel.js";
+import { FiveUtil as x } from "./Utils/FiveUtil.js";
 import { _raycaster as m } from "./three/temp.js";
+import { resizeObserver as E } from "./dom/resizeObserver.js";
 const v = "LightTagContainer_shgjakdhwakjdhsja", w = new b.Vector2();
-class E {
+class R {
   constructor(t, e, o) {
     s(this, "container");
     s(this, "visible", !1);
@@ -32,6 +33,7 @@ class E {
     s(this, "disposer");
     s(this, "config");
     s(this, "fiveUtil");
+    s(this, "disposers", []);
     s(this, "onCameraUpdate", () => {
       this.visible !== !1 && this.updateScreenPosition();
     });
@@ -40,15 +42,15 @@ class E {
       if (this.intersectCheck && this.visible && this.five.state.mode !== "Panorama") {
         let e = 0.01;
         this.fiveUtil.workUtil.fromType === "poincare" && (e = 0.05), m.set(this.five.camera.position, this.transformedPosition.clone().sub(this.five.camera.position));
-        const o = (t = x(this.five).intersectRaycaster(m)) == null ? void 0 : t[0];
+        const o = (t = U(this.five).intersectRaycaster(m)) == null ? void 0 : t[0];
         (o == null ? void 0 : o.distance) + e > this.transformedPosition.distanceTo(this.five.camera.position) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
       }
     });
     var n, r, a;
-    this.five = t, this.fiveUtil = (n = t.__fiveUtil__) != null ? n : t.__fiveUtil__ = new U(t), this.originPosition = e ? d(e).clone() : void 0, this.transformedPosition = (r = this.originPosition) == null ? void 0 : r.clone(), this.positionsForRotate = (a = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : a.map((i) => d(i).clone()), this.container = (() => {
+    this.five = t, this.fiveUtil = (n = t.__fiveUtil__) != null ? n : t.__fiveUtil__ = new x(t), this.originPosition = e ? d(e).clone() : void 0, this.transformedPosition = (r = this.originPosition) == null ? void 0 : r.clone(), this.positionsForRotate = (a = o == null ? void 0 : o.positionsForRotate) == null ? void 0 : a.map((i) => d(i).clone()), this.container = (() => {
       const i = document.createElement("div");
       return i.style.width = "0", i.style.height = "0", i.style.position = "absolute", i.style.transition = "opacity 0.2s linear", i;
-    })(), this.config = o != null ? o : {}, this.enable(), this.show();
+    })(), this.config = o != null ? o : {}, this.enable(), this.show(), this.addResizeListener();
   }
   show() {
     this.visible = !0, this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.onCameraUpdate();
@@ -79,7 +81,7 @@ class E {
     this.enabled && (this.enabled = !1, this.tagWrapper.removeChild(this.container), (t = this.disposer) == null || t.call(this));
   }
   destroy() {
-    this.disable(), this.container.remove();
+    this.disable(), this.container.remove(), this.disposers.forEach((t) => t());
   }
   setTransformMatrix(t) {
     var e;
@@ -114,11 +116,18 @@ class E {
     })();
     this.container.style.left = e.leftPx + "px", this.container.style.top = e.topPx + "px", this.container.style.transformOrigin = "center", this.container.style.transform = `scale(${o})`, n && (this.container.style.transform += ` rotate(${n}deg)`);
   }
+  addResizeListener() {
+    const t = this.five.getElement();
+    if (t) {
+      const { observe: e, unobserve: o } = E(this.onCameraUpdate, t);
+      e(), this.disposers.push(o);
+    }
+  }
 }
-function S(h, t, e) {
-  return new E(h, t, e);
+function z(h, t, e) {
+  return new R(h, t, e);
 }
 export {
-  E as LightTag,
-  S as tag
+  R as LightTag,
+  z as tag
 };

package/package.json

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