@realsee/dnalogel 3.19.1 → 3.19.2-dev.3

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -1,15 +1,15 @@
-var A = Object.defineProperty, C = Object.defineProperties;
-var S = Object.getOwnPropertyDescriptors;
+var C = Object.defineProperty, S = Object.defineProperties;
+var E = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
-var v = (d, s, t) => s in d ? A(d, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[s] = t, l = (d, s) => {
+var P = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
+var v = (d, s, t) => s in d ? C(d, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[s] = t, l = (d, s) => {
   for (var t in s || (s = {}))
-    E.call(s, t) && v(d, t, s[t]);
+    P.call(s, t) && v(d, t, s[t]);
   if (w)
     for (var t of w(s))
-      P.call(s, t) && v(d, t, s[t]);
+      x.call(s, t) && v(d, t, s[t]);
   return d;
-}, g = (d, s) => C(d, S(s));
+}, g = (d, s) => S(d, E(s));
 var o = (d, s, t) => (v(d, typeof s != "symbol" ? s + "" : s, t), t);
 var c = (d, s, t) => new Promise((e, i) => {
   var n = (a) => {
@@ -29,16 +29,16 @@ var c = (d, s, t) => new Promise((e, i) => {
 });
 import { to as I } from "../../shared-utils/to.js";
 import { equal as M } from "../../shared-utils/equal.js";
-import { Main as x } from "../Components/Main.js";
+import { Main as y } from "../Components/Main.js";
 import { formatData as b } from "../utils/formatData.js";
-import { CAMERA_IMAGE as y } from "../Assets/camera.js";
-import { omit as _ } from "../../shared-utils/filter.js";
-import { getPxmm as L } from "../../shared-utils/getPxmm.js";
+import { CAMERA_IMAGE as _ } from "../Assets/camera.js";
+import { omit as L } from "../../shared-utils/filter.js";
+import { getPxmm as D } from "../../shared-utils/getPxmm.js";
 import { FLOOR_PLAN_ATTACHED_TO as O } from "../constant.js";
-import { Controller as D } from "../../base/BasePluginWithData.js";
-import { correctFiveState as T } from "../utils/correctFiveState.js";
+import { Controller as T } from "../../base/BasePluginWithData.js";
+import { correctFiveState as k } from "../utils/correctFiveState.js";
 import { changeModelCanvasOpacity as F } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FIVE_CAMERA_DEFAULT_FOV as k, FloorplanErrorType as p, SHOW_ANIME_DURATION as H } from "../utils/constant.js";
+import { FIVE_CAMERA_DEFAULT_FOV as R, FloorplanErrorType as p, SHOW_ANIME_DURATION as H } from "../utils/constant.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../vendor/svelte/transition/index.js";
@@ -92,15 +92,15 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
-function R(d) {
+function G(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
   return e || i;
 }
-function G(d) {
+function W(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Xt extends D {
+class Yt extends T {
   constructor(t, e) {
     var a, f, m;
     super(t);
@@ -165,7 +165,7 @@ class Xt extends D {
     o(this, "updateSize", () => {
       if (!this.data || !this.container || !this.wrapper)
         return !1;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, n = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, r = L(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * r), f = Math.ceil(n * r);
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, n = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, r = D(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * r), f = Math.ceil(n * r);
       return this.size.width === a && this.size.height === f || (this.container.style.width = a + "px", this.container.style.height = f + "px", this.size = { width: a, height: f }), !0;
     });
     o(this, "highlight", (t) => {
@@ -205,7 +205,7 @@ class Xt extends D {
         this.showRejection = (u) => {
           r = !0, a = u;
         };
-        const [f] = yield I(T(this.five, this.showState, i.userAction));
+        const [f] = yield I(k(this.five, this.showState, i.userAction));
         if (f)
           throw f;
         if (r)
@@ -259,7 +259,7 @@ class Xt extends D {
       if (!e || this.state.config.autoShowEnable === !1 || this.isHiddenByHideFunc)
         return;
       const i = this.five.getCurrentState();
-      i.mode === "Floorplan" && (this.state.visible || G(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 })));
+      i.mode === "Floorplan" && (this.state.visible || W(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 })));
     });
     /** panoIndex 改变时，更新 floorIndex */
     o(this, "onFivePanoArrived", (t) => {
@@ -271,7 +271,7 @@ class Xt extends D {
       if (!this.state.visible || this.showPromise)
         return;
       const i = this.five.getCurrentState();
-      R(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e, isAutoHide: !0 }));
+      G(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e, isAutoHide: !0 }));
     });
     /** 在户型图展示时阻止多指操作, 阻止鼠标放大 */
     o(this, "onFiveWantsGesture", (t, e) => {
@@ -304,7 +304,7 @@ class Xt extends D {
       mode: "Floorplan",
       longitude: 0,
       latitude: Math.PI / 2,
-      fov: k / ((a = e == null ? void 0 : e.scale) != null ? a : 1)
+      fov: R / ((a = e == null ? void 0 : e.scale) != null ? a : 1)
     }, this.defaultMissingFloorConfig = {
       imageURL: this.staticPrefix + "/release/web/saas/missing-floorplan.e274c596.png",
       imageWidth: 200,
@@ -324,15 +324,17 @@ class Xt extends D {
       roomLabelsEnable: !0,
       roomAreaEnable: !0,
       roomNameEnable: !0,
+      roomDimensionEnable: !0,
       adaptiveRoomLabelVisibleEnable: !0,
-      cameraImageUrl: y,
+      cameraImageUrl: _,
       attachedTo: O.BOUNDING_CENTER,
       getLabelElement: void 0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
       i18n: (u) => u,
       getRoomAreaText: (u) => (u / 1e6).toFixed(1) + "㎡",
+      getRoomDimensionText: (u, A) => (u / 1e3).toFixed(1) + "m x " + (A / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (u) => u.toString()
-    }, n = e ? _(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), n.missingFloorConfig), r = g(l(l({}, i), n), { missingFloorConfig: h });
+    }, n = e ? L(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), n.missingFloorConfig), r = g(l(l({}, i), n), { missingFloorConfig: h });
     this.state = { enabled: !0, visible: !1, config: r }, this.initContainer(), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
@@ -425,9 +427,9 @@ class Xt extends D {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new x({ target: this.container, intro: !0, props: e });
+    this.app = new y({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  Xt as Controller
+  Yt as Controller
 };

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -1,15 +1,15 @@
-var w = Object.defineProperty, C = Object.defineProperties;
-var F = Object.getOwnPropertyDescriptors;
+var C = Object.defineProperty, F = Object.defineProperties;
+var E = Object.getOwnPropertyDescriptors;
 var g = Object.getOwnPropertySymbols;
-var A = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
-var u = (d, n, t) => n in d ? w(d, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[n] = t, l = (d, n) => {
+var A = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
+var u = (d, n, t) => n in d ? C(d, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[n] = t, l = (d, n) => {
   for (var t in n || (n = {}))
     A.call(n, t) && u(d, t, n[t]);
   if (g)
     for (var t of g(n))
-      E.call(n, t) && u(d, t, n[t]);
+      x.call(n, t) && u(d, t, n[t]);
   return d;
-}, m = (d, n) => C(d, F(n));
+}, m = (d, n) => F(d, E(n));
 var o = (d, n, t) => (u(d, typeof n != "symbol" ? n + "" : n, t), t);
 var f = (d, n, t) => new Promise((e, i) => {
   var s = (h) => {
@@ -27,16 +27,16 @@ var f = (d, n, t) => new Promise((e, i) => {
   }, a = (h) => h.done ? e(h.value) : Promise.resolve(h.value).then(s, r);
   a((t = t.apply(d, n)).next());
 });
-import * as x from "three";
-import { equal as S } from "../../shared-utils/equal.js";
-import { Main as y } from "../Components/Main.js";
+import * as S from "three";
+import { equal as y } from "../../shared-utils/equal.js";
+import { Main as I } from "../Components/Main.js";
 import { formatData as v } from "../utils/formatData.js";
-import { CAMERA_IMAGE as I } from "../Assets/camera.js";
-import { omit as L } from "../../shared-utils/filter.js";
+import { CAMERA_IMAGE as L } from "../Assets/camera.js";
+import { omit as T } from "../../shared-utils/filter.js";
 import { FLOOR_PLAN_ATTACHED_TO as _ } from "../constant.js";
 import { Controller as M } from "../../base/BasePluginWithData.js";
-import { changeMode as T } from "../../shared-utils/five/changeMode.js";
-import { getPxmm as P, getAttachedY as D } from "../../shared-utils/getPxmm.js";
+import { changeMode as P } from "../../shared-utils/five/changeMode.js";
+import { getPxmm as D, getAttachedY as O } from "../../shared-utils/getPxmm.js";
 import { changeModelCanvasOpacity as b } from "../../shared-utils/changeModelCanvasOpacity.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
@@ -90,7 +90,7 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/to.js";
-class Bt extends M {
+class $t extends M {
   constructor(t, e) {
     var h, c;
     super(t);
@@ -122,7 +122,7 @@ class Bt 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 = P(this.five, this.wrapper, this.floorIndex, r), h = Math.ceil(i * a), c = Math.ceil(s * a);
+      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;
     });
     /** 销毁插件 */
@@ -204,15 +204,17 @@ class Bt extends M {
       roomLabelsEnable: !0,
       roomAreaEnable: !0,
       roomNameEnable: !0,
-      cameraImageUrl: I,
+      roomDimensionEnable: !0,
+      cameraImageUrl: L,
       attachedTo: _.BOUNDING_CENTER,
       getLabelElement: void 0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
       i18n: (p) => p,
       adaptiveRoomLabelVisibleEnable: !0,
       getRoomAreaText: (p) => (p / 1e6).toFixed(1) + "㎡",
+      getRoomDimensionText: (p, w) => (p / 1e3).toFixed(1) + "m x " + (w / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (p) => p.toString()
-    }, s = e ? L(e, ["selector", "scale"]) : {}, r = l(l({}, i.missingFloorConfig), s.missingFloorConfig), a = m(l(l({}, i), s), { missingFloorConfig: r });
+    }, 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) {
@@ -229,7 +231,7 @@ class Bt extends M {
   /** 更新户型图位置 */
   updatePosition() {
     var a;
-    const t = D(this.five, this.floorIndex, this.state.config.attachedTo), e = (a = this.five.model) == null ? void 0 : a.bounding.getCenter(new x.Vector3()).setY(t);
+    const t = O(this.five, this.floorIndex, this.state.config.attachedTo), e = (a = this.five.model) == null ? void 0 : a.bounding.getCenter(new S.Vector3()).setY(t);
     if (!e)
       return;
     const i = e.clone().project(this.five.camera), s = (i.x + 1) / 2, r = -(i.y - 1) / 2;
@@ -294,7 +296,7 @@ class Bt extends M {
         return;
       this.isHiddenByHideFunc = !1;
       const { userAction: e } = t;
-      this.hooks.emit("show", { userAction: e, auto: !1 }), this.five.getCurrentState().mode !== "Topview" && (yield T(this.five, ["Topview", void 0, void 0, e])), this.five.model.show(this.floorIndex), this.updatePosition(), this.updateSize();
+      this.hooks.emit("show", { userAction: e, auto: !1 }), this.five.getCurrentState().mode !== "Topview" && (yield P(this.five, ["Topview", void 0, void 0, e])), this.five.model.show(this.floorIndex), this.updatePosition(), this.updateSize();
       const i = 500, s = this.state.config.modelOpacity;
       b(this.five, s, i), this.hooks.emit("showAnimationEnded", { userAction: e, auto: !1 }), this.render();
     });
@@ -316,7 +318,7 @@ class Bt extends M {
   updateState(t, e) {
     var a;
     const i = this.state, s = (a = t.config) != null && a.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, r = t.config ? m(l(l({}, i.config), t.config), { missingFloorConfig: s }) : i.config;
-    this.state = m(l(l({}, this.state), t), { config: r }), !S(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    this.state = m(l(l({}, this.state), t), { config: r }), !y(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   addEventListener() {
     if (!this.state.enabled || this.hasAddedEventListener)
@@ -357,9 +359,9 @@ class Bt extends M {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new y({ target: this.container, intro: !0, props: e });
+    this.app = new I({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  Bt as Controller
+  $t as Controller
 };

package/libs/floorplan/typings/floorplanData.d.ts

@@ -77,6 +77,13 @@ export interface FloorplanRoomItem {
     roomLabel: FloorplanRoomLabelItem;
     /** 当前房间里的 observer 索引 */
     observerIndexs: number[];
+    /** 当前房间的尺寸 */
+    dimension?: {
+        /** 房间宽度 */
+        width: number;
+        /** 房间高度 */
+        height: number;
+    };
 }
 /** 户型图标尺 */
 export type FloorplanRuleLabels = Record<'top' | 'right' | 'bottom' | 'left', FloorplanPosition[][]>;

package/libs/floorplan/typings/floorplanServerData.d.ts

@@ -99,6 +99,13 @@ export interface FloorplanServerRoomItem {
     room_label: FloorplanServerRoomLabelItem;
     /** 当前房间里的 observer 索引 */
     observer_indexs: number[];
+    /** 当前房间的尺寸 */
+    dimension?: {
+        /** 房间宽度 */
+        width: number;
+        /** 房间高度 */
+        height: number;
+    };
 }
 export type FloorplanServerRuleLabels = Record<'top' | 'right' | 'bottom' | 'left', FloorplanServerPosition[][]>;
 /** 当前楼层的数据 */

package/libs/floorplan/typings/index.d.ts

@@ -41,6 +41,8 @@ export interface Config {
     roomAreaEnable: boolean;
     /** 分间名称是否展示 */
     roomNameEnable: boolean;
+    /** 分间尺寸（长 x 宽）是否展示 */
+    roomDimensionEnable: boolean;
     /** 是否支持房屋标签自适应展示，默认为 true
      * @description
      * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
@@ -65,6 +67,13 @@ export interface Config {
      * @param area 分间原始面积，单位是 mm²
      */
     getRoomAreaText: (areaSize: number) => string;
+    /**
+     * 自定义分间尺寸文本
+     * @param width 分间原始宽度，单位是 mm
+     * @param height 分间原始高度，单位是 mm
+     * @returns
+     */
+    getRoomDimensionText: (width: number, height: number) => string;
     /** 自定义标尺距离文本
      * @param distance 原始标尺距离，单位是 mm
      */

package/libs/floorplan/utils/formatData.js

@@ -15,8 +15,8 @@ var c = (o, e, r) => new Promise((l, n) => {
   s((r = r.apply(o, e)).next());
 });
 import { FLOORPLAN_EXTRA_OBJECT_IMAGE as f } from "../Assets/floorplanExtraObject.js";
-import { getFloorIndexFromModelPosition as a, modelPosition2FloorplanPosition as u, floorplanPosition2ImagePosition as _ } from "./formatPosition.js";
-function I(o) {
+import { getFloorIndexFromModelPosition as u, modelPosition2FloorplanPosition as a, floorplanPosition2ImagePosition as _ } from "./formatPosition.js";
+function g(o) {
   return c(this, null, function* () {
     const e = new Headers({ "Content-Type": "text/plain" }), r = function(n) {
       return c(this, null, function* () {
@@ -35,8 +35,8 @@ function I(o) {
     return yield Promise.all(o.map(r));
   });
 }
-function g(o) {
-  return {
+function I(o) {
+  const e = {
     id: o.id,
     size: o.size,
     name: o.name,
@@ -49,12 +49,13 @@ function g(o) {
     },
     observerIndexs: o.observer_indexs
   };
+  return o.dimension && Object.assign(e, { dimension: o.dimension }), e;
 }
 function x(o) {
   return {
     floorName: o.floor_name,
     floorIndex: o.floor_index,
-    rooms: o.rooms.map(g),
+    rooms: o.rooms.map(I),
     rules: o.rules
   };
 }
@@ -78,7 +79,7 @@ function v(o) {
 }
 function P(o) {
   return c(this, null, function* () {
-    const e = yield I(o.outlines), r = o.computed_data.bounding, l = o.computed_data.floor_datas.map(x), n = o.computed_data.entrance ? v(o.computed_data.entrance) : null;
+    const e = yield g(o.outlines), r = o.computed_data.bounding, l = o.computed_data.floor_datas.map(x), n = o.computed_data.entrance ? v(o.computed_data.entrance) : null;
     return {
       outlines: e,
       entrance: n,
@@ -94,7 +95,7 @@ function y(o, e, r) {
       url: f,
       width: 45,
       height: 48
-    }, s = a(i, e), t = u(i, r), p = _(t, r);
+    }, s = u(i, e), t = a(i, r), p = _(t, r);
     return { floorIndex: s, icon: m, id: n.id, position: t, positionInImage: p };
   });
 }

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.19.1",
+    "%c %c@realsee/dnalogel %cv3.19.2-dev.3",
     [
       "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.19.1",
+  "version": "3.19.2-dev.3",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",