@realsee/dnalogel 3.64.17 → 3.64.19

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -29,10 +29,10 @@ var c = (d, n, t) => new Promise((i, e) => {
 });
 import * as S from "three";
 import { equal as y } from "../../shared-utils/equal.js";
-import { Main as I } from "../Components/Main.js";
+import { Main as T } from "../Components/Main.js";
 import { formatData as v } from "../utils/formatData.js";
-import { CAMERA_IMAGE as L } from "../Assets/camera.js";
-import { omit as T } from "../../shared-utils/filter.js";
+import { CAMERA_IMAGE as I } from "../Assets/camera.js";
+import { omit as L } 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 P } from "../../shared-utils/five/changeMode.js";
@@ -246,8 +246,9 @@ class Di extends M {
       roomLabelsEnable: !0,
       roomAreaEnable: !0,
       roomNameEnable: !0,
+      roomNameOtherTypeEnable: !0,
       roomDimensionEnable: !0,
-      cameraImageUrl: L,
+      cameraImageUrl: I,
       attachedTo: _.BOUNDING_CENTER,
       getLabelElement: void 0,
       missingFloorConfig: p(p({}, this.defaultMissingFloorConfig), i.missingFloorConfig),
@@ -256,7 +257,7 @@ class Di extends M {
       getRoomAreaText: (m) => (m / 1e6).toFixed(1) + "㎡",
       getRoomDimensionText: (m, w) => (m / 1e3).toFixed(1) + "m × " + (w / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (m) => m.toString()
-    }, s = i ? T(i, ["selector", "scale"]) : {}, r = p(p({}, e.missingFloorConfig), s.missingFloorConfig), a = f(p(p({}, e), s), { missingFloorConfig: r });
+    }, s = i ? L(i, ["selector", "scale"]) : {}, r = p(p({}, e.missingFloorConfig), s.missingFloorConfig), a = f(p(p({}, e), 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, i, e = !0) {
@@ -401,7 +402,7 @@ class Di extends M {
     });
     if (this.app)
       return this.app.$set(i);
-    this.app = new I({ target: this.container, intro: !0, props: i });
+    this.app = new T({ target: this.container, intro: !0, props: i });
   }
 }
 export {

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

@@ -62,6 +62,7 @@ export interface FloorplanRoomItem {
      */
     size: number;
     name: string;
+    customizedName: string;
     /** 围成房间区域的坐标路径
      * @description 坐标类型是户型图坐标
      */

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

@@ -84,6 +84,7 @@ export interface FloorplanServerRoomItem {
      */
     type: number;
     name: string;
+    customizedName?: string;
     /** 围成房间区域的坐标路径
      * @description 坐标类型是户型图坐标
      */

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

@@ -41,6 +41,8 @@ export interface Config {
     roomAreaEnable: boolean;
     /** 分间名称是否展示 */
     roomNameEnable: boolean;
+    /** 类型为其他分间名称是否展示 */
+    roomNameOtherTypeEnable: boolean;
     /** 分间尺寸（长 x 宽）是否展示 */
     roomDimensionEnable: boolean;
     /** 是否支持房屋标签自适应展示，默认为 true

package/libs/floorplan/utils/formatData.js

@@ -1,45 +1,47 @@
-var c = (o, e, r) => new Promise((l, n) => {
-  var i = (t) => {
+var p = (o, e, r) => new Promise((l, n) => {
+  var t = (i) => {
     try {
-      s(r.next(t));
-    } catch (p) {
-      n(p);
+      s(r.next(i));
+    } catch (c) {
+      n(c);
     }
-  }, m = (t) => {
+  }, m = (i) => {
     try {
-      s(r.throw(t));
-    } catch (p) {
-      n(p);
+      s(r.throw(i));
+    } catch (c) {
+      n(c);
     }
-  }, s = (t) => t.done ? l(t.value) : Promise.resolve(t.value).then(i, m);
+  }, s = (i) => i.done ? l(i.value) : Promise.resolve(i.value).then(t, m);
   s((r = r.apply(o, e)).next());
 });
 import { FLOORPLAN_EXTRA_OBJECT_IMAGE as f } from "../Assets/floorplanExtraObject.js";
 import { getFloorIndexFromModelPosition as u, modelPosition2FloorplanPosition as a, floorplanPosition2ImagePosition as _ } from "./formatPosition.js";
 function g(o) {
-  return c(this, null, function* () {
+  return p(this, null, function* () {
     const e = new Headers({ "Content-Type": "text/plain" }), r = function(n) {
-      return c(this, null, function* () {
-        const i = {
+      return p(this, null, function* () {
+        const t = {
           index: n.index,
           url: n.url,
           svgUrl: n.svg_url
         };
         if (n.svg_url) {
           const m = yield fetch(n.svg_url, { headers: e }).then((s) => s.text());
-          i.svgContent = m;
+          t.svgContent = m;
         }
-        return i;
+        return t;
       });
     };
     return yield Promise.all(o.map(r));
   });
 }
 function I(o) {
+  console.log("formatRoom 户型图数据 ", o);
   const e = {
     id: o.id,
     size: o.size,
     name: o.name,
+    customizedName: o.customizedName || "",
     path: o.path,
     roomType: o.room_type,
     floorType: o.floor_type,
@@ -78,7 +80,7 @@ function v(o) {
   };
 }
 function P(o) {
-  return c(this, null, function* () {
+  return p(this, null, function* () {
     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,
@@ -91,12 +93,12 @@ function P(o) {
 }
 function y(o, e, r) {
   return o.map((n) => {
-    const i = n.position, m = n.icon ? n.icon : {
+    const t = n.position, m = n.icon ? n.icon : {
       url: f,
       width: 45,
       height: 48
-    }, s = u(i, e), t = a(i, r), p = _(t, r);
-    return { floorIndex: s, icon: m, id: n.id, position: t, positionInImage: p };
+    }, s = u(t, e), i = a(t, r), c = _(i, r);
+    return { floorIndex: s, icon: m, id: n.id, position: i, positionInImage: c };
   });
 }
 export {

package/libs/shared-utils/logger.js

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