@realsee/dnalogel 3.72.4-alpha.2 → 3.72.5-alpha.1

package/libs/PanoTagPlugin/controller/Tag/PointTag.d.ts

@@ -7,7 +7,11 @@ export type PointTagInterface<C extends TagContentType = TagContentType> = TagIn
 export declare class PointTag<C extends TagContentType = TagContentType> extends BaseTag<C, '2DPoint' | '3DPoint'> {
     private __Object__;
     private requestIdleCallbackId?;
+    private iconPixelGap;
+    private _temp;
+    private _lastUpdateCache;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
+    initialTagLine(): void;
     /**
      * @description 展开自己，收起其他标签
      */
@@ -22,6 +26,11 @@ export declare class PointTag<C extends TagContentType = TagContentType> extends
      */
     setUnfold(unfolded: boolean): void;
     setPosition(position: ArrayPosition): void;
+    /**
+     * 更新标签连线的位置，使其端点与icon保持固定像素距离
+     * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
+     */
+    private updateTagNormalLinePosition;
     updateScreenPosition(params?: {
         force?: boolean;
     }): void;
@@ -29,4 +38,8 @@ export declare class PointTag<C extends TagContentType = TagContentType> extends
     setData(...data: Parameters<InstanceType<typeof BaseTag<C, '2DPoint' | '3DPoint'>>['setData']>): void;
     updateUnfoldedByPanoIndex(): void;
     computeNormal(): THREE.Vector3;
+    /**
+     * @description 获取额外的闪烁目标，包括法线（如果有）
+     */
+    protected getAdditionalBlinkTargets(): any | any[] | null;
 }

package/libs/PanoTagPlugin/controller/Tag/PointTag.js

@@ -1,8 +1,11 @@
-var h = Object.defineProperty;
-var c = (s, o, t) => o in s ? h(s, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[o] = t;
-var p = (s, o, t) => (c(s, typeof o != "symbol" ? o + "" : o, t), t);
-import { BaseTag as g } from "./BaseTag.js";
-import * as l from "three";
+var C = Object.defineProperty;
+var S = (h, l, t) => l in h ? C(h, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[l] = t;
+var m = (h, l, t) => (S(h, typeof l != "symbol" ? l + "" : l, t), t);
+import { BaseTag as N } from "./BaseTag.js";
+import * as s from "three";
+import { Line as T } from "@realsee/five/line";
+import { anyPositionToVector3 as D } from "../../../shared-utils/positionToVector3.js";
+import { transformPosition as A } from "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/Subscribe.js";
 import "../../utils/tag/calculateTagConfig.js";
 import "../../../vendor/object-assign-deep/objectAssignDeep.js";
@@ -11,13 +14,11 @@ import "../../utils/tag/adaptConfig.js";
 import "../../typings/tag/TagConfig.js";
 import "@realsee/five";
 import "../../../shared-utils/tag.js";
-import "../../../shared-utils/positionToVector3.js";
 import "../../../shared-utils/five/vector3ToScreen.js";
 import "../../../shared-utils/five/getFiveModel.js";
 import "../../../shared-utils/Utils/FiveUtil.js";
 import "../../../shared-utils/Utils/BaseUtil.js";
 import "../../../shared-utils/Utils/WorkUtil.js";
-import "../../../shared-utils/five/transformPosition.js";
 import "../../../shared-utils/three/temp.js";
 import "../../../shared-utils/three/core/Raycaster.js";
 import "../../../shared-utils/dom/resizeObserver.js";
@@ -36,7 +37,6 @@ import "../../../shared-utils/three/centerPoint.js";
 import "../../../shared-utils/three/getObjectVisible.js";
 import "../../../shared-utils/three/CSS3DRenderer/index.js";
 import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
 import "../../../shared-utils/isNil.js";
 import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
@@ -87,12 +87,56 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-const v = new l.Vector2();
-class Kt extends g {
-  constructor(t, i) {
-    super(t, i);
-    p(this, "__Object__");
-    p(this, "requestIdleCallbackId");
+const u = new s.Vector2();
+class hi extends N {
+  constructor(t, e) {
+    var i, o, n, r, a;
+    super(t, e);
+    m(this, "__Object__");
+    m(this, "requestIdleCallbackId");
+    // icon 与线条端点的固定像素间距
+    m(this, "iconPixelGap", 10);
+    // 优化：重用临时对象，避免频繁创建
+    m(this, "_temp", {
+      lineStart: new s.Vector3(),
+      // 线条起点（project后会变成NDC）
+      iconPos: new s.Vector3(),
+      // icon位置（project后会变成NDC）
+      screenDirPixel: new s.Vector2(),
+      // 屏幕方向（normalize后会变成单位向量）
+      targetNDC: new s.Vector2(),
+      // 目标NDC坐标
+      lineDir: new s.Vector3(),
+      // 线条方向（计算w0时重用）
+      lineEnd: new s.Vector3(),
+      // 线条终点
+      raycaster: new s.Raycaster()
+      // 射线投射器
+    });
+    // 用于变化检测的缓存值（position不需要缓存，因为它基于originPosition计算）
+    m(this, "_lastUpdateCache", {
+      position: [0, 0, 0],
+      screenLeft: 0,
+      screenTop: 0,
+      visible: !1
+    });
+    if ((o = (i = e.style) == null ? void 0 : i.point) != null && o.width) {
+      const p = (a = (r = (n = e.style) == null ? void 0 : n.point) == null ? void 0 : r.scale) != null ? a : 1;
+      this.iconPixelGap = e.style.point.width * p * 1.4 / 2 + 2;
+    }
+    this.initialTagLine();
+  }
+  initialTagLine() {
+    var o, n, r;
+    const t = this.config;
+    if (!((o = t == null ? void 0 : t.tagNormalLineConfig) != null && o.enabled) || !this.normalLineLength)
+      return;
+    const e = this.five.renderer.getSize(u), i = this.five.renderer.getPixelRatio();
+    this.tagNormalLine = new T(new s.Vector3().fromArray(this.position), new s.Vector3().fromArray(this.originPosition)), this.tagNormalLine.points.visible = !1, this.tagNormalLine.setMaterial({
+      color: new s.Vector3(1, 1, 1),
+      linewidth: (r = (n = t == null ? void 0 : t.tagNormalLineConfig) == null ? void 0 : n.lineWidth) != null ? r : 1.2,
+      dashed: !1
+    }), this.tagNormalLine.line.material.transparent = !0, this.tagNormalLine.line.material.depthWrite = !1, this.tagNormalLine.line.material.depthTest = !1, this.tagNormalLine.line.material.dashed = !1, this.tagNormalLine.line.renderOrder = 2, this.tagNormalLine.setResolution(e.width * i, e.height * i), this.tagNormalLine.visible = !1, this.tagNormalLine.name = `tagNormalLine-${this.id}`, this.plugin.group.add(this.tagNormalLine);
   }
   /**
    * @description 展开自己，收起其他标签
@@ -100,20 +144,20 @@ class Kt extends g {
   unfoldAndFoldOthers() {
     if (this.isPopoverConfigEnabled())
       return;
-    const t = this.can("fold"), i = this.can("unfold");
-    t && i && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((r) => {
-      r.id !== this.id && r.fold();
+    const t = this.can("fold"), e = this.can("unfold");
+    t && e && (this.state.unfolded = !this.state.unfolded, this.manuallyOperated = !0, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((i) => {
+      i.id !== this.id && i.fold();
     }));
   }
   onClick(t) {
     t.target === "TagPoint" && this.unfoldAndFoldOthers();
   }
   applyVisible() {
-    var t, i;
-    this.currentVisible && this.updateScreenPosition(), (t = this.tag3DContentSvelte) != null && t.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible), (i = this.tag3DContentSvelte) == null || i.svelteApp.$set({
+    var t, e;
+    this.currentVisible && this.updateScreenPosition(), (t = this.tag3DContentSvelte) != null && t.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible), (e = this.tag3DContentSvelte) == null || e.svelteApp.$set({
       state: this.plugin.state,
       temporaryState: this.temporaryState
-    }), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
+    }), !this.tagNormalLine && this.normalLineLength && this.initialTagLine(), this.tagNormalLine && (this.tagNormalLine.visible = this.visible), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
   unfold() {
     this.isPopoverConfigEnabled() || this.setUnfold(!0);
@@ -128,45 +172,95 @@ class Kt extends g {
   setUnfold(t) {
     if (this.isPopoverConfigEnabled())
       return;
-    const i = this.can("fold"), r = this.can("unfold");
-    i && r && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+    const e = this.can("fold"), i = this.can("unfold");
+    e && i && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
   }
   setPosition(t) {
-    this.originPosition = t, this.position = t, this.cache.clear(), this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
+    this.originPosition = t, this.position = (() => {
+      const e = this.plugin.workUtil.transform;
+      let i = A(D(t), e).toArray();
+      if (this.normal && this.normalLineLength) {
+        const o = this.computeNormal();
+        i = new s.Vector3().fromArray(i).clone().add(o.clone().setLength(this.normalLineLength)).toArray();
+      }
+      return i;
+    })(), this.cache.clear(), this._lastUpdateCache.position = [0, 0, 0], this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
+  }
+  /**
+   * 更新标签连线的位置，使其端点与icon保持固定像素距离
+   * 使用屏幕空间反投影方法，确保任意视角下都保持固定像素距离
+   */
+  updateTagNormalLinePosition() {
+    var _, y, v, L;
+    if (!this.screenPosition || !this.tagNormalLine)
+      return;
+    if (!this.visible) {
+      this.tagNormalLine.visible = !1;
+      return;
+    }
+    const t = this._lastUpdateCache;
+    if (!(this.visible !== t.visible)) {
+      const f = Math.abs(this.position[0] - t.position[0]) > 1e-3 || Math.abs(this.position[1] - t.position[1]) > 1e-3 || Math.abs(this.position[2] - t.position[2]) > 1e-3, x = Math.abs(((_ = this.screenPosition.leftPx) != null ? _ : 0) - t.screenLeft) > 0.5 || Math.abs(((y = this.screenPosition.topPx) != null ? y : 0) - t.screenTop) > 0.5;
+      if (!f && !x)
+        return;
+    }
+    t.position = new s.Vector3().fromArray(this.position).toArray(), t.screenLeft = (v = this.screenPosition.leftPx) != null ? v : 0, t.screenTop = (L = this.screenPosition.topPx) != null ? L : 0, t.visible = this.visible;
+    const i = this.five.renderer.getSize(u);
+    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineStart.project(this.five.camera), this._temp.iconPos.project(this.five.camera), this._temp.screenDirPixel.set(
+      (this._temp.iconPos.x - this._temp.lineStart.x) * i.x / 2,
+      (this._temp.iconPos.y - this._temp.lineStart.y) * i.y / 2
+    );
+    const o = this._temp.screenDirPixel.length();
+    this._temp.screenDirPixel.normalize(), this._temp.targetNDC.set(
+      (this._temp.iconPos.x * i.x / 2 - this._temp.screenDirPixel.x * this.iconPixelGap) / (i.x / 2),
+      (this._temp.iconPos.y * i.y / 2 - this._temp.screenDirPixel.y * this.iconPixelGap) / (i.y / 2)
+    ), this._temp.raycaster.setFromCamera(this._temp.targetNDC, this.five.camera);
+    const n = this._temp.raycaster.ray;
+    this._temp.lineStart.fromArray(this.originPosition), this._temp.iconPos.fromArray(this.position), this._temp.lineDir.copy(this._temp.iconPos).sub(this._temp.lineStart).normalize(), this._temp.lineEnd.copy(n.origin).sub(this._temp.lineStart);
+    const r = n.direction.dot(n.direction), a = n.direction.dot(this._temp.lineDir), p = this._temp.lineDir.dot(this._temp.lineDir), c = n.direction.dot(this._temp.lineEnd), d = this._temp.lineDir.dot(this._temp.lineEnd), g = r * p - a * a;
+    let P = 0;
+    Math.abs(g) > 1e-4 && (P = (a * d - p * c) / g), this._temp.lineEnd.copy(n.origin).add(n.direction.multiplyScalar(Math.max(0, P)));
+    const b = this._temp.lineStart.distanceTo(this._temp.iconPos);
+    if (this._temp.lineStart.distanceTo(this._temp.lineEnd) > b) {
+      const f = Math.max(0, 1 - this.iconPixelGap / o);
+      this._temp.lineEnd.copy(this._temp.lineStart).lerp(this._temp.iconPos, f);
+    }
+    this.tagNormalLine.setPoints(this._temp.lineStart, this._temp.lineEnd), this.tagNormalLine.visible = !0, this.five.needsRender = !0;
   }
   updateScreenPosition(t) {
-    var a;
+    var r;
     if (this.stickType !== "2DPoint" && this.stickType !== "3DPoint")
       return;
-    const { force: i = !1 } = t != null ? t : {}, r = i ? this.state.visible : this.currentVisible, e = (a = this.__Object__) != null ? a : {
+    const { force: e = !1 } = t != null ? t : {}, i = e ? this.state.visible : this.currentVisible, o = (r = this.__Object__) != null ? r : {
       timeoutId: void 0,
       inAnimation: !1
     };
-    if (this.__Object__ = e, !r && this.screenPosition ? (e.inAnimation = !0, e.timeoutId = setTimeout(() => {
+    if (this.__Object__ = o, !i && this.screenPosition ? (o.inAnimation = !0, o.timeoutId = setTimeout(() => {
       requestAnimationFrame(() => {
-        this.currentVisible || (e.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+        this.currentVisible || (o.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
       });
-    }, 1e3)) : e.timeoutId && (clearTimeout(e.timeoutId), e.inAnimation = !1, e.timeoutId = void 0), !r && !e.inAnimation)
+    }, 1e3)) : o.timeoutId && (clearTimeout(o.timeoutId), o.inAnimation = !1, o.timeoutId = void 0), !i && !o.inAnimation)
       return;
     const n = this.computeTagProject();
     if (n && this.five.renderer) {
-      const m = (() => {
+      const a = this.getDistance(void 0, 1), p = (() => {
         if (!this.currentConfig.simulate3D)
           return 1;
-        const u = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), f = this.getDistance(void 0, 1);
-        return Math.max(Math.min(1 - u * f / 40, 1), 0.7);
-      })(), d = this.five.renderer.getSize(v);
+        const d = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI);
+        return Math.max(Math.min(1 - d * a / 40, 1), 0.7);
+      })(), c = this.five.renderer.getSize(u);
       this.screenPosition = {
-        leftPx: (n.x + 1) / 2 * d.x,
-        topPx: (-n.y + 1) / 2 * d.y,
-        scale: m
-      };
+        leftPx: (n.x + 1) / 2 * c.x,
+        topPx: (-n.y + 1) / 2 * c.y,
+        scale: p
+      }, this.updateTagNormalLinePosition();
     } else
       this.screenPosition = null;
     this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
   }
-  set(t, i = !0) {
-    super.set(t, i), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
+  set(t, e = !0) {
+    var o, n;
+    super.set(t, e), ((n = (o = t.style) == null ? void 0 : o.point) == null ? void 0 : n.normalLen) !== void 0 && (this.normalLineLength = t.style.point.normalLen, this._lastUpdateCache.position = [0, 0, 0]), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), t.position && this.setPosition(this.position);
   }
   setData(...t) {
     super.setData(...t), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -176,14 +270,21 @@ class Kt extends g {
       return;
     const t = this.getUnfoldedByPanoIndex();
     if (this.state && (t !== void 0 && (this.state.unfolded = t), t && !this.state.visible)) {
-      const i = this.getConfig();
-      typeof i.unfoldedConfig == "object" && i.unfoldedConfig.autoFoldWhenHide !== !1 && (this.state.unfolded = !1);
+      const e = this.getConfig();
+      typeof e.unfoldedConfig == "object" && e.unfoldedConfig.autoFoldWhenHide !== !1 && (this.state.unfolded = !1);
     }
   }
   computeNormal() {
-    return new l.Vector3().fromArray(this.normal);
+    return new s.Vector3().fromArray(this.normal);
+  }
+  /**
+   * @description 获取额外的闪烁目标，包括法线（如果有）
+   */
+  getAdditionalBlinkTargets() {
+    var t;
+    return (t = this.tagNormalLine) != null && t.line ? this.tagNormalLine.line : null;
   }
 }
 export {
-  Kt as PointTag
+  hi as PointTag
 };

package/libs/PanoTagPlugin/tag.config.js

@@ -31,6 +31,10 @@ const e = {
         showShare: !0
       },
       viewMoreText: "查看更多"
+    },
+    tagNormalLineConfig: {
+      enabled: !0,
+      lineWidth: 1.2
     }
   },
   contentTypeConfig: {

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -356,6 +356,21 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
          */
         beforeOpen?: (tag?: TagInstance) => boolean | undefined;
     };
+    /**
+     * @description 标签法线相关配置
+     */
+    tagNormalLineConfig?: {
+        /**
+         * @description 是否启用标签法线
+         * @default true
+         */
+        enabled?: boolean;
+        /**
+         * @description 标签法线宽度
+         * @default 1.2
+         */
+        lineWidth?: number;
+    };
 }
 export declare const defaultGlobalConfig: TagConfig;
 type ConfigFunction = (five: Five, tagState: {

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -55,6 +55,8 @@ export interface TagIconUrl {
     scale?: number;
     /** 帧动画配置 */
     animation?: TagIconAnimationConfig;
+    /** 标签法线长度 */
+    normalLen?: number;
 }
 export interface TagStyle {
     /** 小圆点样式 */

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let A = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.72.4-alpha.2");
+    r(this, "VERSION", "3.72.5-alpha.1");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,35 +1,35 @@
 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 H = Object.prototype.hasOwnProperty, R = 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 = {}))
-    k.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))
-      H.call(h, t) && v(l, t, h[t]);
+      R.call(h, t) && v(l, t, h[t]);
   return l;
 }, 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) => {
+  var s = (n) => {
     try {
-      r(t.next(a));
+      r(t.next(n));
     } catch (d) {
       i(d);
     }
-  }, n = (a) => {
+  }, a = (n) => {
     try {
-      r(t.throw(a));
+      r(t.throw(n));
     } catch (d) {
       i(d);
     }
-  }, r = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(s, n);
+  }, r = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(s, a);
   r((t = t.apply(l, h)).next());
 });
 import S from "./items.js";
 import * as C from "three";
-import { to as R } from "../../shared-utils/to.js";
+import { to as k } 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";
@@ -156,7 +156,7 @@ function Q(l) {
 }
 class li extends G {
   constructor(t, e) {
-    var a, d;
+    var n, d;
     super(t);
     // =============== public properties =================
     o(this, "name", "modelFloorplanPlugin");
@@ -221,8 +221,8 @@ class li extends G {
     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.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;
+      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) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -231,19 +231,19 @@ class li extends G {
       this.highlightData = {}, this.render();
     });
     o(this, "_disable", (t) => {
-      var i, s, n;
+      var i, s, a;
       const { userAction: e } = t;
-      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();
+      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, (a = this.container) == null || a.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) => f(this, null, function* () {
-      var n;
+      var a;
       if (!this.state.enabled)
         return;
-      if (!((n = this.fiveUtil.model) != null && n.loaded))
+      if (!((a = this.fiveUtil.model) != null && a.loaded))
         throw new Error(c.ModelNotLoaded);
       if (!this.data)
         throw new Error(c.DataNotLoaded);
@@ -257,23 +257,23 @@ class li extends G {
         userAction: !0
       }, i = m(m({}, e), t), s = () => f(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
-        let r = !1, a;
+        let r = !1, n;
         this.showRejection = (u) => {
-          r = !0, a = u;
+          r = !0, n = u;
         };
-        const [d] = yield R(V(this.five, this.showState, i.userAction));
+        const [d] = yield k(V(this.five, this.showState, i.userAction));
         if (d)
           throw d;
         if (r)
-          throw a ? new Error(a) : new Error(c.UnknownError);
+          throw n ? new Error(n) : new Error(c.UnknownError);
         if (!this.updateSize())
           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(() => {
         this.showPromise = void 0, this.showRejection = void 0;
-        const r = i.modelOpacity, a = i.immediately ? 0 : $;
-        E(this.five, r, a), this.render(a), this.hooks.emit("showAnimationEnded", {
+        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
         });
@@ -299,13 +299,13 @@ class li extends G {
     });
     /** modelLoaded 之后自动执行 append container 操作  */
     o(this, "onFiveModelLoaded", () => {
-      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)
+      const e = this.five.model.bounding.getCenter(new C.Vector3());
+      if (this.showState.offset = e, this.state.enabled === !1 || this.wrapper || !this.selector)
         return;
-      const s = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
-      if (!s)
+      const i = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
+      if (!i)
         throw new Error("不正确的父容器选择器");
-      this.wrapper = s, s.append(this.container);
+      this.wrapper = i, i.append(this.container);
     });
     /** 更改模型时，自动隐藏户型图 */
     o(this, "onFiveModeChange", (t) => {
@@ -360,7 +360,7 @@ class li extends G {
       imageURL: X(e == null ? void 0 : e.staticPrefix, J),
       imageWidth: 200,
       imageHeight: 120,
-      text: (d = (a = e.i18n) == null ? void 0 : a.call(e, "暂无平面图")) != null ? d : "暂无平面图",
+      text: (d = (n = e.i18n) == null ? void 0 : n.call(e, "暂无平面图")) != null ? d : "暂无平面图",
       textFontSize: 14
     };
     const i = {
@@ -386,7 +386,7 @@ class li extends G {
       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 });
+    }, 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.panoIndex = t.getCurrentState().panoIndex, this.initContainer(), Y(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
@@ -394,22 +394,22 @@ class li extends G {
       function s(p) {
         return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
-      const n = t;
-      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();
+      const a = t;
+      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), 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((d) => d.displayName === "Item-SimpleItem").map((d) => {
+    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, rotateX: M, rotateY: L, rotateZ: _ = 0 } = d;
         return {
           id: I,
-          positionInImage: { x: (p - e.x) / s, y: (i.y - u) / n },
+          positionInImage: { x: (p - e.x) / s, y: (i.y - u) / a },
           width: P / s,
-          height: x / n,
+          height: x / a,
           src: Z + S[w].href.replace(/\{\{\stheme\s\}\}/, "realsee"),
           notes: y || S[w].description,
           rotateX: M,
@@ -442,8 +442,8 @@ class li extends G {
   setState(t, e = {}) {
     const i = this.state, s = e.userAction !== void 0 ? e.userAction : !0;
     if (this.updateState(t, s), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: s }) : this._disable({ userAction: s })), t.visible !== void 0 && i.visible !== t.visible) {
-      const n = { userAction: s };
-      t.visible ? this._show(n) : this._hide(n);
+      const a = { userAction: s };
+      t.visible ? this._show(a) : this._hide(a);
     }
   }
   changeConfigs(t, e = !0) {
@@ -455,8 +455,8 @@ class li extends G {
     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 + "%";
+    const i = e.clone().project(this.five.camera), s = (i.x + 1) / 2, a = -(i.y - 1) / 2;
+    this.container.style.left = s * 100 + "%", this.container.style.top = a * 100 + "%";
   }
   formatData(t) {
     return f(this, null, function* () {
@@ -465,8 +465,8 @@ class li extends G {
   }
   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, 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 });
+    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 }), !U(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.72.4-alpha.2",
+    "%c %c@realsee/dnalogel %cv3.72.5-alpha.1",
     [
       "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",