@realsee/dnalogel 3.64.17 → 3.64.18

package/libs/floorplan/Components/Items/Item.js

@@ -1,64 +1,69 @@
-import { SvelteComponent as u, init as d, safe_not_equal as h, append_styles as v, element as g, space as w, text as y, attr as p, src_url_equal as b, set_style as c, insert as I, append as m, set_data as q, noop as _, detach as k } from "../../../vendor/svelte/internal/index.js";
-function x(e) {
-  v(e, "svelte-2r6702", ".floorplan-plugin__item.svelte-2r6702{position:absolute;display:flex;flex-flow:column;align-items:center;line-height:1;color:#fff;transform:translate(-50%, -50%);white-space:nowrap;will-change:opacity;transition:opacity 300ms}.floorplan-plugin__img.svelte-2r6702{width:100%;height:100%}.floorplan-plugin__notes.svelte-2r6702{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);padding:0.25rem;line-height:1;border-radius:0.25rem;color:#fff;background:rgba(0,0,0,.6);font-size:0.75rem}");
+import { SvelteComponent as d, init as h, safe_not_equal as v, append_styles as w, element as g, space as y, text as b, attr as p, src_url_equal as I, set_style as f, insert as $, append as m, set_data as q, noop as u, detach as X } from "../../../vendor/svelte/internal/index.js";
+function Y(n) {
+  w(n, "svelte-2r6702", ".floorplan-plugin__item.svelte-2r6702{position:absolute;display:flex;flex-flow:column;align-items:center;line-height:1;color:#fff;transform:translate(-50%, -50%);white-space:nowrap;will-change:opacity;transition:opacity 300ms}.floorplan-plugin__img.svelte-2r6702{width:100%;height:100%}.floorplan-plugin__notes.svelte-2r6702{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);padding:0.25rem;line-height:1;border-radius:0.25rem;color:#fff;background:rgba(0,0,0,.6);font-size:0.75rem}");
 }
-function z(e) {
-  let t, i, n, f, s, o = (
+function k(n) {
+  let t, o, e, c, l, i = (
     /*item*/
-    e[0].notes + ""
-  ), a;
+    n[0].notes + ""
+  ), r;
   return {
     c() {
-      t = g("div"), i = g("img"), f = w(), s = g("span"), a = y(o), p(i, "class", "floorplan-plugin__img svelte-2r6702"), b(i.src, n = /*src*/
-      e[5]) || p(i, "src", n), p(i, "alt", ""), p(s, "class", "floorplan-plugin__notes svelte-2r6702"), p(t, "class", "floorplan-plugin__item svelte-2r6702"), c(
+      t = g("div"), o = g("img"), c = y(), l = g("span"), r = b(i), p(o, "class", "floorplan-plugin__img svelte-2r6702"), I(o.src, e = /*src*/
+      n[6]) || p(o, "src", e), p(o, "alt", ""), f(
+        o,
+        "transform",
+        /*transform*/
+        n[5]
+      ), p(l, "class", "floorplan-plugin__notes svelte-2r6702"), p(t, "class", "floorplan-plugin__item svelte-2r6702"), f(
         t,
         "left",
         /*left*/
-        e[1]
-      ), c(
+        n[1]
+      ), f(
         t,
         "top",
         /*top*/
-        e[2]
-      ), c(
+        n[2]
+      ), f(
         t,
         "width",
         /*width*/
-        e[3]
-      ), c(
+        n[3]
+      ), f(
         t,
         "height",
         /*height*/
-        e[4]
+        n[4]
       );
     },
-    m(l, r) {
-      I(l, t, r), m(t, i), m(t, f), m(t, s), m(s, a);
+    m(s, a) {
+      $(s, t, a), m(t, o), m(t, c), m(t, l), m(l, r);
     },
-    p(l, [r]) {
-      r & /*item*/
-      1 && o !== (o = /*item*/
-      l[0].notes + "") && q(a, o);
+    p(s, [a]) {
+      a & /*item*/
+      1 && i !== (i = /*item*/
+      s[0].notes + "") && q(r, i);
     },
-    i: _,
-    o: _,
-    d(l) {
-      l && k(t);
+    i: u,
+    o: u,
+    d(s) {
+      s && X(t);
     }
   };
 }
-function C(e, t, i) {
-  let { item: n } = t;
-  const f = n.positionInImage.x * 100 + "%", s = n.positionInImage.y * 100 + "%", o = n.width * 100 + "%", a = n.height * 100 + "%", l = n.src;
-  return e.$$set = (r) => {
-    "item" in r && i(0, n = r.item);
-  }, [n, f, s, o, a, l];
+function z(n, t, o) {
+  let { item: e } = t;
+  const c = e.positionInImage.x * 100 + "%", l = e.positionInImage.y * 100 + "%", i = e.width * 100 + "%", r = e.height * 100 + "%", s = `rotate(${e.rotateZ}deg) scaleX(${e.rotateX ? -1 : 1}) scaleY(${e.rotateY ? -1 : 1})`, a = e.src;
+  return n.$$set = (_) => {
+    "item" in _ && o(0, e = _.item);
+  }, [e, c, l, i, r, s, a];
 }
-class j extends u {
+class S extends d {
   constructor(t) {
-    super(), d(this, t, C, z, h, { item: 0 }, x);
+    super(), h(this, t, z, k, v, { item: 0 }, Y);
   }
 }
 export {
-  j as Item
+  S as Item
 };

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,15 +1,15 @@
-var M = Object.defineProperty, _ = Object.defineProperties;
-var L = Object.getOwnPropertyDescriptors;
+var O = Object.defineProperty, D = Object.defineProperties;
+var T = Object.getOwnPropertyDescriptors;
 var b = Object.getOwnPropertySymbols;
-var O = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
-var v = (l, h, t) => h in l ? M(l, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[h] = t, m = (l, h) => {
+var H = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
+var v = (l, h, t) => h in l ? O(l, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[h] = t, m = (l, h) => {
   for (var t in h || (h = {}))
-    O.call(h, t) && v(l, t, h[t]);
+    H.call(h, t) && v(l, t, h[t]);
   if (b)
     for (var t of b(h))
-      D.call(h, t) && v(l, t, h[t]);
+      k.call(h, t) && v(l, t, h[t]);
   return l;
-}, g = (l, h) => _(l, L(h));
+}, g = (l, h) => D(l, T(h));
 var o = (l, h, t) => (v(l, typeof h != "symbol" ? h + "" : h, t), t);
 var f = (l, h, t) => new Promise((e, i) => {
   var s = (n) => {
@@ -29,26 +29,26 @@ var f = (l, h, t) => new Promise((e, i) => {
 });
 import S from "./items.js";
 import * as C from "three";
-import { to as T } from "../../shared-utils/to.js";
-import { equal as H } from "../../shared-utils/equal.js";
-import { Main as k } from "../Components/Main.js";
+import { to as R } from "../../shared-utils/to.js";
+import { equal as U } from "../../shared-utils/equal.js";
+import { Main as z } from "../Components/Main.js";
 import { formatData as A } from "../utils/formatData.js";
-import { CAMERA_IMAGE as R } from "../Assets/camera.js";
+import { CAMERA_IMAGE as W } from "../Assets/camera.js";
 import { omit as F } from "../../shared-utils/filter.js";
-import { FLOOR_PLAN_ATTACHED_TO as U } from "../constant.js";
-import { Controller as z } from "../../base/BasePluginWithData.js";
-import { getPxmm as W, getAttachedY as N } from "../../shared-utils/getPxmm.js";
-import { correctFiveState as G } from "../utils/correctFiveState.js";
+import { FLOOR_PLAN_ATTACHED_TO as N } from "../constant.js";
+import { Controller as G } from "../../base/BasePluginWithData.js";
+import { getPxmm as B, getAttachedY as j } from "../../shared-utils/getPxmm.js";
+import { correctFiveState as V } from "../utils/correctFiveState.js";
 import { changeModelCanvasOpacity as E } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FloorplanErrorType as c, SHOW_ANIME_DURATION as B } from "../utils/constant.js";
+import { FloorplanErrorType as c, SHOW_ANIME_DURATION as $ } from "../utils/constant.js";
 import "../../shared-utils/tag.js";
 import "../../vendor/hammerjs/hammer.js";
 import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/CSS3DRenderer/index.js";
-import { waitFiveModelLoaded as j } from "../../shared-utils/five/fiveModelLoad.js";
+import { waitFiveModelLoaded as Y } from "../../shared-utils/five/fiveModelLoad.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
-import { isNil as V } from "../../shared-utils/isNil.js";
+import { isNil as q } from "../../shared-utils/isNil.js";
 import "../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "../../vendor/animejs/lib/anime.es.js";
@@ -135,16 +135,16 @@ import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../../Sculpt/utils/three/rayOnLine.js";
 import "@realsee/five";
-const $ = "//vr-image-4.realsee-cdn.cn/release/static/image/doctorstrange/0.6.201-beta/";
-function q(l) {
+const J = "//vr-image-4.realsee-cdn.cn/release/static/image/doctorstrange/0.6.201-beta/";
+function X(l) {
   const { latitude: h, longitude: t } = l, e = Math.abs(h - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
   return e || i;
 }
-function J(l) {
+function Z(l) {
   const { latitude: h, longitude: t } = l, e = Math.abs(h - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Ye extends z {
+class Ke extends G {
   constructor(t, e) {
     var n, d;
     super(t);
@@ -211,7 +211,7 @@ class Ye extends z {
     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, s = e.y - t.y, a = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, r = W(this.five, this.wrapper, this.floorIndex, a), n = Math.ceil(i * r), d = Math.ceil(s * r);
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, a = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, r = B(this.five, this.wrapper, this.floorIndex, a), n = Math.ceil(i * r), d = Math.ceil(s * r);
       return this.size.width === n && this.size.height === d || (this.container.style.width = n + "px", this.container.style.height = d + "px", this.size = { width: n, height: d }), !0;
     });
     o(this, "highlight", (t) => {
@@ -251,7 +251,7 @@ class Ye extends z {
         this.showRejection = (u) => {
           r = !0, n = u;
         };
-        const [d] = yield T(G(this.five, this.showState, i.userAction));
+        const [d] = yield R(V(this.five, this.showState, i.userAction));
         if (d)
           throw d;
         if (r)
@@ -262,7 +262,7 @@ class Ye extends z {
       });
       return this.isHiddenByHideFunc = !1, this.showPromise = s().then(() => {
         this.showPromise = void 0, this.showRejection = void 0;
-        const r = i.modelOpacity, n = i.immediately ? 0 : B;
+        const r = i.modelOpacity, n = i.immediately ? 0 : $;
         E(this.five, r, n), this.render(n), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
@@ -306,7 +306,7 @@ class Ye extends z {
       if (!e || this.state.visible || this.state.config.autoShowEnable === !1 || this.isHiddenByHideFunc)
         return;
       const i = this.five.getCurrentState();
-      i.mode === this.showState.mode && J(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 }));
+      i.mode === this.showState.mode && Z(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 }));
     });
     /** panoIndex 改变时，更新 floorIndex */
     o(this, "onFivePanoArrived", (t) => {
@@ -318,7 +318,7 @@ class Ye extends z {
       if (!this.state.visible || this.showPromise)
         return;
       const i = this.five.getCurrentState();
-      this.updatePosition(), this.updateSize(), q(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
+      this.updatePosition(), this.updateSize(), X(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
     });
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     o(this, "onFiveWantsPanGesture", (t, e) => {
@@ -367,8 +367,8 @@ class Ye extends z {
       roomAreaEnable: !0,
       roomNameEnable: !0,
       roomDimensionEnable: !0,
-      cameraImageUrl: R,
-      attachedTo: U.BOUNDING_CENTER,
+      cameraImageUrl: W,
+      attachedTo: N.BOUNDING_CENTER,
       getLabelElement: void 0,
       adaptiveRoomLabelVisibleEnable: !0,
       missingFloorConfig: m(m({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
@@ -377,7 +377,7 @@ class Ye extends z {
       getRoomDimensionText: (p, u) => (p / 1e3).toFixed(1) + "m × " + (u / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (p) => p.toString()
     }, s = e ? F(e, ["selector", "scale"]) : {}, a = m(m({}, i.missingFloorConfig), s.missingFloorConfig), r = g(m(m({}, i), s), { missingFloorConfig: a });
-    this.state = { enabled: !0, visible: !1, config: r }, this.initContainer(), j(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
+    this.state = { enabled: !0, visible: !1, config: r }, this.initContainer(), Y(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
     return f(this, null, function* () {
@@ -385,7 +385,7 @@ class Ye extends z {
         return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
       const a = t;
-      a && V(a.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
+      a && q(a.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
       const r = JSON.parse(JSON.stringify(t)), n = s(r) ? r.data : r, d = this.data;
       this.data = yield A(n), console.log(this.data), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, d), e && this.updateState(e, i), this.render();
     });
@@ -394,14 +394,17 @@ class Ye extends z {
     const { min: e, max: i } = this.data.bounding, s = i.x - e.x, a = i.y - e.y;
     this.data.floorDatas.forEach((r, n) => {
       r.items = t[n].filter((d) => d.displayName === "Item-SimpleItem").map((d) => {
-        const { x: p, y: u, width: P, height: x, notes: y, type: w, id: I } = d;
+        const { x: p, y: u, width: P, height: x, notes: y, type: w, id: I, rotateX: M, rotateY: _, rotateZ: L = 0 } = d;
         return {
           id: I,
           positionInImage: { x: (p - e.x) / s, y: (i.y - u) / a },
           width: P / s,
           height: x / a,
-          src: $ + S[w].href.replace(/\{\{\stheme\s\}\}/, "realsee"),
-          notes: y || S[w].description
+          src: J + S[w].href.replace(/\{\{\stheme\s\}\}/, "realsee"),
+          notes: y || S[w].description,
+          rotateX: M,
+          rotateY: _,
+          rotateZ: L
         };
       });
     });
@@ -439,7 +442,7 @@ class Ye extends z {
   /** 更新户型图位置 */
   updatePosition() {
     var r;
-    const t = N(this.five, this.floorIndex, this.state.config.attachedTo), e = (r = this.fiveUtil.model) == null ? void 0 : r.bounding.getCenter(new C.Vector3()).setY(t);
+    const t = j(this.five, this.floorIndex, this.state.config.attachedTo), e = (r = this.fiveUtil.model) == null ? void 0 : r.bounding.getCenter(new C.Vector3()).setY(t);
     if (!e)
       return;
     const i = e.clone().project(this.five.camera), s = (i.x + 1) / 2, a = -(i.y - 1) / 2;
@@ -453,7 +456,7 @@ class Ye extends z {
   updateState(t, e) {
     var r;
     const i = this.state, s = (r = t.config) != null && r.missingFloorConfig ? m(m({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, a = t.config ? g(m(m({}, i.config), t.config), { missingFloorConfig: s }) : i.config;
-    this.state = g(m(m({}, this.state), t), { config: a }), !H(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    this.state = g(m(m({}, this.state), t), { config: a }), !U(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -495,9 +498,9 @@ class Ye extends z {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new k({ target: this.container, intro: !0, props: e });
+    this.app = new z({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  Ye as Controller
+  Ke as Controller
 };

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.18",
     [
       "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.18",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",