@realsee/dnalogel 3.58.5 → 3.58.6

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

@@ -34,6 +34,7 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     private isHiddenByHideFunc;
     /** 高亮区域 */
     private highlightData;
+    private store;
     constructor(five: Five, params?: Parameters);
     load(serverData: PluginServerData | FloorplanServerData, state?: Partial<State>, userAction?: boolean): Promise<void>;
     /** 把插件的渲染DOM插入到对应的容器中去 */

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,15 +1,15 @@
 var F = Object.defineProperty, P = Object.defineProperties;
 var E = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
+var x = Object.prototype.hasOwnProperty, M = Object.prototype.propertyIsEnumerable;
 var v = (d, n, t) => n in d ? F(d, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[n] = t, l = (d, n) => {
   for (var t in n || (n = {}))
     x.call(n, t) && v(d, t, n[t]);
   if (w)
     for (var t of w(n))
-      I.call(n, t) && v(d, t, n[t]);
+      M.call(n, t) && v(d, t, n[t]);
   return d;
-}, u = (d, n) => P(d, E(n));
+}, c = (d, n) => P(d, E(n));
 var o = (d, n, t) => (v(d, typeof n != "symbol" ? n + "" : n, t), t);
 var f = (d, n, t) => new Promise((e, i) => {
   var r = (a) => {
@@ -28,18 +28,18 @@ var f = (d, n, t) => new Promise((e, i) => {
   s((t = t.apply(d, n)).next());
 });
 import * as b from "three";
-import { to as M } from "../../shared-utils/to.js";
+import { to as I } from "../../shared-utils/to.js";
 import { equal as y } from "../../shared-utils/equal.js";
 import { Main as _ } from "../Components/Main.js";
 import { formatData as S } from "../utils/formatData.js";
 import { CAMERA_IMAGE as L } from "../Assets/camera.js";
 import { omit as C } from "../../shared-utils/filter.js";
-import { FLOOR_PLAN_ATTACHED_TO as D } from "../constant.js";
-import { Controller as O } from "../../base/BasePluginWithData.js";
+import { FLOOR_PLAN_ATTACHED_TO as O } from "../constant.js";
+import { Controller as D } from "../../base/BasePluginWithData.js";
 import { getPxmm as T, getAttachedY as k } from "../../shared-utils/getPxmm.js";
 import { correctFiveState as R } from "../utils/correctFiveState.js";
 import { changeModelCanvasOpacity as A } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FloorplanErrorType as c, SHOW_ANIME_DURATION as H } from "../utils/constant.js";
+import { FloorplanErrorType as u, SHOW_ANIME_DURATION as H } from "../utils/constant.js";
 import "../../shared-utils/tag.js";
 import "hammerjs";
 import "../../shared-utils/three/PointSelector/index.js";
@@ -138,7 +138,7 @@ function G(d) {
   const { latitude: n, longitude: t } = d, e = Math.abs(n - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class He extends O {
+class He extends D {
   constructor(t, e) {
     var a, m;
     super(t);
@@ -172,6 +172,7 @@ class He extends O {
     o(this, "isHiddenByHideFunc", !1);
     /** 高亮区域 */
     o(this, "highlightData", {});
+    o(this, "store", { roomOnMouse: null });
     /** 销毁插件 */
     o(this, "dispose", () => {
       var t, e;
@@ -215,7 +216,7 @@ class He extends O {
     o(this, "_disable", (t) => {
       var i, r, h;
       const { userAction: e } = t;
-      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, c.BreakOffByDisable), this.showPromise = void 0, (r = this.app) == null || r.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, u.BreakOffByDisable), this.showPromise = void 0, (r = this.app) == null || r.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
     });
     o(this, "_enable", (t) => {
       const { userAction: e } = t;
@@ -226,9 +227,9 @@ class He extends O {
       if (!this.state.enabled)
         return;
       if (!((h = this.fiveUtil.model) != null && h.loaded))
-        throw new Error(c.ModelNotLoaded);
+        throw new Error(u.ModelNotLoaded);
       if (!this.data)
-        throw new Error(c.DataNotLoaded);
+        throw new Error(u.DataNotLoaded);
       if (this.showPromise)
         return this.showPromise;
       const e = {
@@ -243,13 +244,13 @@ class He extends O {
         this.showRejection = (g) => {
           s = !0, a = g;
         };
-        const [m] = yield M(R(this.five, this.showState, i.userAction));
+        const [m] = yield I(R(this.five, this.showState, i.userAction));
         if (m)
           throw m;
         if (s)
-          throw a ? new Error(a) : new Error(c.UnknownError);
+          throw a ? new Error(a) : new Error(u.UnknownError);
         if (!this.updateSize())
-          throw new Error(c.UpdateSizeError);
+          throw new Error(u.UpdateSizeError);
         this.updatePosition(), this.floorIndex = i.floorIndex, this.fiveUtil.model.show(this.floorIndex);
       });
       return this.isHiddenByHideFunc = !1, this.showPromise = r().then(() => {
@@ -266,7 +267,7 @@ class He extends O {
     }));
     o(this, "_hide", (t) => {
       var r;
-      (r = this.showRejection) == null || r.call(this, c.BreakOffByHide), this.showPromise = void 0;
+      (r = this.showRejection) == null || r.call(this, u.BreakOffByHide), this.showPromise = void 0;
       const i = l(l({}, {
         userAction: !0,
         isAutoHide: !1
@@ -276,7 +277,7 @@ class He extends O {
     o(this, "handleClick", () => {
       if (!this.state.visible)
         return;
-      if (this.hooks.emit("click"))
+      if (this.hooks.emit("click", this.store.roomOnMouse))
         return !1;
     });
     /** modelLoaded 之后自动执行 append container 操作  */
@@ -360,7 +361,7 @@ class He extends O {
       roomNameEnable: !0,
       roomDimensionEnable: !0,
       cameraImageUrl: L,
-      attachedTo: D.BOUNDING_CENTER,
+      attachedTo: O.BOUNDING_CENTER,
       getLabelElement: void 0,
       adaptiveRoomLabelVisibleEnable: !0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
@@ -368,7 +369,7 @@ class He extends O {
       getRoomAreaText: (p) => (p / 1e6).toFixed(1) + "㎡",
       getRoomDimensionText: (p, g) => (p / 1e3).toFixed(1) + "m × " + (g / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (p) => p.toString()
-    }, r = e ? C(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), r.missingFloorConfig), s = u(l(l({}, i), r), { missingFloorConfig: h });
+    }, r = e ? C(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), r.missingFloorConfig), s = c(l(l({}, i), r), { missingFloorConfig: h });
     this.state = { enabled: !0, visible: !1, config: s }, this.initContainer(), z(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
@@ -428,8 +429,8 @@ class He extends O {
   }
   updateState(t, e) {
     var s;
-    const i = this.state, r = (s = t.config) != null && s.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? u(l(l({}, i.config), t.config), { missingFloorConfig: r }) : i.config;
-    this.state = u(l(l({}, this.state), t), { config: h }), !y(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, r = (s = t.config) != null && s.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? c(l(l({}, i.config), t.config), { missingFloorConfig: r }) : i.config;
+    this.state = c(l(l({}, this.state), t), { config: h }), !y(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -458,14 +459,15 @@ class He extends O {
   render(t) {
     if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;
-    const e = u(l({}, this.state.config), {
+    const e = c(l({}, this.state.config), {
       visible: this.state.visible,
       duration: t != null ? t : 0,
       panoIndex: this.panoIndex,
       floorIndex: this.floorIndex,
       floorplanData: this.data,
       lastPanoramaLongitude: this.lastPanoramaLongitude,
-      highlightData: this.highlightData
+      highlightData: this.highlightData,
+      store: this.store
     });
     if (this.app)
       return this.app.$set(e);

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

@@ -34,6 +34,7 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     private isHiddenByHideFunc;
     /** 高亮区域 */
     private highlightData;
+    private store;
     constructor(five: Five, params?: Parameters);
     load(serverData: PluginServerData | FloorplanServerData, state?: Partial<State>, userAction?: boolean): Promise<void>;
     /** 把插件的渲染DOM插入到对应的容器中去 */

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -11,7 +11,7 @@ var v = (d, s, t) => s in d ? C(d, s, { enumerable: !0, configurable: !0, writab
   return d;
 }, g = (d, s) => S(d, E(s));
 var o = (d, s, t) => (v(d, typeof s != "symbol" ? s + "" : s, t), t);
-var m = (d, s, t) => new Promise((e, i) => {
+var f = (d, s, t) => new Promise((e, i) => {
   var r = (a) => {
     try {
       n(t.next(a));
@@ -27,14 +27,14 @@ var m = (d, s, t) => new Promise((e, i) => {
   }, n = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(r, h);
   n((t = t.apply(d, s)).next());
 });
-import { to as I } from "../../shared-utils/to.js";
-import { equal as M } from "../../shared-utils/equal.js";
+import { to as M } from "../../shared-utils/to.js";
+import { equal as I } from "../../shared-utils/equal.js";
 import { Main as y } from "../Components/Main.js";
 import { formatData as b } from "../utils/formatData.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 { getPxmm as O } from "../../shared-utils/getPxmm.js";
+import { FLOOR_PLAN_ATTACHED_TO as D } from "../constant.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";
@@ -171,6 +171,7 @@ class Re extends T {
     o(this, "isHiddenByHideFunc", !1);
     /** 高亮区域 */
     o(this, "highlightData", {});
+    o(this, "store", { roomOnMouse: null });
     /** 销毁插件 */
     o(this, "dispose", () => {
       var t, e;
@@ -188,21 +189,21 @@ class Re extends T {
      * @param opts.isAutoShow 是否是自动展示
      * @param opts.userAction 是否是用户行为
      */
-    o(this, "show", (...e) => m(this, [...e], function* (t = {}) {
+    o(this, "show", (...e) => f(this, [...e], function* (t = {}) {
       if (!this.state.enabled || !this.showPromise && this.state.visible)
         return;
       const i = t.userAction !== void 0 ? t.userAction : !0;
       this.updateState({ visible: !0 }, i), this._show(t);
     }));
     /** 隐藏户型图 */
-    o(this, "hide", (...e) => m(this, [...e], function* (t = {}) {
+    o(this, "hide", (...e) => f(this, [...e], function* (t = {}) {
       this.state.enabled && (this.isHiddenByHideFunc = !0, this.state.visible !== !1 && (this.updateState({ visible: !1 }, t.userAction || !0), this._hide(t)));
     }));
     /** 更新户型图大小 */
     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, r = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, n = D(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * n), p = Math.ceil(r * n);
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, r = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, n = O(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * n), p = Math.ceil(r * n);
       return this.size.width === a && this.size.height === p || (this.container.style.width = a + "px", this.container.style.height = p + "px", this.size = { width: a, height: p }), !0;
     });
     o(this, "highlight", (t) => {
@@ -220,7 +221,7 @@ class Re extends T {
       const { userAction: e } = t;
       this.addEventListener(), this.wrapper && (this.wrapper.append(this.container), this.hooks.emit("enable", { userAction: e }), this.state.visible && this._show({ userAction: e }));
     });
-    o(this, "_show", (t) => m(this, null, function* () {
+    o(this, "_show", (t) => f(this, null, function* () {
       var h;
       if (!this.state.enabled)
         return;
@@ -236,13 +237,13 @@ class Re extends T {
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = l(l({}, e), t), r = () => m(this, null, function* () {
+      }, i = l(l({}, e), t), r = () => f(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
         let n = !1, a;
-        this.showRejection = (f) => {
-          n = !0, a = f;
+        this.showRejection = (m) => {
+          n = !0, a = m;
         };
-        const [p] = yield I(k(this.five, this.showState, i.userAction));
+        const [p] = yield M(k(this.five, this.showState, i.userAction));
         if (p)
           throw p;
         if (n)
@@ -275,7 +276,7 @@ class Re extends T {
     o(this, "handleClick", () => {
       if (!this.state.visible)
         return;
-      if (this.hooks.emit("click"))
+      if (this.hooks.emit("click", this.store.roomOnMouse))
         return !1;
     });
     /** modelLoaded 之后自动执行 append container 操作  */
@@ -364,18 +365,18 @@ class Re extends T {
       roomDimensionEnable: !0,
       adaptiveRoomLabelVisibleEnable: !0,
       cameraImageUrl: _,
-      attachedTo: O.BOUNDING_CENTER,
+      attachedTo: D.BOUNDING_CENTER,
       getLabelElement: void 0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
-      i18n: (f) => f,
-      getRoomAreaText: (f) => (f / 1e6).toFixed(1) + "㎡",
-      getRoomDimensionText: (f, A) => (f / 1e3).toFixed(1) + "m × " + (A / 1e3).toFixed(1) + "m",
-      getRuleDistanceText: (f) => f.toString()
+      i18n: (m) => m,
+      getRoomAreaText: (m) => (m / 1e6).toFixed(1) + "㎡",
+      getRoomDimensionText: (m, A) => (m / 1e3).toFixed(1) + "m × " + (A / 1e3).toFixed(1) + "m",
+      getRuleDistanceText: (m) => m.toString()
     }, r = e ? L(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), r.missingFloorConfig), n = g(l(l({}, i), r), { missingFloorConfig: h });
     this.state = { enabled: !0, visible: !1, config: n }, this.initContainer(), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
-    return m(this, null, function* () {
+    return f(this, null, function* () {
       function r(c) {
         return Object.prototype.hasOwnProperty.apply(c, ["version"]);
       }
@@ -417,14 +418,14 @@ class Re extends T {
     this.updateState({ config: t }, e), this.render();
   }
   formatData(t) {
-    return m(this, null, function* () {
+    return f(this, null, function* () {
       return yield b(t.data);
     });
   }
   updateState(t, e) {
     var n;
     const i = this.state, r = (n = t.config) != null && n.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? g(l(l({}, i.config), t.config), { missingFloorConfig: r }) : i.config;
-    this.state = g(l(l({}, this.state), t), { config: h }), !M(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    this.state = g(l(l({}, this.state), t), { config: h }), !I(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -460,7 +461,8 @@ class Re extends T {
       floorIndex: this.floorIndex,
       floorplanData: this.data,
       lastPanoramaLongitude: this.lastPanoramaLongitude,
-      highlightData: this.highlightData
+      highlightData: this.highlightData,
+      store: this.store
     });
     if (this.app)
       return this.app.$set(e);

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

@@ -126,7 +126,7 @@ export interface EventMap extends BasePlugin.EventMap<State, FloorplanData> {
      * 点击户型图的回调
      * @return 当返回 false 时，会阻止默认行为
      */
-    click: () => boolean | undefined;
+    click: (room: FloorplanRoomItem | undefined) => boolean | undefined;
 }
 export interface ShowOptions {
     /** 展示户型图时，希望到达的楼层数 */

package/libs/shared-utils/logger.js

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