@realsee/dnalogel 3.76.1-alpha.2 → 3.77.0

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,54 +1,54 @@
-var D = Object.defineProperty, T = Object.defineProperties;
-var R = Object.getOwnPropertyDescriptors;
-var S = Object.getOwnPropertySymbols;
+var O = Object.defineProperty, D = Object.defineProperties;
+var T = Object.getOwnPropertyDescriptors;
+var b = Object.getOwnPropertySymbols;
 var k = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
-var w = (l, h, t) => h in l ? D(l, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[h] = t, d = (l, h) => {
+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 = {}))
-    k.call(h, t) && w(l, t, h[t]);
-  if (S)
-    for (var t of S(h))
-      H.call(h, t) && w(l, t, h[t]);
+    k.call(h, t) && v(l, t, h[t]);
+  if (b)
+    for (var t of b(h))
+      H.call(h, t) && v(l, t, h[t]);
   return l;
-}, g = (l, h) => T(l, R(h));
-var o = (l, h, t) => (w(l, typeof h != "symbol" ? h + "" : h, t), t);
-var p = (l, h, t) => new Promise((e, i) => {
+}, 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 = (a) => {
     try {
       r(t.next(a));
-    } catch (m) {
-      i(m);
+    } catch (d) {
+      i(d);
     }
   }, n = (a) => {
     try {
       r(t.throw(a));
-    } catch (m) {
-      i(m);
+    } catch (d) {
+      i(d);
     }
   }, r = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(s, n);
   r((t = t.apply(l, h)).next());
 });
-import P from "./items.js";
-import * as v from "three";
-import { to as U } from "../../shared-utils/to.js";
-import { equal as W } from "../../shared-utils/equal.js";
-import { Main as z } from "../Components/Main.js";
-import { formatData as C } from "../utils/formatData.js";
-import { CAMERA_IMAGE as N } from "../Assets/camera.js";
-import { omit as x } from "../../shared-utils/filter.js";
-import { FLOOR_PLAN_ATTACHED_TO as G } from "../constant.js";
-import { Controller as j } from "../../base/BasePluginWithData.js";
-import { getPxmm as B, getAttachedY as A } from "../../shared-utils/getPxmm.js";
+import S from "./items.js";
+import * as C from "three";
+import { to as R } from "../../shared-utils/to.js";
+import { equal as U } from "../../shared-utils/equal.js";
+import { Main as N } from "../Components/Main.js";
+import { formatData as A } from "../utils/formatData.js";
+import { CAMERA_IMAGE as z } from "../Assets/camera.js";
+import { omit as F } from "../../shared-utils/filter.js";
+import { FLOOR_PLAN_ATTACHED_TO as W } 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 f, SHOW_ANIME_DURATION as $ } 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 q } 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 Y } 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 "../../shared-utils/three/blink.js";
@@ -156,9 +156,9 @@ function Q(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 ci extends j {
+class pi extends G {
   constructor(t, e) {
-    var a, m;
+    var a, d;
     super(t);
     // =============== public properties =================
     o(this, "name", "modelFloorplanPlugin");
@@ -209,22 +209,22 @@ class ci extends j {
      * @param opts.isAutoShow 是否是自动展示
      * @param opts.userAction 是否是用户行为
      */
-    o(this, "show", (...e) => p(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) => p(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, s = e.y - t.y, n = this.getPxmmWithRotation(), r = Math.ceil(i * n), a = Math.ceil(s * n);
-      return this.size.width === r && this.size.height === a || (this.container.style.width = r + "px", this.container.style.height = a + "px", this.size = { width: r, height: a }), !0;
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, n = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, r = B(this.five, this.wrapper, this.floorIndex, n), a = Math.ceil(i * r), d = Math.ceil(s * r);
+      return this.size.width === a && this.size.height === d || (this.container.style.width = a + "px", this.container.style.height = d + "px", this.size = { width: a, height: d }), !0;
     });
     o(this, "highlight", (t) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -232,33 +232,23 @@ class ci extends j {
     o(this, "unhighlight", () => {
       this.highlightData = {}, this.render();
     });
-    /** 更新展示状态
-     * @description 可以更新 longitude、latitude、offset 等参数
-     * @param showState 需要更新的状态，会与现有状态合并
-     * @example
-     * // 更新 longitude
-     * plugin.updateShowState({ longitude: Math.PI / 2 })
-     */
-    o(this, "updateShowState", (t) => {
-      this.showState = d(d({}, this.showState), t);
-    });
     o(this, "_disable", (t) => {
       var i, s, n;
       const { userAction: e } = t;
-      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, f.BreakOffByDisable), this.showPromise = void 0, (s = this.app) == null || s.$destroy(), this.app = void 0, (n = this.container) == null || n.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, c.BreakOffByDisable), this.showPromise = void 0, (s = this.app) == null || s.$destroy(), this.app = void 0, (n = this.container) == null || n.remove(), this.removeEventListener();
     });
     o(this, "_enable", (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) => p(this, null, function* () {
+    o(this, "_show", (t) => f(this, null, function* () {
       var n;
       if (!this.state.enabled)
         return;
       if (!((n = this.fiveUtil.model) != null && n.loaded))
-        throw new Error(f.ModelNotLoaded);
+        throw new Error(c.ModelNotLoaded);
       if (!this.data)
-        throw new Error(f.DataNotLoaded);
+        throw new Error(c.DataNotLoaded);
       if (this.showPromise)
         return this.showPromise;
       const e = {
@@ -267,19 +257,19 @@ class ci extends j {
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = d(d({}, e), t), s = () => p(this, null, function* () {
+      }, i = m(m({}, e), t), s = () => f(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
         let r = !1, a;
         this.showRejection = (u) => {
           r = !0, a = u;
         };
-        const [m] = yield U(V(this.five, this.showState, i.userAction));
-        if (m)
-          throw m;
+        const [d] = yield R(V(this.five, this.showState, i.userAction));
+        if (d)
+          throw d;
         if (r)
-          throw a ? new Error(a) : new Error(f.UnknownError);
+          throw a ? new Error(a) : new Error(c.UnknownError);
         if (!this.updateSize())
-          throw new Error(f.UpdateSizeError);
+          throw new Error(c.UpdateSizeError);
         this.updatePosition(), this.floorIndex = i.floorIndex, this.fiveUtil.model.show(this.floorIndex);
       });
       return this.isHiddenByHideFunc = !1, this.showPromise = s().then(() => {
@@ -296,8 +286,8 @@ class ci extends j {
     }));
     o(this, "_hide", (t) => {
       var s;
-      (s = this.showRejection) == null || s.call(this, f.BreakOffByHide), this.showPromise = void 0;
-      const i = d(d({}, {
+      (s = this.showRejection) == null || s.call(this, c.BreakOffByHide), this.showPromise = void 0;
+      const i = m(m({}, {
         userAction: !0,
         isAutoHide: !1
       }), t);
@@ -311,7 +301,7 @@ class ci extends j {
     });
     /** modelLoaded 之后自动执行 append container 操作  */
     o(this, "onFiveModelLoaded", () => {
-      const i = this.five.models.find((n) => n.name === this.five.state.workCode).bounding.getCenter(new v.Vector3());
+      const i = this.five.models.find((n) => n.name === this.five.state.workCode).bounding.getCenter(new C.Vector3());
       if (this.showState.offset = i, this.state.enabled === !1 || this.wrapper || !this.selector)
         return;
       const s = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
@@ -345,7 +335,7 @@ class ci extends j {
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     o(this, "onFiveWantsPanGesture", (t, e) => {
       if (this.five.getCurrentState().mode === this.showState.mode && this.state.config.autoShowEnable !== !1 && e && this.state.visible)
-        return this.five.updateCamera(x(this.showState, ["offset"]), 0), !1;
+        return this.five.updateCamera(F(this.showState, ["offset"]), 0), !1;
     });
     /** 阻止点击分间走点 */
     o(this, "onFiveWantsTapGesture", () => this.handleClick());
@@ -364,15 +354,15 @@ class ci extends j {
         this.floorIndex = t, this.updateSize(), this.render();
       }
     });
-    e != null && e.selector && (this.selector = e.selector, console.warn("不推荐继续使用 params.selector 配置父容器，请使用 appendTo 方法")), this.showState = d({
+    e != null && e.selector && (this.selector = e.selector, console.warn("不推荐继续使用 params.selector 配置父容器，请使用 appendTo 方法")), this.showState = {
       mode: "Mapview",
       longitude: 0,
       latitude: Math.PI / 2
-    }, e == null ? void 0 : e.showState), this.defaultMissingFloorConfig = {
+    }, this.defaultMissingFloorConfig = {
       imageURL: X(e == null ? void 0 : e.staticPrefix, J),
       imageWidth: 200,
       imageHeight: 120,
-      text: (m = (a = e.i18n) == null ? void 0 : a.call(e, "暂无平面图")) != null ? m : "暂无平面图",
+      text: (d = (a = e.i18n) == null ? void 0 : a.call(e, "暂无平面图")) != null ? d : "暂无平面图",
       textFontSize: 14
     };
     const i = {
@@ -389,44 +379,44 @@ class ci extends j {
       roomNameEnable: !0,
       roomNameOtherTypeEnable: !0,
       roomDimensionEnable: !0,
-      cameraImageUrl: N,
-      attachedTo: G.BOUNDING_CENTER,
+      cameraImageUrl: z,
+      attachedTo: W.BOUNDING_CENTER,
       getLabelElement: void 0,
       adaptiveRoomLabelVisibleEnable: !0,
-      missingFloorConfig: d(d({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
-      i18n: (c) => c,
-      getRoomAreaText: (c) => (c / 1e6).toFixed(1) + "㎡",
-      getRoomDimensionText: (c, u) => (c / 1e3).toFixed(1) + "m × " + (u / 1e3).toFixed(1) + "m",
-      getRuleDistanceText: (c) => c.toString()
-    }, s = e ? x(e, ["selector", "scale"]) : {}, n = d(d({}, i.missingFloorConfig), s.missingFloorConfig), r = g(d(d({}, i), s), { missingFloorConfig: n });
-    this.state = { enabled: !0, visible: !1, config: r }, this.panoIndex = t.getCurrentState().panoIndex, this.initContainer(), q(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
+      missingFloorConfig: m(m({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
+      i18n: (p) => p,
+      getRoomAreaText: (p) => (p / 1e6).toFixed(1) + "㎡",
+      getRoomDimensionText: (p, u) => (p / 1e3).toFixed(1) + "m × " + (u / 1e3).toFixed(1) + "m",
+      getRuleDistanceText: (p) => p.toString()
+    }, s = e ? F(e, ["selector", "scale"]) : {}, n = m(m({}, i.missingFloorConfig), s.missingFloorConfig), r = g(m(m({}, i), s), { missingFloorConfig: n });
+    this.state = { enabled: !0, visible: !1, config: r }, this.panoIndex = t.getCurrentState().panoIndex, this.initContainer(), Y(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
-    return p(this, null, function* () {
-      function s(c) {
-        return Object.prototype.hasOwnProperty.apply(c, ["version"]);
+    return f(this, null, function* () {
+      function s(p) {
+        return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
       const n = t;
-      n && Y(n.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
-      const r = JSON.parse(JSON.stringify(t)), a = s(r) ? r.data : r, m = this.data;
-      this.data = yield C(a), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, m), e && this.updateState(e, i), this.render();
+      n && q(n.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
+      const r = JSON.parse(JSON.stringify(t)), a = s(r) ? r.data : r, d = this.data;
+      this.data = yield A(a), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, d), e && this.updateState(e, i), this.render();
     });
   }
   loadItems(t) {
     const { min: e, max: i } = this.data.bounding, s = i.x - e.x, n = i.y - e.y;
     this.data.floorDatas.forEach((r, a) => {
-      r.items = t[a].filter((m) => m.displayName === "Item-SimpleItem").map((m) => {
-        const { x: c, y: u, width: F, height: I, notes: M, type: b, id: y, rotateX: L, rotateY: _, rotateZ: O = 0 } = m;
+      r.items = t[a].filter((d) => d.displayName === "Item-SimpleItem").map((d) => {
+        const { x: p, y: u, width: P, height: x, notes: y, type: w, id: I, rotateX: M, rotateY: L, rotateZ: _ = 0 } = d;
         return {
-          id: y,
-          positionInImage: { x: (c - e.x) / s, y: (i.y - u) / n },
-          width: F / s,
-          height: I / n,
-          src: Z + P[b].href.replace(/\{\{\stheme\s\}\}/, "realsee"),
-          notes: M || P[b].description,
-          rotateX: L,
-          rotateY: _,
-          rotateZ: O
+          id: I,
+          positionInImage: { x: (p - e.x) / s, y: (i.y - u) / n },
+          width: P / s,
+          height: x / n,
+          src: Z + S[w].href.replace(/\{\{\stheme\s\}\}/, "realsee"),
+          notes: y || S[w].description,
+          rotateX: M,
+          rotateY: L,
+          rotateZ: _
         };
       });
     });
@@ -461,40 +451,24 @@ class ci extends j {
   changeConfigs(t, e = !0) {
     this.updateState({ config: t }, e), this.render();
   }
-  /** 根据旋转角度计算 pxmm
-   * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用欧几里得距离计算
-   */
-  getPxmmWithRotation() {
-    if (!this.wrapper)
-      return 0;
-    const t = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, e = this.showState.longitude, i = Math.abs((e % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI));
-    return i > Math.PI / 4 && i < 3 * Math.PI / 4 || i > 5 * Math.PI / 4 && i < 7 * Math.PI / 4 ? this.getPxmmEuclidean(t) : B(this.five, this.wrapper, this.floorIndex, t);
-  }
-  /** 使用欧几里得距离计算 pxmm */
-  getPxmmEuclidean(t) {
-    if (!this.wrapper)
-      return 0;
-    const e = A(this.five, this.floorIndex, t == null ? void 0 : t.attachedTo), i = new v.Vector3(0, e, 0), s = new v.Vector3(1, e, 0), n = i.clone().project(this.five.camera), r = s.clone().project(this.five.camera), a = r.x - n.x, m = r.y - n.y;
-    return Math.sqrt(a * a + m * m) / 1e3 * (this.wrapper.getBoundingClientRect().width / 2);
-  }
   /** 更新户型图位置 */
   updatePosition() {
     var r;
-    const t = A(this.five, this.floorIndex, this.state.config.attachedTo), e = (r = this.fiveUtil.model) == null ? void 0 : r.bounding.getCenter(new v.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, n = -(i.y - 1) / 2;
     this.container.style.left = s * 100 + "%", this.container.style.top = n * 100 + "%";
   }
   formatData(t) {
-    return p(this, null, function* () {
-      return yield C(t.data);
+    return f(this, null, function* () {
+      return yield A(t.data);
     });
   }
   updateState(t, e) {
     var r;
-    const i = this.state, s = (r = t.config) != null && r.missingFloorConfig ? d(d({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, n = t.config ? g(d(d({}, i.config), t.config), { missingFloorConfig: s }) : i.config;
-    this.state = g(d(d({}, this.state), t), { config: n }), !W(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, s = (r = t.config) != null && r.missingFloorConfig ? m(m({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, n = t.config ? g(m(m({}, i.config), t.config), { missingFloorConfig: s }) : i.config;
+    this.state = g(m(m({}, this.state), t), { config: n }), !U(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -523,7 +497,7 @@ class ci extends j {
   render(t) {
     if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;
-    const e = g(d({}, this.state.config), {
+    const e = g(m({}, this.state.config), {
       visible: this.state.visible,
       duration: t != null ? t : 0,
       panoIndex: this.panoIndex,
@@ -536,9 +510,9 @@ class ci extends j {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new z({ target: this.container, intro: !0, props: e });
+    this.app = new N({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  ci as Controller
+  pi as Controller
 };

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

@@ -65,22 +65,8 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
     updateSize: () => boolean;
-    /** 根据旋转角度计算 pxmm
-     * @description 当 longitude 大于 45° 或小于 -45°（相对于基准方向）时，使用欧几里得距离计算
-     */
-    private getPxmmWithRotation;
-    /** 使用欧几里得距离计算 pxmm */
-    private getPxmmEuclidean;
     highlight: (highlightData: HighlightData) => void;
     unhighlight: () => void;
-    /** 更新展示状态
-     * @description 可以更新 longitude、latitude、fov 等参数
-     * @param showState 需要更新的状态，会与现有状态合并
-     * @example
-     * // 更新 longitude
-     * plugin.updateShowState({ longitude: Math.PI / 2 })
-     */
-    updateShowState: (showState: Partial<ShowState>) => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;
     private _disable;
     private _enable;