@realsee/dnalogel 3.0.1 → 3.1.0

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/Main.js

@@ -1,7 +1,7 @@
-import { SvelteComponent as K, init as L, safe_not_equal as Q, append_styles as T, empty as V, insert as y, transition_in as u, transition_out as p, check_outros as N, detach as I, onMount as X, element as P, attr as R, action_destroyer as Y, listen as H, group_outros as B, run_all as Z, assign as W, create_component as z, space as x, set_style as q, mount_component as C, append as $, get_spread_update as S, destroy_component as A } from "../../../vendor/svelte/internal/index.js";
-import ee from "./Camera.js";
-import te from "./CurrentFloor/CurrentFloor.js";
-import { svelteResizeObserver as ne } from "../../../shared-utils/svelte/resizeObserver.js";
+import { SvelteComponent as L, init as Q, safe_not_equal as T, append_styles as V, empty as X, insert as D, transition_in as u, transition_out as _, check_outros as P, detach as y, onMount as Y, element as R, attr as B, action_destroyer as Z, listen as H, group_outros as G, run_all as x, assign as W, create_component as z, space as $, set_style as I, mount_component as C, append as ee, get_spread_update as S, destroy_component as A } from "../../../vendor/svelte/internal/index.js";
+import te from "./Camera.js";
+import le from "./CurrentFloor/CurrentFloor.js";
+import { svelteResizeObserver as re } from "../../../shared-utils/svelte/resizeObserver.js";
 import "../../Assets/camera.js";
 import "../../../shared-utils/throttle.js";
 import "./CurrentFloor/ExtraObjects.js";
@@ -12,58 +12,58 @@ import "../../Components/RoomHighlight/RoomHighlight.js";
 import "../../Components/RoomHighlight/Room.js";
 import "../../utils/formatPosition.js";
 import "../../../vendor/resize-observer-polyfill/dist/ResizeObserver.es.js";
-function re(i) {
-  T(i, "svelte-1mvqyqq", ".plugin-floorplan-radar.svelte-1mvqyqq{width:100%;height:100%;display:flex;justify-content:center;align-items:center}.plugin-floorplan-radar-container.svelte-1mvqyqq{position:relative}");
+function ne(i) {
+  V(i, "svelte-1mvqyqq", ".plugin-floorplan-radar.svelte-1mvqyqq{width:100%;height:100%;display:flex;justify-content:center;align-items:center}.plugin-floorplan-radar-container.svelte-1mvqyqq{position:relative}");
 }
 function M(i) {
-  let e, l, n, o, r = (
+  let e, r, l, a, n = (
     /*clientWidth*/
-    i[7] !== 0 && F(i)
+    i[8] !== 0 && N(i)
   );
   return {
     c() {
-      e = P("div"), r && r.c(), R(e, "class", "plugin-floorplan-radar svelte-1mvqyqq");
+      e = R("div"), n && n.c(), B(e, "class", "plugin-floorplan-radar svelte-1mvqyqq");
     },
     m(f, m) {
-      y(f, e, m), r && r.m(e, null), l = !0, n || (o = [
-        Y(ne.call(null, e)),
+      D(f, e, m), n && n.m(e, null), r = !0, l || (a = [
+        Z(re.call(null, e)),
         H(
           e,
           "clientWidth",
           /*clientWidth_handler*/
-          i[13]
+          i[14]
         ),
         H(
           e,
           "clientHeight",
           /*clientHeight_handler*/
-          i[14]
+          i[15]
         )
-      ], n = !0);
+      ], l = !0);
     },
     p(f, m) {
       /*clientWidth*/
-      f[7] !== 0 ? r ? (r.p(f, m), m & /*clientWidth*/
-      128 && u(r, 1)) : (r = F(f), r.c(), u(r, 1), r.m(e, null)) : r && (B(), p(r, 1, 1, () => {
-        r = null;
-      }), N());
+      f[8] !== 0 ? n ? (n.p(f, m), m & /*clientWidth*/
+      256 && u(n, 1)) : (n = N(f), n.c(), u(n, 1), n.m(e, null)) : n && (G(), _(n, 1, 1, () => {
+        n = null;
+      }), P());
     },
     i(f) {
-      l || (u(r), l = !0);
+      r || (u(n), r = !0);
     },
     o(f) {
-      p(r), l = !1;
+      _(n), r = !1;
     },
     d(f) {
-      f && I(e), r && r.d(), n = !1, Z(o);
+      f && y(e), n && n.d(), l = !1, x(a);
     }
   };
 }
-function F(i) {
-  let e, l, n, o, r = `${/*contentWidth*/
-  i[9]}px`, f = `${/*contentHeight*/
-  i[12]}px`, m;
-  const c = [
+function N(i) {
+  let e, r, l, a, n = `${/*contentWidth*/
+  i[10]}px`, f = `${/*contentHeight*/
+  i[13]}px`, m;
+  const g = [
     {
       five: (
         /*five*/
@@ -71,11 +71,11 @@ function F(i) {
       ),
       pxmm: (
         /*pxmm*/
-        i[10]
+        i[11]
       ),
       floorIndex: (
         /*floorIndex*/
-        i[11]
+        i[12]
       ),
       floorplanData: (
         /*floorplanData*/
@@ -92,18 +92,22 @@ function F(i) {
       highlightData: (
         /*highlightData*/
         i[6]
+      ),
+      missingFloorImageUrl: (
+        /*missingFloorImageUrl*/
+        i[7]
       )
     }
   ];
-  let h = {};
-  for (let t = 0; t < c.length; t += 1)
-    h = W(h, c[t]);
-  l = new te({ props: h });
-  const g = [
+  let c = {};
+  for (let t = 0; t < g.length; t += 1)
+    c = W(c, g[t]);
+  r = new le({ props: c });
+  const h = [
     {
       pxmm: (
         /*pxmm*/
-        i[10]
+        i[11]
       ),
       five: (
         /*five*/
@@ -120,18 +124,18 @@ function F(i) {
     }
   ];
   let d = {};
-  for (let t = 0; t < g.length; t += 1)
-    d = W(d, g[t]);
-  return o = new ee({ props: d }), {
+  for (let t = 0; t < h.length; t += 1)
+    d = W(d, h[t]);
+  return a = new te({ props: d }), {
     c() {
-      e = P("div"), z(l.$$.fragment), n = x(), z(o.$$.fragment), R(e, "class", "plugin-floorplan-radar-container svelte-1mvqyqq"), q(e, "width", r), q(e, "height", f);
+      e = R("div"), z(r.$$.fragment), l = $(), z(a.$$.fragment), B(e, "class", "plugin-floorplan-radar-container svelte-1mvqyqq"), I(e, "width", n), I(e, "height", f);
     },
     m(t, s) {
-      y(t, e, s), C(l, e, null), $(e, n), C(o, e, null), m = !0;
+      D(t, e, s), C(r, e, null), ee(e, l), C(a, e, null), m = !0;
     },
     p(t, s) {
-      const _ = s & /*five, pxmm, floorIndex, floorplanData, hoverEnable, extraObjects, highlightData*/
-      3181 ? S(c, [
+      const p = s & /*five, pxmm, floorIndex, floorplanData, hoverEnable, extraObjects, highlightData, missingFloorImageUrl*/
+      6381 ? S(g, [
         {
           five: (
             /*five*/
@@ -139,11 +143,11 @@ function F(i) {
           ),
           pxmm: (
             /*pxmm*/
-            t[10]
+            t[11]
           ),
           floorIndex: (
             /*floorIndex*/
-            t[11]
+            t[12]
           ),
           floorplanData: (
             /*floorplanData*/
@@ -160,16 +164,20 @@ function F(i) {
           highlightData: (
             /*highlightData*/
             t[6]
+          ),
+          missingFloorImageUrl: (
+            /*missingFloorImageUrl*/
+            t[7]
           )
         }
       ]) : {};
-      l.$set(_);
+      r.$set(p);
       const v = s & /*pxmm, five, floorplanData, cameraImageUrl*/
-      1049 ? S(g, [
+      2073 ? S(h, [
         {
           pxmm: (
             /*pxmm*/
-            t[10]
+            t[11]
           ),
           five: (
             /*five*/
@@ -185,103 +193,104 @@ function F(i) {
           )
         }
       ]) : {};
-      o.$set(v), s & /*contentWidth*/
-      512 && r !== (r = `${/*contentWidth*/
-      t[9]}px`) && q(e, "width", r), s & /*contentHeight*/
-      4096 && f !== (f = `${/*contentHeight*/
-      t[12]}px`) && q(e, "height", f);
+      a.$set(v), s & /*contentWidth*/
+      1024 && n !== (n = `${/*contentWidth*/
+      t[10]}px`) && I(e, "width", n), s & /*contentHeight*/
+      8192 && f !== (f = `${/*contentHeight*/
+      t[13]}px`) && I(e, "height", f);
     },
     i(t) {
-      m || (u(l.$$.fragment, t), u(o.$$.fragment, t), m = !0);
+      m || (u(r.$$.fragment, t), u(a.$$.fragment, t), m = !0);
     },
     o(t) {
-      p(l.$$.fragment, t), p(o.$$.fragment, t), m = !1;
+      _(r.$$.fragment, t), _(a.$$.fragment, t), m = !1;
     },
     d(t) {
-      t && I(e), A(l), A(o);
+      t && y(e), A(r), A(a);
     }
   };
 }
-function le(i) {
-  let e, l, n = (
+function ie(i) {
+  let e, r, l = (
     /*visible*/
     i[1] && M(i)
   );
   return {
     c() {
-      n && n.c(), e = V();
+      l && l.c(), e = X();
     },
-    m(o, r) {
-      n && n.m(o, r), y(o, e, r), l = !0;
+    m(a, n) {
+      l && l.m(a, n), D(a, e, n), r = !0;
     },
-    p(o, [r]) {
+    p(a, [n]) {
       /*visible*/
-      o[1] ? n ? (n.p(o, r), r & /*visible*/
-      2 && u(n, 1)) : (n = M(o), n.c(), u(n, 1), n.m(e.parentNode, e)) : n && (B(), p(n, 1, 1, () => {
-        n = null;
-      }), N());
+      a[1] ? l ? (l.p(a, n), n & /*visible*/
+      2 && u(l, 1)) : (l = M(a), l.c(), u(l, 1), l.m(e.parentNode, e)) : l && (G(), _(l, 1, 1, () => {
+        l = null;
+      }), P());
     },
-    i(o) {
-      l || (u(n), l = !0);
+    i(a) {
+      r || (u(l), r = !0);
     },
-    o(o) {
-      p(n), l = !1;
+    o(a) {
+      _(l), r = !1;
     },
-    d(o) {
-      n && n.d(o), o && I(e);
+    d(a) {
+      l && l.d(a), a && y(e);
     }
   };
 }
-function ie(i, e, l) {
+function oe(i, e, r) {
   var w, j;
-  let { five: n } = e, { visible: o } = e, { hoverEnable: r } = e, { floorplanData: f } = e, { cameraImageUrl: m } = e, { extraObjects: c = [] } = e, { highlightData: h } = e, g = 0, d = (j = (w = n.work.observers[n.getCurrentState().panoIndex]) == null ? void 0 : w.floorIndex) != null ? j : 0, t = 0, s = 0, _ = 0, v = 0;
-  function k(a) {
-    l(11, d = n.work.observers[a].floorIndex);
+  let { five: l } = e, { visible: a } = e, { hoverEnable: n } = e, { floorplanData: f } = e, { cameraImageUrl: m } = e, { extraObjects: g = [] } = e, { highlightData: c } = e, { missingFloorImageUrl: h } = e, d = 0, t = (j = (w = l.work.observers[l.getCurrentState().panoIndex]) == null ? void 0 : w.floorIndex) != null ? j : 0, s = 0, p = 0, v = 0, U = 0;
+  function k(o) {
+    r(12, t = l.work.observers[o].floorIndex);
   }
-  X(() => (n.on("panoArrived", k), () => {
-    n.off("panoArrived", k);
+  Y(() => (l.on("panoArrived", k), () => {
+    l.off("panoArrived", k);
   }));
-  const G = (a) => {
-    l(7, t = a.detail);
-  }, J = (a) => {
-    l(8, s = a.detail);
+  const J = (o) => {
+    r(8, s = o.detail);
+  }, K = (o) => {
+    r(9, p = o.detail);
   };
-  return i.$$set = (a) => {
-    "five" in a && l(0, n = a.five), "visible" in a && l(1, o = a.visible), "hoverEnable" in a && l(2, r = a.hoverEnable), "floorplanData" in a && l(3, f = a.floorplanData), "cameraImageUrl" in a && l(4, m = a.cameraImageUrl), "extraObjects" in a && l(5, c = a.extraObjects), "highlightData" in a && l(6, h = a.highlightData);
+  return i.$$set = (o) => {
+    "five" in o && r(0, l = o.five), "visible" in o && r(1, a = o.visible), "hoverEnable" in o && r(2, n = o.hoverEnable), "floorplanData" in o && r(3, f = o.floorplanData), "cameraImageUrl" in o && r(4, m = o.cameraImageUrl), "extraObjects" in o && r(5, g = o.extraObjects), "highlightData" in o && r(6, c = o.highlightData), "missingFloorImageUrl" in o && r(7, h = o.missingFloorImageUrl);
   }, i.$$.update = () => {
     if (i.$$.dirty & /*clientWidth, clientHeight, floorplanData, contentWidth*/
-    904) {
-      const a = Math.min(t, s), { max: O, min: E } = f.bounding, b = O.x - E.x, D = O.y - E.y, U = function() {
-        return b > D ? [a, a / b * D] : [a / D * b, a];
+    1800) {
+      const o = Math.min(s, p), { max: F, min: O } = f.bounding, b = F.x - O.x, q = F.y - O.y, E = function() {
+        return b > q ? [o, o / b * q] : [o / q * b, o];
       }();
-      l(9, _ = U[0]), l(12, v = U[1]), l(10, g = _ / b);
+      r(10, v = E[0]), r(13, U = E[1]), r(11, d = v / b);
     }
   }, [
+    l,
+    a,
     n,
-    o,
-    r,
     f,
     m,
+    g,
     c,
     h,
-    t,
     s,
-    _,
-    g,
-    d,
+    p,
     v,
-    G,
-    J
+    d,
+    t,
+    U,
+    J,
+    K
   ];
 }
-class De extends K {
+class De extends L {
   constructor(e) {
-    super(), L(
+    super(), Q(
       this,
       e,
+      oe,
       ie,
-      le,
-      Q,
+      T,
       {
         five: 0,
         visible: 1,
@@ -289,9 +298,10 @@ class De extends K {
         floorplanData: 3,
         cameraImageUrl: 4,
         extraObjects: 5,
-        highlightData: 6
+        highlightData: 6,
+        missingFloorImageUrl: 7
       },
-      re
+      ne
     );
   }
 }

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -1,15 +1,15 @@
 var g = Object.defineProperty, w = Object.defineProperties;
 var v = Object.getOwnPropertyDescriptors;
-var f = Object.getOwnPropertySymbols;
+var m = Object.getOwnPropertySymbols;
 var A = Object.prototype.hasOwnProperty, S = Object.prototype.propertyIsEnumerable;
 var u = (r, i, t) => i in r ? g(r, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[i] = t, p = (r, i) => {
   for (var t in i || (i = {}))
     A.call(i, t) && u(r, t, i[t]);
-  if (f)
-    for (var t of f(i))
+  if (m)
+    for (var t of m(i))
       S.call(i, t) && u(r, t, i[t]);
   return r;
-}, b = (r, i) => w(r, v(i));
+}, f = (r, i) => w(r, v(i));
 var o = (r, i, t) => (u(r, typeof i != "symbol" ? i + "" : i, t), t);
 var c = (r, i, t) => new Promise((e, s) => {
   var h = (n) => {
@@ -31,7 +31,7 @@ import _ from "./Components/Main.js";
 import { equal as y } from "../../shared-utils/equal.js";
 import { CAMERA_IMAGE as D } from "../Assets/camera.js";
 import { Controller as O } from "../../base/BasePluginWithData.js";
-import { formatData as m, formatExtraObjects as C } from "../utils/formatData.js";
+import { formatData as b, formatExtraObjects as x } from "../utils/formatData.js";
 import "../../vendor/svelte/internal/index.js";
 import "./Components/Camera.js";
 import "../../shared-utils/throttle.js";
@@ -69,7 +69,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../Assets/floorplanExtraObject.js";
-class mt extends O {
+class bt extends O {
   constructor(t, e) {
     super(t);
     // =============== public properties =================
@@ -103,7 +103,8 @@ class mt extends O {
     const s = {
       hoverEnable: !0,
       highlightEnable: !0,
-      cameraImageUrl: D
+      cameraImageUrl: D,
+      missingFloorImageUrl: e.cameraImageUrl || this.staticPrefix + "/release/web/saas/missing-floor.d687a5ed.png"
     }, h = e != null && e.configs ? e.configs : {}, a = p(p({}, s), h);
     this.state = { enabled: !0, visible: !0, config: a }, e != null && e.wrapper && console.warn("不推荐继续使用 params.selector 配置父容器，请使用 appendTo 方法"), typeof (e == null ? void 0 : e.wrapper) == "string" ? this.wrapperSelector = e.wrapper : (e == null ? void 0 : e.wrapper) instanceof Element && (this.wrapper = e.wrapper), t.once("dispose", this.dispose);
   }
@@ -113,7 +114,7 @@ class mt extends O {
         return Object.prototype.hasOwnProperty.apply(l, ["version"]);
       }
       const a = JSON.parse(JSON.stringify(t)), d = h(a) ? a.data : a, n = this.data;
-      this.data = yield m(d), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, n), e && this.updateState(e, s), this.render();
+      this.data = yield b(d), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, n), e && this.updateState(e, s), this.render();
     });
   }
   show() {
@@ -164,11 +165,11 @@ class mt extends O {
     this.setState({ config: t }, { userAction: e }), this.render();
   }
   setExtraObjectsWith3DPositions(t) {
-    this.data && (this.extraObjects = C(t, this.five, this.data), this.render());
+    this.data && (this.extraObjects = x(t, this.five, this.data), this.render());
   }
   formatData(t) {
     return c(this, null, function* () {
-      return yield m(t.data);
+      return yield b(t.data);
     });
   }
   _enable(t) {
@@ -188,8 +189,8 @@ class mt extends O {
     this.hooks.emit("hide", { userAction: e }), this.render();
   }
   updateState(t, e) {
-    const s = this.state;
-    this.state = p(p({}, this.state), t), !y(this.state, s, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: s, userAction: e });
+    const s = this.state, h = t.config ? p(p({}, s.config), t.config) : s.config;
+    this.state = f(p(p({}, this.state), t), { config: h }), !y(this.state, s, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: s, userAction: e });
   }
   render() {
     if (this.disposed || !this.state.enabled)
@@ -200,7 +201,7 @@ class mt extends O {
     }
     if (!this.data || !this.wrapper)
       return;
-    const t = b(p({}, this.state.config), {
+    const t = f(p({}, this.state.config), {
       five: this.five,
       floorplanData: this.data,
       visible: this.state.visible,
@@ -211,5 +212,5 @@ class mt extends O {
   }
 }
 export {
-  mt as Controller
+  bt as Controller
 };

package/libs/floorplan/PanoFloorplanRadarPlugin/typing.d.ts

@@ -8,6 +8,8 @@ export interface Config {
     highlightEnable: boolean;
     /** 自定义「雷达」图标 */
     cameraImageUrl: string;
+    /** 当前楼层图片不存在时，使用的占位图片 */
+    missingFloorImageUrl: string;
 }
 export interface State extends BasePlugin.State {
     visible: boolean;

package/libs/floorplan/TopviewFloorplanPlugin/Controller.d.ts

@@ -20,6 +20,7 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     private lastPanoramaLongitude;
     /** 户型图大小 */
     private size;
+    private defaultMissingFloorConfig;
     /** 是否已经执行过事件监听 */
     private hasAddedEventListener;
     /** 上一次隐藏是否是用户调用了 hide 导致的 */