@realsee/dnalogel 3.3.3 → 3.3.5-dev.0

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,40 +1,40 @@
-var V = Object.defineProperty;
+var A = Object.defineProperty;
 var R = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var C = (c, l, t) => l in c ? V(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t, j = (c, l) => {
+var V = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var C = (c, l, t) => l in c ? A(c, l, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[l] = t, j = (c, l) => {
   for (var t in l || (l = {}))
-    E.call(l, t) && C(c, t, l[t]);
+    V.call(l, t) && C(c, t, l[t]);
   if (R)
     for (var t of R(l))
-      A.call(l, t) && C(c, t, l[t]);
+      E.call(l, t) && C(c, t, l[t]);
   return c;
 };
 var f = (c, l, t) => (C(c, typeof l != "symbol" ? l + "" : l, t), t);
 var S = (c, l, t) => new Promise((e, o) => {
-  var i = (r) => {
+  var i = (s) => {
     try {
-      a(t.next(r));
+      a(t.next(s));
     } catch (n) {
       o(n);
     }
-  }, s = (r) => {
+  }, r = (s) => {
     try {
-      a(t.throw(r));
+      a(t.throw(s));
     } catch (n) {
       o(n);
     }
-  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, s);
+  }, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(i, r);
   a((t = t.apply(c, l)).next());
 });
-import { TagComputer as x } from "./TagComputer.js";
-import { Group as y, Quaternion as O, Vector3 as b, Matrix4 as v } from "three";
-import I from "../Components/TagContainer.js";
+import { TagComputer as I } from "./TagComputer.js";
+import { Group as y, Quaternion as O, Vector3 as T, Matrix4 as v } from "three";
+import x from "../Components/TagContainer.js";
 import G from "../Components/Tag/index.js";
 import { CSS3DRenderPlugin as F } from "../../CSS3DRenderPlugin/index.js";
-import { loadGLTF as L } from "../../shared-utils/three/GLTFLoader.js";
-import { isMediaModelTag as D, isStickModelTag as W } from "../utils/tag/tagCheck.js";
+import { loadGLTF as _ } from "../../shared-utils/three/GLTFLoader.js";
+import { isMediaModelTag as D, isStickModelTag as L } from "../utils/tag/tagCheck.js";
 import { VideoPlane as w, ImagePlane as k } from "../utils/model/mediaPlane.js";
-import { centerPoint as $ } from "../../shared-utils/three/centerPoint.js";
+import { centerPoint as W } from "../../shared-utils/three/centerPoint.js";
 import { arrayPositionToVector3 as g } from "../../shared-utils/positionToVector3.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
@@ -158,8 +158,8 @@ import "../Components/Tag/CustomTag.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
-const q = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class ui extends x {
+const $ = /* @__PURE__ */ new Map(), q = /* @__PURE__ */ new Map();
+class ui extends I {
   constructor(t) {
     super(t);
     f(this, "group", new y());
@@ -179,13 +179,13 @@ class ui extends x {
       if (!e)
         return;
       t.loading = !0;
-      const o = L(e).then((r) => {
+      const o = _(e).then((s) => {
         var m;
-        const n = Object.assign(r.scene, {
+        const n = Object.assign(s.scene, {
           customID: t.id,
           isTagModel: !0,
           removeEventListener: this.getTagConfig(t).clickable === !1 ? () => {
-          } : this.addObjectClickHandler(t, r.scene, (h) => {
+          } : this.addObjectClickHandler(t, s.scene, (h) => {
             this.hooks.emit("click", { target: "TagModel", tag: t, event: h });
           })
         });
@@ -196,14 +196,14 @@ class ui extends x {
       if (t.loading = !1, ((a = t.model) == null ? void 0 : a.promise) !== o || !this.tags.includes(t))
         return;
       t.model.object = i;
-      const s = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
-      if (s && (this.gltfObjectGroup.remove(s), s.removeEventListener()), this.updateRender3DDomTag(), D(t)) {
+      const r = this.gltfObjectGroup.children.find((s) => s.customID === t.id);
+      if (r && (this.gltfObjectGroup.remove(r), r.removeEventListener()), this.updateRender3DDomTag(), D(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
-          const r = t.data.mediaPosition.map(g);
+          const s = t.data.mediaPosition.map(g);
           t.mediaPlane = new k(t.data.mediaData[0].url, t.data.mediaPosition.map(g), {
             objectFit: t.data.objectFit
           });
-          const n = new b().addVectors(r[0], r[2]).divideScalar(2);
+          const n = new T().addVectors(s[0], s[2]).divideScalar(2);
           t.mediaPlane.position.copy(n), i.add(t.mediaPlane);
         }
         this.getRenderType(t) !== "Mesh" && (i.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, i), i.updateTagCss3DObjectMatrix());
@@ -248,22 +248,22 @@ class ui extends x {
       if (!i)
         return;
       e.mediaPlane && !((h = (m = e.state) == null ? void 0 : m.visible) == null || h) && e.mediaPlane instanceof w && e.mediaPlane.pause();
-      const s = e.position.map(g), a = this.getCurrentVisibleState(e), r = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), p = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
-      if ((r || p) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), n || p) {
-        const d = new w(i, s, {
+      const r = e.position.map(g), a = this.getCurrentVisibleState(e), s = (() => !!(e.mediaPlane && !a))(), n = (() => !!(!e.mediaPlane && a))(), d = (() => !!(e.mediaPlane && e.mediaPlane.src !== i))();
+      if ((s || d) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), n || d) {
+        const p = new w(i, r, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
           paused: !((P = e.data.autoplayConfig) != null && P.autoplayVideo),
           objectFit: e.data.objectFit,
-          videoTextureMap: q,
-          ImageTextureMap: B,
+          videoTextureMap: $,
+          ImageTextureMap: q,
           domEvents: this.domEvents
         });
-        d.onVideoReady = (u) => {
-          u.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
+        p.onVideoReady = (u) => {
+          u.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: p.videoInstance }));
         };
-        const T = (u) => (this.five.on("renderFrame", u), () => this.five.off("renderFrame", u));
-        d.initialRenderHooks(T), e.mediaPlane = d, this.imagePlaneGroup.add(e.mediaPlane);
+        const b = (u) => (this.five.on("renderFrame", u), () => this.five.off("renderFrame", u));
+        p.initialRenderHooks(b), e.mediaPlane = p, this.imagePlaneGroup.add(e.mediaPlane);
       }
     });
   }
@@ -278,9 +278,9 @@ class ui extends x {
       const { url: o } = e.data.mediaData[0];
       if (!o)
         return;
-      const i = e.position.map(g), s = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !s))(), r = (() => !!(!e.mediaPlane && s))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
-      (a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), (r || n) && (e.mediaPlane = new k(o, i, { objectFit: e.data.objectFit }), this.getTagConfig(e).clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (p) => {
-        this.hooks.emit("click", { tag: e, target: "TagContent", event: p.origDomEvent });
+      const i = e.position.map(g), r = this.getCurrentVisibleState(e), a = (() => !!(e.mediaPlane && !r))(), s = (() => !!(!e.mediaPlane && r))(), n = (() => !!(e.mediaPlane && e.mediaPlane.src !== o))();
+      (a || n) && e.mediaPlane && (this.imagePlaneGroup.remove(e.mediaPlane), e.mediaPlane.dispose(), e.mediaPlane.removeFromParent(), e.mediaPlane = void 0), (s || n) && (e.mediaPlane = new k(o, i, { objectFit: e.data.objectFit }), this.getTagConfig(e).clickable !== !1 && this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (d) => {
+        this.hooks.emit("click", { tag: e, target: "TagContent", event: d.origDomEvent });
       }), this.imagePlaneGroup.add(e.mediaPlane));
     });
   }
@@ -289,12 +289,12 @@ class ui extends x {
    */
   updateRender3DDomTag() {
     this.filterCSS3DTag.forEach((e) => {
-      var o, i, s;
+      var o, i, r;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: a, css3DInstance: r, initialNormal: n, currentNormal: p } = e.tag3DContentSvelte;
-        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(p)) {
-          const m = new O().setFromUnitVectors(n, p);
-          r.css3DObject.setRotationFromQuaternion(m);
+        const { svelteApp: a, css3DInstance: s, initialNormal: n, currentNormal: d } = e.tag3DContentSvelte;
+        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !n.equals(d)) {
+          const m = new O().setFromUnitVectors(n, d);
+          s.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
@@ -305,24 +305,24 @@ class ui extends x {
         const a = this.getPositions(e);
         if (!a)
           return;
-        const r = this.getTagNormal(e);
-        if (!r)
+        const s = this.getTagNormal(e);
+        if (!s)
           return;
-        const n = this.getTagConfig(e), p = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
-        if (this.getRenderType(e) === "BehindDom" || p.mode === "behind") {
-          p.mode = "behind", p.container = document.createElement("div");
+        const n = this.getTagConfig(e), d = j({ wrapperStyle: { zIndex: this.calculateTagZIndex(e).toString() } }, n.tag3DConfig);
+        if (this.getRenderType(e) === "BehindDom" || d.mode === "behind") {
+          d.mode = "behind", d.container = document.createElement("div");
           const P = "black";
-          p.container.style.backgroundColor = P, p.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
-            var d;
+          d.container.style.backgroundColor = P, d.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            var p;
             if (m.css3DObject.opacityMesh && n.clickable !== !1) {
-              const T = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (u) => {
+              const b = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (u) => {
                 this.hooks.emit("click", { event: u, target: "TagContent", tag: e });
               });
-              (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(T);
+              (p = this.store.css3DRenderDisposer.get(e.id)) == null || p.push(b);
             }
           });
         }
-        const m = this.css3DRenderPlugin.create3DDomContainer(a, p);
+        const m = this.css3DRenderPlugin.create3DDomContainer(a, d);
         if (!m)
           return;
         this.store.css3DRenderDisposer.set(e.id, [m.dispose]);
@@ -341,12 +341,12 @@ class ui extends x {
           svelteApp: h,
           domContainer: m,
           css3DInstance: m,
-          initialNormal: r,
-          currentNormal: r,
+          initialNormal: s,
+          currentNormal: s,
           dispose: () => {
             h.$destroy(), m.dispose();
           }
-        }, D(e) && ((s = e.model) != null && s.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
+        }, D(e) && ((r = e.model) != null && r.object) && this.updateTagCss3DObjectMatrix(e, e.model.object);
       }
     }), this.clearUnusedPanelTag();
   }
@@ -360,8 +360,8 @@ class ui extends x {
   updateRenderModelTag() {
     const t = (i) => !this.enabledModelTagSet.has(i.customID), e = this.gltfObjectGroup.children.filter(t);
     e.forEach((i) => i.removeEventListener()), this.gltfObjectGroup.remove(...e), this.tags.filter((i) => i.stickType === "Model").forEach((i) => {
-      var s;
-      (s = i.model) == null || s.promise.then((a) => {
+      var r;
+      (r = i.model) == null || r.promise.then((a) => {
         a.visible = this.getCurrentVisibleState(i);
       });
     }), this.five.needsRender = !0;
@@ -378,26 +378,45 @@ class ui extends x {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var T, u, M;
-    const o = (u = (T = this.getTagConfig(t).tag3DConfig) == null ? void 0 : T.ratio) != null ? u : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    var b, u, M;
+    const o = (u = (b = this.getTagConfig(t).tag3DConfig) == null ? void 0 : b.ratio) != null ? u : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
     if (!i)
       return;
-    const s = D(t) ? t.data.mediaPosition : t.position;
-    if (!s || s.length !== 4 || !Array.isArray(s[0]) || !Array.isArray(s[2]))
+    const r = D(t) ? t.data.mediaPosition : t.position;
+    if (!r || r.length !== 4 || !Array.isArray(r[0]) || !Array.isArray(r[2]))
       return;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new b().fromArray(s[0]), n = new b().fromArray(s[2]), p = $(r, n).add(new b(0, 0, 5e-4)), m = new v().setPosition(p), h = new v().makeScale(o, o, o), P = new v().multiply(a).multiply(m).multiply(h);
+    const a = e.matrixWorld, s = new T().fromArray(r[0]), n = new T().fromArray(r[2]), d = W(s, n).add(new T(0, 0, 5e-4)), m = new v().setPosition(d), h = new v().makeScale(o, o, o), P = new v().multiply(a).multiply(m).multiply(h);
     P.decompose(i.position, i.quaternion, i.scale);
-    const d = i.opacityMesh;
-    d && P.decompose(d.position, d.quaternion, d.scale);
+    const p = i.opacityMesh;
+    p && P.decompose(p.position, p.quaternion, p.scale);
   }
   /** 添加模型标签 */
   addMediaModelTag(t) {
     return S(this, null, function* () {
-      const e = t.filter(W).map((o) => this.loadModel(o));
+      const e = t.filter(L).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setVisible(), this.updateRenderAllTags();
     });
   }
+  /**
+   * @description: 一个点的标签
+   */
+  setPointTagPosition() {
+    const t = this.filterPointTag;
+    t.length !== 0 && t.forEach((e) => {
+      var a;
+      const o = this.getCurrentVisibleState(e), i = (a = e.__Object__) != null ? a : {
+        timeoutId: void 0,
+        inAnimation: !0
+      };
+      if (e.__Object__ = i, !o && e.screenPosition ? (i.inAnimation = !0, i.timeoutId = setTimeout(() => {
+        this.getCurrentVisibleState(e) || (i.inAnimation = !1, e.screenPosition = null, this.updateDomView());
+      }, 1e3)) : i.timeoutId && (i.inAnimation = !1, clearTimeout(i.timeoutId)), !o && !i.inAnimation)
+        return;
+      const r = this.getTagProject(e);
+      r ? e.screenPosition = { leftPercent: (r.x + 1) / 2 * 100, topPercent: (-r.y + 1) / 2 * 100 } : e.screenPosition = null;
+    });
+  }
   /**
    * @description: 渲染单个点的标签
    */
@@ -415,8 +434,8 @@ class ui extends x {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filterCSS3DTag.forEach((e) => {
-      var o, i, s, a, r;
-      (a = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || a.setVisible((this.state.visible && ((s = e.state) == null ? void 0 : s.visible)) !== !1), (r = e.tag3DContentSvelte) == null || r.svelteApp.$set({
+      var o, i, r, a, s;
+      (a = (i = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : i.css3DObject) == null || a.setVisible((this.state.visible && ((r = e.state) == null ? void 0 : r.visible)) !== !1), (s = e.tag3DContentSvelte) == null || s.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation
@@ -447,11 +466,11 @@ class ui extends x {
     if (this.TagContainerSvelte)
       this.TagContainerSvelte.$set({ tags: e, state: this.state, temporaryState: this.temporaryState });
     else {
-      const s = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
-      if (!s)
+      const r = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
+      if (!r)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new I({
-        target: s,
+      this.TagContainerSvelte = new x({
+        target: r,
         props: {
           hooks: this.hooks,
           tags: e,

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.3.3");
+    i(this, "VERSION", "3.3.5-dev.0");
     i(this, "five");
     /**
      * 插件事件钩子

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

@@ -63,7 +63,7 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     setState(state: PartialDeep<State>, options?: BaseOptions): void;
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
-    updateSize: () => void;
+    updateSize: () => boolean;
     /** 更新户型图位置 */
     updatePosition(): void;
     highlight: (highlightData: HighlightData) => void;

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,15 +1,15 @@
-var A = Object.defineProperty, F = Object.defineProperties;
-var P = Object.getOwnPropertyDescriptors;
+var F = Object.defineProperty, P = Object.defineProperties;
+var E = Object.getOwnPropertyDescriptors;
 var v = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
-var g = (d, r, t) => r in d ? A(d, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[r] = t, l = (d, r) => {
+var x = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
+var g = (d, r, t) => r in d ? F(d, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[r] = t, l = (d, r) => {
   for (var t in r || (r = {}))
-    E.call(r, t) && g(d, t, r[t]);
+    x.call(r, t) && g(d, t, r[t]);
   if (v)
     for (var t of v(r))
-      x.call(r, t) && g(d, t, r[t]);
+      I.call(r, t) && g(d, t, r[t]);
   return d;
-}, p = (d, r) => F(d, P(r));
+}, m = (d, r) => P(d, E(r));
 var o = (d, r, t) => (g(d, typeof r != "symbol" ? r + "" : r, t), t);
 var u = (d, r, t) => new Promise((e, i) => {
   var n = (a) => {
@@ -28,18 +28,18 @@ var u = (d, r, t) => new Promise((e, i) => {
   s((t = t.apply(d, r)).next());
 });
 import * as w from "three";
-import { to as I } from "../../shared-utils/to.js";
-import { equal as M } from "../../shared-utils/equal.js";
-import { Main as y } from "../Components/Main.js";
+import { to as M } from "../../shared-utils/to.js";
+import { equal as y } from "../../shared-utils/equal.js";
+import { Main as L } from "../Components/Main.js";
 import { formatData as b } 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 _ } from "../constant.js";
-import { Controller as O } from "../../base/BasePluginWithData.js";
-import { getPxmm as D, getAttachedY as T } from "../../shared-utils/getPxmm.js";
-import { correctFiveState as k } from "../utils/correctFiveState.js";
-import { changeModelCanvasOpacity as S } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FloorplanErrorType as m, SHOW_ANIME_DURATION as H } from "../utils/constant.js";
+import { CAMERA_IMAGE as _ } from "../Assets/camera.js";
+import { omit as S } from "../../shared-utils/filter.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 H } from "../utils/correctFiveState.js";
+import { changeModelCanvasOpacity as C } from "../../shared-utils/changeModelCanvasOpacity.js";
+import { FloorplanErrorType as p, SHOW_ANIME_DURATION as R } from "../utils/constant.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../vendor/svelte/transition/index.js";
@@ -92,7 +92,7 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
-function R(d) {
+function z(d) {
   const { latitude: r, longitude: t } = d, e = Math.abs(r - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
   return e || i;
 }
@@ -100,7 +100,7 @@ function W(d) {
   const { latitude: r, longitude: t } = d, e = Math.abs(r - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Kt extends O {
+class Qt extends D {
   constructor(t, e) {
     var a, f;
     super(t);
@@ -164,9 +164,9 @@ class Kt extends O {
     /** 更新户型图大小 */
     o(this, "updateSize", () => {
       if (!this.data || !this.container || !this.wrapper)
-        return;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, n = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, s = D(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * s), f = Math.ceil(n * s);
-      this.size.width === a && this.size.height === f || (this.container.style.width = a + "px", this.container.style.height = f + "px", this.size = { width: a, height: f });
+        return !1;
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, n = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, s = T(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * s), f = Math.ceil(n * s);
+      return this.size.width === a && this.size.height === f || (this.container.style.width = a + "px", this.container.style.height = f + "px", this.size = { width: a, height: f }), !0;
     });
     o(this, "highlight", (t) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -177,7 +177,7 @@ class Kt extends O {
     o(this, "_disable", (t) => {
       var i, n, h;
       const { userAction: e } = t;
-      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, m.BreakOffByDisable), this.showPromise = void 0, (n = this.app) == null || n.$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, p.BreakOffByDisable), this.showPromise = void 0, (n = this.app) == null || n.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
     });
     o(this, "_enable", (t) => {
       const { userAction: e } = t;
@@ -188,9 +188,9 @@ class Kt extends O {
       if (!this.state.enabled)
         return;
       if (!((h = this.five.model) != null && h.loaded))
-        throw new Error(m.ModelNotLoaded);
+        throw new Error(p.ModelNotLoaded);
       if (!this.data)
-        throw new Error(m.DataNotLoaded);
+        throw new Error(p.DataNotLoaded);
       if (this.showPromise)
         return this.showPromise;
       const e = {
@@ -202,20 +202,22 @@ class Kt extends O {
       }, i = l(l({}, e), t), n = () => u(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
         let s = !1, a;
-        this.showRejection = (c) => {
-          s = !0, a = c;
+        this.showRejection = (A) => {
+          s = !0, a = A;
         };
-        const [f] = yield I(k(this.five, this.showState, i.userAction));
+        const [f] = yield M(H(this.five, this.showState, i.userAction));
         if (f)
           throw f;
         if (s)
-          throw a ? new Error(a) : new Error(m.UnknownError);
-        this.updateSize(), this.updatePosition(), this.floorIndex = i.floorIndex, this.five.model.show(this.floorIndex);
+          throw a ? new Error(a) : new Error(p.UnknownError);
+        if (!this.updateSize())
+          throw new Error(p.UpdateSizeError);
+        this.updatePosition(), this.floorIndex = i.floorIndex, this.five.model.show(this.floorIndex);
       });
       return this.isHiddenByHideFunc = !1, this.showPromise = n().then(() => {
         this.showPromise = void 0, this.showRejection = void 0;
-        const s = i.modelOpacity, a = i.immediately ? 0 : H;
-        S(this.five, s, a), this.render(a), this.hooks.emit("showAnimationEnded", {
+        const s = i.modelOpacity, a = i.immediately ? 0 : R;
+        C(this.five, s, a), this.render(a), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
         });
@@ -226,12 +228,12 @@ class Kt extends O {
     }));
     o(this, "_hide", (t) => {
       var n;
-      (n = this.showRejection) == null || n.call(this, m.BreakOffByHide), this.showPromise = void 0;
+      (n = this.showRejection) == null || n.call(this, p.BreakOffByHide), this.showPromise = void 0;
       const i = l(l({}, {
         userAction: !0,
         isAutoHide: !1
       }), t);
-      S(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
+      C(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
     });
     o(this, "handleClick", () => {
       if (!this.state.visible)
@@ -270,12 +272,12 @@ class Kt extends O {
       if (!this.state.visible || this.showPromise)
         return;
       const i = this.five.getCurrentState();
-      this.updatePosition(), this.updateSize(), R(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
+      this.updatePosition(), this.updateSize(), z(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
     });
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     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(C(this.showState, ["offset"]), 0), !1;
+        return this.five.updateCamera(S(this.showState, ["offset"]), 0), !1;
     });
     /** 阻止点击分间走点 */
     o(this, "onFiveWantsTapGesture", () => this.handleClick());
@@ -317,15 +319,15 @@ class Kt extends O {
       roomLabelsEnable: !0,
       roomAreaEnable: !0,
       roomNameEnable: !0,
-      cameraImageUrl: L,
-      attachedTo: _.BOUNDING_CENTER,
+      cameraImageUrl: _,
+      attachedTo: O.BOUNDING_CENTER,
       getLabelElement: void 0,
       adaptiveRoomLabelVisibleEnable: !0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
       i18n: (c) => c,
       getRoomAreaText: (c) => (c / 1e6).toFixed(1) + "㎡",
       getRuleDistanceText: (c) => c.toString()
-    }, n = e ? C(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), n.missingFloorConfig), s = p(l(l({}, i), n), { missingFloorConfig: h });
+    }, n = e ? S(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), n.missingFloorConfig), s = m(l(l({}, i), n), { missingFloorConfig: h });
     this.state = { enabled: !0, visible: !1, config: s }, this.initContainer(), t.model.loaded ? this.onFiveModelLoaded() : t.once("modelLoaded", this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
@@ -372,7 +374,7 @@ class Kt extends O {
   /** 更新户型图位置 */
   updatePosition() {
     var s;
-    const t = T(this.five, this.floorIndex, this.state.config.attachedTo), e = (s = this.five.model) == null ? void 0 : s.bounding.getCenter(new w.Vector3()).setY(t);
+    const t = k(this.five, this.floorIndex, this.state.config.attachedTo), e = (s = this.five.model) == null ? void 0 : s.bounding.getCenter(new w.Vector3()).setY(t);
     if (!e)
       return;
     const i = e.clone().project(this.five.camera), n = (i.x + 1) / 2, h = -(i.y - 1) / 2;
@@ -385,8 +387,8 @@ class Kt extends O {
   }
   updateState(t, e) {
     var s;
-    const i = this.state, n = (s = t.config) != null && s.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? p(l(l({}, i.config), t.config), { missingFloorConfig: n }) : i.config;
-    this.state = p(l(l({}, this.state), t), { config: h }), !M(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, n = (s = t.config) != null && s.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? m(l(l({}, i.config), t.config), { missingFloorConfig: n }) : i.config;
+    this.state = m(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 自动放到父容器里
    *
@@ -415,7 +417,7 @@ class Kt extends O {
   render(t) {
     if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;
-    const e = p(l({}, this.state.config), {
+    const e = m(l({}, this.state.config), {
       visible: this.state.visible,
       duration: t != null ? t : 0,
       panoIndex: this.panoIndex,
@@ -426,9 +428,9 @@ class Kt extends O {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new y({ target: this.container, intro: !0, props: e });
+    this.app = new L({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  Kt as Controller
+  Qt as Controller
 };

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

@@ -63,7 +63,7 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     setState(state: PartialDeep<State>, options?: BaseOptions): void;
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
-    updateSize: () => void;
+    updateSize: () => boolean;
     highlight: (highlightData: HighlightData) => void;
     unhighlight: () => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;