@realsee/dnalogel 3.64.22 → 3.64.23-alpha.16

package/libs/base/BasePlugin.js

@@ -13,7 +13,7 @@ import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
 import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
-import { absoluteUrl as p } from "../shared-utils/url/absoluteUrl.js";
+import { absoluteUrl as a } from "../shared-utils/url/absoluteUrl.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
 let E = class {
@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.64.22");
+    i(this, "VERSION", "3.64.23-alpha.16");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");
@@ -52,7 +52,7 @@ let E = class {
    * @description: 获取静态资源的url
    */
   absoluteUrl(t) {
-    return p(this.staticPrefix, t);
+    return a(this.staticPrefix, t);
   }
   onWorkCodeChange() {
   }

package/libs/floorplan/Components/RoomLabels/RoomLabels.js

@@ -1,74 +1,74 @@
-import { SvelteComponent as I, init as W, safe_not_equal as w, append_styles as z, empty as k, insert as g, transition_in as _, group_outros as A, transition_out as d, check_outros as v, detach as E, element as q, attr as C, action_destroyer as M, listen as S, update_keyed_each as j, outro_and_destroy_block as B, run_all as F, assign as G, create_component as H, mount_component as J, get_spread_update as K, destroy_component as P } from "../../../vendor/svelte/internal/index.js";
-import { RoomLabel as Q } from "./RoomLabel.js";
-import { svelteResizeObserver as U } from "../../../shared-utils/svelte/resizeObserver.js";
-function X(r) {
-  z(r, "svelte-13xux0b", ".floorplan-plugin__room-labels.svelte-13xux0b{width:100%;height:100%;position:absolute;left:0;top:0;z-index:20;pointer-events:none}");
+import { SvelteComponent as w, init as z, safe_not_equal as S, append_styles as q, empty as O, insert as E, transition_in as _, group_outros as V, transition_out as d, check_outros as x, detach as c, element as C, attr as M, action_destroyer as j, listen as B, update_keyed_each as F, outro_and_destroy_block as G, run_all as H, assign as J, create_component as K, mount_component as P, get_spread_update as Q, destroy_component as U } from "../../../vendor/svelte/internal/index.js";
+import { RoomLabel as X } from "./RoomLabel.js";
+import { svelteResizeObserver as Y } from "../../../shared-utils/svelte/resizeObserver.js";
+function Z(r) {
+  q(r, "svelte-13xux0b", ".floorplan-plugin__room-labels.svelte-13xux0b{width:100%;height:100%;position:absolute;left:0;top:0;z-index:20;pointer-events:none}");
 }
-function y(r, e, o) {
+function N(r, e, o) {
   const l = r.slice();
-  return l[15] = e[o], l;
+  return l[17] = e[o], l[19] = o, l;
 }
-function L(r) {
-  let e, o = [], l = /* @__PURE__ */ new Map(), a, b, u, m = (
+function k(r) {
+  let e, o = [], l = /* @__PURE__ */ new Map(), n, b, s, i = (
     /*rooms*/
-    r[11]
+    r[9]
   );
-  const f = (t) => (
+  const u = (a) => (
     /*room*/
-    t[15].id
+    a[17].id
   );
-  for (let t = 0; t < m.length; t += 1) {
-    let i = y(r, m, t), s = f(i);
-    l.set(s, o[t] = N(s, i));
+  for (let a = 0; a < i.length; a += 1) {
+    let m = N(r, i, a), f = u(m);
+    l.set(f, o[a] = v(f, m));
   }
   return {
     c() {
-      e = q("div");
-      for (let t = 0; t < o.length; t += 1)
-        o[t].c();
-      C(e, "class", "floorplan-plugin__room-labels svelte-13xux0b");
+      e = C("div");
+      for (let a = 0; a < o.length; a += 1)
+        o[a].c();
+      M(e, "class", "floorplan-plugin__room-labels svelte-13xux0b");
     },
-    m(t, i) {
-      g(t, e, i);
-      for (let s = 0; s < o.length; s += 1)
-        o[s] && o[s].m(e, null);
-      a = !0, b || (u = [
-        M(U.call(null, e)),
-        S(
+    m(a, m) {
+      E(a, e, m);
+      for (let f = 0; f < o.length; f += 1)
+        o[f] && o[f].m(e, null);
+      n = !0, b || (s = [
+        j(Y.call(null, e)),
+        B(
           e,
           "clientWidth",
           /*clientWidth_handler*/
-          r[14]
+          r[16]
         )
       ], b = !0);
     },
-    p(t, i) {
-      i & /*pxmm, rooms, hoveredRoom, roomAreaEnable, roomNameEnable, roomNameOtherTypeEnable, roomDimensionEnable, getLabelElement, getRoomAreaText, getRoomDimensionText, adaptiveRoomLabelVisibleEnable*/
-      3583 && (m = /*rooms*/
-      t[11], A(), o = j(o, i, f, 1, t, m, l, e, B, N, null, y), v());
+    p(a, m) {
+      m & /*pxmm, rooms, hoveredRoom, roomAreaVisibility, roomNameEnable, roomNameOtherTypeEnable, roomDimensionEnable, getLabelElement, getRoomAreaText, getRoomDimensionText, adaptiveRoomLabelVisibleEnable*/
+      3839 && (i = /*rooms*/
+      a[9], V(), o = F(o, m, u, 1, a, i, l, e, G, v, null, N), x());
     },
-    i(t) {
-      if (!a) {
-        for (let i = 0; i < m.length; i += 1)
-          _(o[i]);
-        a = !0;
+    i(a) {
+      if (!n) {
+        for (let m = 0; m < i.length; m += 1)
+          _(o[m]);
+        n = !0;
       }
     },
-    o(t) {
-      for (let i = 0; i < o.length; i += 1)
-        d(o[i]);
-      a = !1;
+    o(a) {
+      for (let m = 0; m < o.length; m += 1)
+        d(o[m]);
+      n = !1;
     },
-    d(t) {
-      t && E(e);
-      for (let i = 0; i < o.length; i += 1)
-        o[i].d();
-      b = !1, F(u);
+    d(a) {
+      a && c(e);
+      for (let m = 0; m < o.length; m += 1)
+        o[m].d();
+      b = !1, H(s);
     }
   };
 }
-function N(r, e) {
-  let o, l, a;
+function v(r, e) {
+  let o, l, n;
   const b = [
     {
       pxmm: (
@@ -77,62 +77,65 @@ function N(r, e) {
       ),
       room: (
         /*room*/
-        e[15]
+        e[17]
       ),
       hoveredRoom: (
         /*hoveredRoom*/
-        e[4]
+        e[3]
       ),
       roomAreaEnable: (
-        /*roomAreaEnable*/
-        e[0]
+        /*roomAreaVisibility*/
+        e[11][
+          /*index*/
+          e[19]
+        ]
       ),
       roomNameEnable: (
         /*roomNameEnable*/
-        e[1]
+        e[0]
       ),
       roomNameOtherTypeEnable: (
         /*roomNameOtherTypeEnable*/
-        e[2]
+        e[1]
       ),
       roomDimensionEnable: (
         /*roomDimensionEnable*/
-        e[3]
+        e[2]
       ),
       getLabelElement: (
         /*getLabelElement*/
-        e[7]
+        e[6]
       ),
       getRoomAreaText: (
         /*getRoomAreaText*/
-        e[5]
+        e[4]
       ),
       getRoomDimensionText: (
         /*getRoomDimensionText*/
-        e[6]
+        e[5]
       ),
       adaptiveRoomLabelVisibleEnable: (
         /*adaptiveRoomLabelVisibleEnable*/
-        e[8]
+        e[7]
       )
     }
   ];
-  let u = {};
-  for (let m = 0; m < b.length; m += 1)
-    u = G(u, b[m]);
-  return l = new Q({ props: u }), {
+  let s = {};
+  for (let i = 0; i < b.length; i += 1)
+    s = J(s, b[i]);
+  return l = new X({ props: s }), {
     key: r,
     first: null,
     c() {
-      o = k(), H(l.$$.fragment), this.first = o;
+      o = O(), K(l.$$.fragment), this.first = o;
     },
-    m(m, f) {
-      g(m, o, f), J(l, m, f), a = !0;
+    m(i, u) {
+      E(i, o, u), P(l, i, u), n = !0;
     },
-    p(m, f) {
-      e = m;
-      const t = f & /*pxmm, rooms, hoveredRoom, roomAreaEnable, roomNameEnable, roomNameOtherTypeEnable, roomDimensionEnable, getLabelElement, getRoomAreaText, getRoomDimensionText, adaptiveRoomLabelVisibleEnable*/
-      3583 ? K(b, [
+    p(i, u) {
+      e = i;
+      const a = u & /*pxmm, rooms, hoveredRoom, roomAreaVisibility, roomNameEnable, roomNameOtherTypeEnable, roomDimensionEnable, getLabelElement, getRoomAreaText, getRoomDimensionText, adaptiveRoomLabelVisibleEnable*/
+      3839 ? Q(b, [
         {
           pxmm: (
             /*pxmm*/
@@ -140,146 +143,153 @@ function N(r, e) {
           ),
           room: (
             /*room*/
-            e[15]
+            e[17]
           ),
           hoveredRoom: (
             /*hoveredRoom*/
-            e[4]
+            e[3]
           ),
           roomAreaEnable: (
-            /*roomAreaEnable*/
-            e[0]
+            /*roomAreaVisibility*/
+            e[11][
+              /*index*/
+              e[19]
+            ]
           ),
           roomNameEnable: (
             /*roomNameEnable*/
-            e[1]
+            e[0]
           ),
           roomNameOtherTypeEnable: (
             /*roomNameOtherTypeEnable*/
-            e[2]
+            e[1]
           ),
           roomDimensionEnable: (
             /*roomDimensionEnable*/
-            e[3]
+            e[2]
           ),
           getLabelElement: (
             /*getLabelElement*/
-            e[7]
+            e[6]
           ),
           getRoomAreaText: (
             /*getRoomAreaText*/
-            e[5]
+            e[4]
           ),
           getRoomDimensionText: (
             /*getRoomDimensionText*/
-            e[6]
+            e[5]
           ),
           adaptiveRoomLabelVisibleEnable: (
             /*adaptiveRoomLabelVisibleEnable*/
-            e[8]
+            e[7]
           )
         }
       ]) : {};
-      l.$set(t);
+      l.$set(a);
     },
-    i(m) {
-      a || (_(l.$$.fragment, m), a = !0);
+    i(i) {
+      n || (_(l.$$.fragment, i), n = !0);
     },
-    o(m) {
-      d(l.$$.fragment, m), a = !1;
+    o(i) {
+      d(l.$$.fragment, i), n = !1;
     },
-    d(m) {
-      m && E(o), P(l, m);
+    d(i) {
+      i && c(o), U(l, i);
     }
   };
 }
-function Y(r) {
+function p(r) {
   let e, o, l = (
     /*rooms*/
-    r[11] && L(r)
+    r[9] && k(r)
   );
   return {
     c() {
-      l && l.c(), e = k();
+      l && l.c(), e = O();
     },
-    m(a, b) {
-      l && l.m(a, b), g(a, e, b), o = !0;
+    m(n, b) {
+      l && l.m(n, b), E(n, e, b), o = !0;
     },
-    p(a, [b]) {
+    p(n, [b]) {
       /*rooms*/
-      a[11] ? l ? (l.p(a, b), b & /*rooms*/
-      2048 && _(l, 1)) : (l = L(a), l.c(), _(l, 1), l.m(e.parentNode, e)) : l && (A(), d(l, 1, 1, () => {
+      n[9] ? l ? (l.p(n, b), b & /*rooms*/
+      512 && _(l, 1)) : (l = k(n), l.c(), _(l, 1), l.m(e.parentNode, e)) : l && (V(), d(l, 1, 1, () => {
         l = null;
-      }), v());
+      }), x());
     },
-    i(a) {
+    i(n) {
       o || (_(l), o = !0);
     },
-    o(a) {
+    o(n) {
       d(l), o = !1;
     },
-    d(a) {
-      l && l.d(a), a && E(e);
+    d(n) {
+      l && l.d(n), n && c(e);
     }
   };
 }
-function Z(r, e, o) {
-  let l, { floorIndex: a } = e, { roomAreaEnable: b } = e, { roomNameEnable: u } = e, { roomNameOtherTypeEnable: m } = e, { roomDimensionEnable: f } = e, { floorplanData: t } = e, { hoveredRoom: i } = e, { getRoomAreaText: s } = e, { getRoomDimensionText: c } = e, { getLabelElement: R } = e, { adaptiveRoomLabelVisibleEnable: T } = e, h = 0, D = 0;
-  const O = (n) => {
-    o(9, h = n.detail);
+function $(r, e, o) {
+  let l, n, b, { floorIndex: s } = e, { roomAreaEnable: i } = e, { roomNameEnable: u } = e, { roomNameOtherTypeEnable: a } = e, { roomDimensionEnable: m } = e, { floorplanData: f } = e, { hoveredRoom: R } = e, { getRoomAreaText: y } = e, { getRoomDimensionText: T } = e, { getLabelElement: D } = e, { adaptiveRoomLabelVisibleEnable: L } = e, h = 0, A = 0;
+  const I = (t) => {
+    o(8, h = t.detail);
   };
-  return r.$$set = (n) => {
-    "floorIndex" in n && o(12, a = n.floorIndex), "roomAreaEnable" in n && o(0, b = n.roomAreaEnable), "roomNameEnable" in n && o(1, u = n.roomNameEnable), "roomNameOtherTypeEnable" in n && o(2, m = n.roomNameOtherTypeEnable), "roomDimensionEnable" in n && o(3, f = n.roomDimensionEnable), "floorplanData" in n && o(13, t = n.floorplanData), "hoveredRoom" in n && o(4, i = n.hoveredRoom), "getRoomAreaText" in n && o(5, s = n.getRoomAreaText), "getRoomDimensionText" in n && o(6, c = n.getRoomDimensionText), "getLabelElement" in n && o(7, R = n.getLabelElement), "adaptiveRoomLabelVisibleEnable" in n && o(8, T = n.adaptiveRoomLabelVisibleEnable);
+  return r.$$set = (t) => {
+    "floorIndex" in t && o(12, s = t.floorIndex), "roomAreaEnable" in t && o(13, i = t.roomAreaEnable), "roomNameEnable" in t && o(0, u = t.roomNameEnable), "roomNameOtherTypeEnable" in t && o(1, a = t.roomNameOtherTypeEnable), "roomDimensionEnable" in t && o(2, m = t.roomDimensionEnable), "floorplanData" in t && o(14, f = t.floorplanData), "hoveredRoom" in t && o(3, R = t.hoveredRoom), "getRoomAreaText" in t && o(4, y = t.getRoomAreaText), "getRoomDimensionText" in t && o(5, T = t.getRoomDimensionText), "getLabelElement" in t && o(6, D = t.getLabelElement), "adaptiveRoomLabelVisibleEnable" in t && o(7, L = t.adaptiveRoomLabelVisibleEnable);
   }, r.$$.update = () => {
     if (r.$$.dirty & /*floorplanData, floorIndex*/
-    12288 && o(11, l = t.floorDatas[a].rooms), r.$$.dirty & /*floorplanData, clientWidth*/
-    8704) {
-      const { max: n, min: x } = t.bounding, V = n.x - x.x;
-      o(10, D = h / V);
+    20480 && o(9, l = f.floorDatas[s].rooms), r.$$.dirty & /*floorplanData, floorIndex*/
+    20480 && o(15, n = f.areas[s]), r.$$.dirty & /*rooms, roomAreaEnable, areas*/
+    41472 && o(11, b = l.map((t, g) => i && !n[g].hideSize)), r.$$.dirty & /*floorplanData, clientWidth*/
+    16640) {
+      const { max: t, min: g } = f.bounding, W = t.x - g.x;
+      o(10, A = h / W);
     }
   }, [
-    b,
     u,
+    a,
     m,
-    f,
-    i,
-    s,
-    c,
     R,
+    y,
     T,
-    h,
     D,
+    L,
+    h,
     l,
-    a,
-    t,
-    O
+    A,
+    b,
+    s,
+    i,
+    f,
+    n,
+    I
   ];
 }
-class oe extends I {
+class te extends w {
   constructor(e) {
-    super(), W(
+    super(), z(
       this,
       e,
-      Z,
-      Y,
-      w,
+      $,
+      p,
+      S,
       {
         floorIndex: 12,
-        roomAreaEnable: 0,
-        roomNameEnable: 1,
-        roomNameOtherTypeEnable: 2,
-        roomDimensionEnable: 3,
-        floorplanData: 13,
-        hoveredRoom: 4,
-        getRoomAreaText: 5,
-        getRoomDimensionText: 6,
-        getLabelElement: 7,
-        adaptiveRoomLabelVisibleEnable: 8
+        roomAreaEnable: 13,
+        roomNameEnable: 0,
+        roomNameOtherTypeEnable: 1,
+        roomDimensionEnable: 2,
+        floorplanData: 14,
+        hoveredRoom: 3,
+        getRoomAreaText: 4,
+        getRoomDimensionText: 5,
+        getLabelElement: 6,
+        adaptiveRoomLabelVisibleEnable: 7
       },
-      X
+      Z
     );
   }
 }
 export {
-  oe as RoomLabels
+  te as RoomLabels
 };

package/libs/floorplan/Components/SvgImage.js

@@ -1,27 +1,27 @@
-import { SvelteComponent as p, init as r, safe_not_equal as g, append_styles as c, element as u, space as m, attr as _, insert as d, append as v, noop as o, detach as y, HtmlTag as i } from "../../vendor/svelte/internal/index.js";
+import { SvelteComponent as g, init as p, safe_not_equal as r, append_styles as c, element as u, space as m, attr as v, insert as _, append as d, noop as o, detach as y, HtmlTag as i } from "../../vendor/svelte/internal/index.js";
 function h(n) {
   c(n, "svelte-ub47ya", ".floorplan-plugin__base-image.svelte-ub47ya{width:100%;height:100%}");
 }
 function b(n) {
-  let e, a, l, f;
+  let e, s, f, l;
   return {
     c() {
-      e = u("div"), a = new i(!1), l = m(), f = new i(!1), a.a = l, f.a = null, _(e, "class", "floorplan-plugin__base-image svelte-ub47ya");
+      e = u("div"), s = new i(!1), f = m(), l = new i(!1), s.a = f, l.a = null, v(e, "class", "floorplan-plugin__base-image svelte-ub47ya");
     },
-    m(t, s) {
-      d(t, e, s), a.m(
+    m(t, a) {
+      _(t, e, a), s.m(
         /*svgStyle*/
         n[1],
         e
-      ), v(e, l), f.m(
+      ), d(e, f), l.m(
         /*content*/
         n[0],
         e
       );
     },
-    p(t, [s]) {
-      s & /*content*/
-      1 && f.p(
+    p(t, [a]) {
+      a & /*content*/
+      1 && l.p(
         /*content*/
         t[0]
       );
@@ -33,9 +33,9 @@ function b(n) {
     }
   };
 }
-function w(n, e, a) {
-  let { content: l } = e;
-  const f = `
+function k(n, e, s) {
+  let { content: f } = e;
+  const l = `
     <style>
       svg [type='lineGroup'] path {
         fill: #ffffff;
@@ -43,17 +43,23 @@ function w(n, e, a) {
       }
       svg [type='lineItemGroup'] g g g g {
         stroke: #ffffff;
+      }
+      svg defs g g g {
+        stroke: #ffffff;
+      }
+      svg [type='areaGroup'] path {
+        fill: none;
       }</style>
   `;
   return n.$$set = (t) => {
-    "content" in t && a(0, l = t.content);
-  }, [l, f];
+    "content" in t && s(0, f = t.content);
+  }, [f, l];
 }
-class k extends p {
+class G extends g {
   constructor(e) {
-    super(), r(this, e, w, b, g, { content: 0 }, h);
+    super(), p(this, e, k, b, r, { content: 0 }, h);
   }
 }
 export {
-  k as SvgImage
+  G as SvgImage
 };

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

@@ -100,6 +100,53 @@ export interface FloorplanFloorData {
     rules: FloorplanRuleLabels;
     items?: any[];
 }
+interface IAreas {
+    id: string;
+    direction: string;
+    directionCode: string;
+    roomType: string;
+    sharedLineItems: string[];
+    sharedLines: string[];
+    towardsRad: number;
+    type: number;
+}
+export interface IFloorplanArea {
+    attachments: {
+        areas: IAreas[];
+        lineItems: {
+            direction: string;
+            directionCode: string;
+            edge: boolean;
+            id: string;
+            is: string;
+            length: number;
+            towardsRad: number;
+        }[];
+    };
+    points: string[];
+    roomName: string;
+    roomType: string;
+    roomTypeName: number;
+    typeName: string;
+    type: number;
+    id: string;
+    empty: boolean;
+    roomTypeLabelMod: boolean;
+    labelX: number;
+    labelY: number;
+    hideName: boolean;
+    size: number;
+    customizedName: string;
+    displayName: string;
+    floorType: number;
+    hideSize: boolean;
+    nameIndex: string;
+    simpleLabelMod: false;
+    sizeWithoutLine: number;
+    subLabelX: number;
+    subLabelY: number;
+    subType: number;
+}
 /** 对 observer 做一些样式上的计算
  * @description 每一个 floorplanObserver 对应一个 observer
  * @description floorplanObserver 和 observer 在自身数组中的索引坐标应该是相同的
@@ -117,6 +164,7 @@ export interface FloorplanData {
     entrance: FloorplanEntrance | null;
     bounding: FloorplanBounding;
     observers: FloorplanObserver[];
+    areas: IFloorplanArea[][];
 }
 /** 能够映射到雷达图上的三维物体 */
 export interface FloorplanExtraObject3D {
@@ -146,3 +194,4 @@ export interface FloorplanExtraObject {
     /** 入户门在户型图上相对坐标 */
     positionInImage: FloorplanImagePosition;
 }
+export {};

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

@@ -1,3 +1,4 @@
+import type { IFloorplanArea } from "./floorplanData";
 /** 房屋数据映射表 */
 export declare const ROOM_FETILE_TYPE_MAP: ({
     type: number;
@@ -144,6 +145,7 @@ export interface FloorplanServerComputedData {
     bounding: FloorplanServerBounding;
     observers: FloorplanServerObserver[];
     doors: FloorplanServerDoorItem[];
+    areas: IFloorplanArea[][];
 }
 /** 原始输入的户型图数据 */
 export interface FloorplanServerData {