@realsee/dnalogel 2.25.0 → 2.26.0

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,45 +1,45 @@
-var E = Object.defineProperty, P = Object.defineProperties;
-var C = Object.getOwnPropertyDescriptors;
+var S = Object.defineProperty, A = Object.defineProperties;
+var P = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var y = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
-var m = (h, n, t) => n in h ? E(h, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[n] = t, c = (h, n) => {
+var E = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
+var m = (d, n, t) => n in d ? S(d, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[n] = t, c = (d, n) => {
   for (var t in n || (n = {}))
-    y.call(n, t) && m(h, t, n[t]);
+    E.call(n, t) && m(d, t, n[t]);
   if (w)
     for (var t of w(n))
-      I.call(n, t) && m(h, t, n[t]);
-  return h;
-}, v = (h, n) => P(h, C(n));
-var o = (h, n, t) => (m(h, typeof n != "symbol" ? n + "" : n, t), t);
-var u = (h, n, t) => new Promise((e, i) => {
-  var s = (d) => {
+      C.call(n, t) && m(d, t, n[t]);
+  return d;
+}, v = (d, n) => A(d, P(n));
+var o = (d, n, t) => (m(d, typeof n != "symbol" ? n + "" : n, t), t);
+var u = (d, n, t) => new Promise((e, i) => {
+  var r = (a) => {
     try {
-      r(t.next(d));
+      s(t.next(a));
     } catch (l) {
       i(l);
     }
-  }, a = (d) => {
+  }, h = (a) => {
     try {
-      r(t.throw(d));
+      s(t.throw(a));
     } catch (l) {
       i(l);
     }
-  }, r = (d) => d.done ? e(d.value) : Promise.resolve(d.value).then(s, a);
-  r((t = t.apply(h, n)).next());
+  }, s = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(r, h);
+  s((t = t.apply(d, n)).next());
 });
-import * as F from "three";
-import { to as x } from "../../shared-utils/to.js";
-import { equal as M } from "../../shared-utils/equal.js";
-import { Main as _ } from "../Components/Main.js";
-import { formatData as b } from "../utils/formatData.js";
-import { CAMERA_IMAGE as L } from "../Assets/camera.js";
-import { omit as O } from "../../shared-utils/filter.js";
-import { FLOOR_PLAN_ATTACHED_TO as D } from "../constant.js";
-import { Controller as T } from "../../base/BasePluginWithData.js";
-import { getPxmm as k, getAttachedY as H } from "../../shared-utils/getPxmm.js";
-import { checkShowState as R, correctFiveState as G } from "../utils/correctFiveState.js";
-import { changeModelCanvasOpacity as S } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FloorplanErrorType as f, SHOW_ANIME_DURATION as W } from "../utils/constant.js";
+import * as I from "three";
+import { to as y } from "../../shared-utils/to.js";
+import { equal as F } from "../../shared-utils/equal.js";
+import { Main as x } from "../Components/Main.js";
+import { formatData as g } from "../utils/formatData.js";
+import { CAMERA_IMAGE as M } from "../Assets/camera.js";
+import { omit as _ } from "../../shared-utils/filter.js";
+import { FLOOR_PLAN_ATTACHED_TO as L } from "../constant.js";
+import { Controller as O } from "../../base/BasePluginWithData.js";
+import { getPxmm as D, getAttachedY as T } from "../../shared-utils/getPxmm.js";
+import { checkShowState as k, correctFiveState as H } from "../utils/correctFiveState.js";
+import { changeModelCanvasOpacity as b } from "../../shared-utils/changeModelCanvasOpacity.js";
+import { FloorplanErrorType as f, 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";
@@ -89,15 +89,15 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
-function N(h) {
-  const { latitude: n, longitude: t } = h, e = Math.abs(n - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
+function G(d) {
+  const { latitude: n, longitude: t } = d, e = Math.abs(n - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
   return e || i;
 }
-function z(h) {
-  const { latitude: n, longitude: t } = h, e = Math.abs(n - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
+function W(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 Kt extends T {
+class Jt extends O {
   constructor(t, e) {
     super(t);
     // =============== public properties =================
@@ -158,10 +158,10 @@ class Kt extends T {
     }));
     /** 更新户型图大小 */
     o(this, "updateSize", () => {
-      if (!this.data || !R(this.five, this.showState) || !this.container || !this.wrapper)
+      if (!this.data || !k(this.five, this.showState) || !this.container || !this.wrapper)
         return;
-      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 = k(this.five, this.wrapper, this.floorIndex, a), d = Math.ceil(i * r), l = Math.ceil(s * r);
-      this.size.width === d && this.size.height === l || (this.container.style.width = d + "px", this.container.style.height = l + "px", this.size = { width: d, height: l });
+      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, s = D(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * s), l = Math.ceil(r * s);
+      this.size.width === a && this.size.height === l || (this.container.style.width = a + "px", this.container.style.height = l + "px", this.size = { width: a, height: l });
     });
     o(this, "highlight", (t) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -170,64 +170,63 @@ class Kt extends T {
       this.highlightData = {}, this.render();
     });
     o(this, "_disable", (t) => {
-      var i, s, a;
+      var i, r, h;
       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, (a = this.container) == null || a.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, f.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;
       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) => u(this, null, function* () {
-      var a;
+      var h;
       if (!this.state.enabled)
         return;
-      if (!((a = this.five.model) != null && a.loaded))
+      if (!((h = this.five.model) != null && h.loaded))
         throw new Error(f.ModelNotLoaded);
       if (!this.data)
         throw new Error(f.DataNotLoaded);
-      this.isHiddenByHideFunc = !1;
+      if (this.showPromise)
+        return this.showPromise;
       const e = {
         floorIndex: this.floorIndex,
         modelOpacity: this.state.config.modelOpacity,
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = c(c({}, e), t), s = () => u(this, null, function* () {
+      }, i = c(c({}, e), t), r = () => u(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
-        let r = !1, d;
-        this.showRejection = (A) => {
-          r = !0, d = A;
+        let s = !1, a;
+        this.showRejection = (p) => {
+          s = !0, a = p;
         };
-        const [l] = yield x(G(this.five, this.showState, i.userAction));
+        const [l] = yield y(H(this.five, this.showState, i.userAction));
         if (l)
           throw l;
-        if (r)
-          throw d ? new Error(d) : new Error(f.UnknownError);
+        if (s)
+          throw a ? new Error(a) : new Error(f.UnknownError);
         this.updateSize(), this.updatePosition(), this.floorIndex = i.floorIndex, this.five.model.show(this.floorIndex);
-        const p = i.modelOpacity, g = i.immediately ? 0 : W;
-        S(this.five, p, g), this.render(g);
       });
-      return this.showPromise = s().then(() => {
-        this.hooks.emit("showAnimationEnded", {
+      return this.isHiddenByHideFunc = !1, this.showPromise = r().then(() => {
+        this.showPromise = void 0, this.showRejection = void 0;
+        const s = i.modelOpacity, a = i.immediately ? 0 : R;
+        b(this.five, s, a), this.render(a), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
         });
-      }).catch((r) => {
-        if (this.updateState({ visible: !1 }, i.userAction), !i.isAutoShow && r instanceof Error)
-          throw r;
-      }).finally(() => {
-        this.showPromise = void 0, this.showRejection = void 0;
+      }).catch((s) => {
+        if (this.showPromise = void 0, this.showRejection = void 0, this.updateState({ visible: !1 }, i.userAction), !i.isAutoShow && s instanceof Error)
+          throw s;
       }), this.showPromise;
     }));
     o(this, "_hide", (t) => {
-      var s;
-      (s = this.showRejection) == null || s.call(this, f.BreakOffByHide), this.showPromise = void 0;
+      var r;
+      (r = this.showRejection) == null || r.call(this, f.BreakOffByHide), this.showPromise = void 0;
       const i = c(c({}, {
         userAction: !0,
         isAutoHide: !1
       }), t);
-      S(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
+      b(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
     });
     o(this, "handleClick", () => {
       if (!this.state.visible)
@@ -253,7 +252,7 @@ class Kt extends T {
       if (!e || this.state.visible || this.state.config.autoShowEnable === !1 || this.isHiddenByHideFunc)
         return;
       const i = this.five.getCurrentState();
-      i.mode === this.showState.mode && z(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 }));
+      i.mode === this.showState.mode && W(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 }));
     });
     /** panoIndex 改变时，更新 floorIndex */
     o(this, "onFivePanoArrived", (t) => {
@@ -265,7 +264,7 @@ class Kt extends T {
       if (!this.state.visible || this.showPromise)
         return;
       const i = this.five.getCurrentState();
-      this.updatePosition(), this.updateSize(), N(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
+      this.updatePosition(), this.updateSize(), G(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
     });
     /** 户型图展示中，转动三维模型，结束时应该自动修复模型状态 */
     o(this, "onFiveWantsPanGesture", (t, e) => {
@@ -307,28 +306,28 @@ class Kt extends T {
       roomLabelsEnable: !0,
       roomAreaEnable: !0,
       roomNameEnable: !0,
-      cameraImageUrl: L,
-      attachedTo: D.BOUNDING_CENTER,
+      cameraImageUrl: M,
+      attachedTo: L.BOUNDING_CENTER,
       getLabelElement: void 0,
       adaptiveRoomLabelVisibleEnable: !0,
-      getRoomAreaText: (r) => (r / 1e6).toFixed(1) + "㎡",
-      getRuleDistanceText: (r) => r.toString()
-    }, s = e ? O(e, ["selector", "scale"]) : {}, a = c(c({}, i), s);
+      getRoomAreaText: (s) => (s / 1e6).toFixed(1) + "㎡",
+      getRuleDistanceText: (s) => s.toString()
+    }, r = e ? _(e, ["selector", "scale"]) : {}, h = c(c({}, i), r);
     this.state = {
       enabled: !0,
       visible: !1,
-      config: a
+      config: h
     }, this.initContainer(), t.model.loaded ? this.onFiveModelLoaded() : t.once("modelLoaded", this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
     return u(this, null, function* () {
-      function s(p) {
+      function r(p) {
         return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
-      const a = t;
-      a && !a.version && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
-      const r = JSON.parse(JSON.stringify(t)), d = s(r) ? r.data : r, l = this.data;
-      this.data = yield b(d), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, i), this.render();
+      const h = t;
+      h && !h.version && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
+      const s = JSON.parse(JSON.stringify(t)), a = r(s) ? s.data : s, l = this.data;
+      this.data = yield g(a), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, i), this.render();
     });
   }
   /** 把插件的渲染DOM插入到对应的容器中去 */
@@ -352,10 +351,10 @@ class Kt extends T {
   }
   /** 更改插件 State */
   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 a = { userAction: s };
-      t.visible ? this._show(a) : this._hide(a);
+    const i = this.state, r = e.userAction !== void 0 ? e.userAction : !0;
+    if (this.updateState(t, r), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: r }) : this._disable({ userAction: r })), t.visible !== void 0 && i.visible !== t.visible) {
+      const h = { userAction: r };
+      t.visible ? this._show(h) : this._hide(h);
     }
   }
   changeConfigs(t, e = !0) {
@@ -363,21 +362,21 @@ class Kt extends T {
   }
   /** 更新户型图位置 */
   updatePosition() {
-    var r;
-    const t = H(this.five, this.floorIndex, this.state.config.attachedTo), e = (r = this.five.model) == null ? void 0 : r.bounding.getCenter(new F.Vector3()).setY(t);
+    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 I.Vector3()).setY(t);
     if (!e)
       return;
-    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 + "%";
+    const i = e.clone().project(this.five.camera), r = (i.x + 1) / 2, h = -(i.y - 1) / 2;
+    this.container.style.left = r * 100 + "%", this.container.style.top = h * 100 + "%";
   }
   formatData(t) {
     return u(this, null, function* () {
-      return yield b(t.data);
+      return yield g(t.data);
     });
   }
   updateState(t, e) {
-    const i = this.state, s = t.config ? c(c({}, i.config), t.config) : i.config;
-    this.state = v(c(c({}, this.state), t), { config: s }), !M(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, r = t.config ? c(c({}, i.config), t.config) : i.config;
+    this.state = v(c(c({}, this.state), t), { config: r }), !F(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -404,7 +403,7 @@ class Kt extends T {
     this.hasAddedEventListener = !1, t.off("modelLoaded", this.onFiveModelLoaded), t.off("modeChange", this.onFiveModeChange), t.off("panoArrived", this.onFivePanoArrived), t.off("cameraUpdate", this.onFiveCameraUpdate), t.off("wantsPanGesture", this.onFiveWantsPanGesture), t.off("wantsTapGesture", this.onFiveWantsTapGesture), t.off("wantsChangeMode", this.onFiveWantsChangeMode), t.off("modelShownFloorChange", this.onModelShownFloorChange);
   }
   render(t) {
-    if (!this.state.enabled || !this.container || !this.data || this.size.width === 0)
+    if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;
     const e = v(c({}, this.state.config), {
       visible: this.state.visible,
@@ -417,9 +416,9 @@ class Kt extends T {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new _({ target: this.container, intro: !0, props: e });
+    this.app = new x({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  Kt as Controller
+  Jt as Controller
 };

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -1,44 +1,44 @@
-var F = Object.defineProperty, E = Object.defineProperties;
-var C = Object.getOwnPropertyDescriptors;
+var A = Object.defineProperty, S = Object.defineProperties;
+var F = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var P = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
-var m = (h, s, t) => s in h ? F(h, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[s] = t, u = (h, s) => {
-  for (var t in s || (s = {}))
-    P.call(s, t) && m(h, t, s[t]);
+var E = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
+var m = (h, r, t) => r in h ? A(h, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[r] = t, u = (h, r) => {
+  for (var t in r || (r = {}))
+    E.call(r, t) && m(h, t, r[t]);
   if (w)
-    for (var t of w(s))
-      I.call(s, t) && m(h, t, s[t]);
+    for (var t of w(r))
+      P.call(r, t) && m(h, t, r[t]);
   return h;
-}, v = (h, s) => E(h, C(s));
-var o = (h, s, t) => (m(h, typeof s != "symbol" ? s + "" : s, t), t);
-var f = (h, s, t) => new Promise((e, i) => {
-  var r = (n) => {
+}, v = (h, r) => S(h, F(r));
+var o = (h, r, t) => (m(h, typeof r != "symbol" ? r + "" : r, t), t);
+var f = (h, r, t) => new Promise((e, i) => {
+  var n = (s) => {
     try {
-      a(t.next(n));
+      a(t.next(s));
     } catch (l) {
       i(l);
     }
-  }, d = (n) => {
+  }, d = (s) => {
     try {
-      a(t.throw(n));
+      a(t.throw(s));
     } catch (l) {
       i(l);
     }
-  }, a = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(r, d);
-  a((t = t.apply(h, s)).next());
+  }, a = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(n, d);
+  a((t = t.apply(h, r)).next());
 });
-import { to as M } from "../../shared-utils/to.js";
-import { equal as x } 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 O } from "../../shared-utils/getPxmm.js";
-import { FLOOR_PLAN_ATTACHED_TO as D } from "../constant.js";
-import { Controller as k } from "../../base/BasePluginWithData.js";
-import { checkShowState as T, correctFiveState as G } from "../utils/correctFiveState.js";
-import { changeModelCanvasOpacity as A } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FIVE_CAMERA_DEFAULT_FOV as H, FloorplanErrorType as c, SHOW_ANIME_DURATION as W } from "../utils/constant.js";
+import { to as C } from "../../shared-utils/to.js";
+import { equal as I } from "../../shared-utils/equal.js";
+import { Main as M } from "../Components/Main.js";
+import { formatData as g } from "../utils/formatData.js";
+import { CAMERA_IMAGE as x } from "../Assets/camera.js";
+import { omit as y } from "../../shared-utils/filter.js";
+import { getPxmm as _ } from "../../shared-utils/getPxmm.js";
+import { FLOOR_PLAN_ATTACHED_TO as L } from "../constant.js";
+import { Controller as O } from "../../base/BasePluginWithData.js";
+import { checkShowState as D, correctFiveState as k } from "../utils/correctFiveState.js";
+import { changeModelCanvasOpacity as b } from "../../shared-utils/changeModelCanvasOpacity.js";
+import { FIVE_CAMERA_DEFAULT_FOV as T, FloorplanErrorType as c, SHOW_ANIME_DURATION as G } from "../utils/constant.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../vendor/svelte/transition/index.js";
@@ -89,15 +89,15 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
-function R(h) {
-  const { latitude: s, longitude: t } = h, e = Math.abs(s - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
+function H(h) {
+  const { latitude: r, longitude: t } = h, 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;
 }
-function N(h) {
-  const { latitude: s, longitude: t } = h, e = Math.abs(s - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
+function W(h) {
+  const { latitude: r, longitude: t } = h, 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 Qt extends k {
+class Jt extends O {
   constructor(t, e) {
     var a;
     super(t);
@@ -159,10 +159,10 @@ class Qt extends k {
     }));
     /** 更新户型图大小 */
     o(this, "updateSize", () => {
-      if (!this.data || !T(this.five, this.showState) || !this.container || !this.wrapper)
+      if (!this.data || !D(this.five, this.showState) || !this.container || !this.wrapper)
         return;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, r = e.y - t.y, d = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = O(this.five, this.wrapper, this.floorIndex, d), n = Math.ceil(i * a), l = Math.ceil(r * a);
-      this.size.width === n && this.size.height === l || (this.container.style.width = n + "px", this.container.style.height = l + "px", this.size = { width: n, height: l });
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, n = e.y - t.y, d = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = _(this.five, this.wrapper, this.floorIndex, d), s = Math.ceil(i * a), l = Math.ceil(n * a);
+      this.size.width === s && this.size.height === l || (this.container.style.width = s + "px", this.container.style.height = l + "px", this.size = { width: s, height: l });
     });
     o(this, "highlight", (t) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -171,9 +171,9 @@ class Qt extends k {
       this.highlightData = {}, this.render();
     });
     o(this, "_disable", (t) => {
-      var i, r, d;
+      var i, n, d;
       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, (d = this.container) == null || d.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, c.BreakOffByDisable), this.showPromise = void 0, (n = this.app) == null || n.$destroy(), this.app = void 0, (d = this.container) == null || d.remove(), this.removeEventListener();
     });
     o(this, "_enable", (t) => {
       const { userAction: e } = t;
@@ -187,48 +187,47 @@ class Qt extends k {
         throw new Error(c.ModelNotLoaded);
       if (!this.data)
         throw new Error(c.DataNotLoaded);
-      this.isHiddenByHideFunc = !1;
+      if (this.showPromise)
+        return this.showPromise;
       const e = {
         floorIndex: this.floorIndex,
         modelOpacity: this.state.config.modelOpacity,
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = u(u({}, e), t), r = () => f(this, null, function* () {
+      }, i = u(u({}, e), t), n = () => f(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
-        let a = !1, n;
-        this.showRejection = (S) => {
-          a = !0, n = S;
+        let a = !1, s;
+        this.showRejection = (p) => {
+          a = !0, s = p;
         };
-        const [l] = yield M(G(this.five, this.showState, i.userAction));
+        const [l] = yield C(k(this.five, this.showState, i.userAction));
         if (l)
           throw l;
         if (a)
-          throw n ? new Error(n) : new Error(c.UnknownError);
+          throw s ? new Error(s) : new Error(c.UnknownError);
         this.updateSize(), this.floorIndex = i.floorIndex, this.five.model.show(this.floorIndex);
-        const p = i.modelOpacity, g = i.immediately ? 0 : W;
-        A(this.five, p, g), this.render(g);
       });
-      return this.showPromise = r().then(() => {
-        this.hooks.emit("showAnimationEnded", {
+      return this.isHiddenByHideFunc = !1, this.showPromise = n().then(() => {
+        this.showPromise = void 0, this.showRejection = void 0;
+        const a = i.modelOpacity, s = i.immediately ? 0 : G;
+        b(this.five, a, s), this.render(s), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
         });
       }).catch((a) => {
-        if (this.updateState({ visible: !1 }, i.userAction), !i.isAutoShow && a instanceof Error)
+        if (this.showPromise = void 0, this.showRejection = void 0, this.updateState({ visible: !1 }, i.userAction), !i.isAutoShow && a instanceof Error)
           throw a;
-      }).finally(() => {
-        this.showPromise = void 0, this.showRejection = void 0;
       }), this.showPromise;
     }));
     o(this, "_hide", (t) => {
-      var r;
-      (r = this.showRejection) == null || r.call(this, c.BreakOffByHide), this.showPromise = void 0;
+      var n;
+      (n = this.showRejection) == null || n.call(this, c.BreakOffByHide), this.showPromise = void 0;
       const i = u(u({}, {
         userAction: !0,
         isAutoHide: !1
       }), t);
-      A(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
+      b(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
     });
     o(this, "handleClick", () => {
       if (!this.state.visible)
@@ -254,7 +253,7 @@ class Qt extends k {
       if (!e || this.state.config.autoShowEnable === !1 || this.isHiddenByHideFunc)
         return;
       const i = this.five.getCurrentState();
-      i.mode === "Floorplan" && (this.state.visible || N(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 })));
+      i.mode === "Floorplan" && (this.state.visible || W(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 })));
     });
     /** panoIndex 改变时，更新 floorIndex */
     o(this, "onFivePanoArrived", (t) => {
@@ -266,7 +265,7 @@ class Qt extends k {
       if (!this.state.visible || this.showPromise)
         return;
       const i = this.five.getCurrentState();
-      R(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e, isAutoHide: !0 }));
+      H(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e, isAutoHide: !0 }));
     });
     /** 在户型图展示时阻止多指操作, 阻止鼠标放大 */
     o(this, "onFiveWantsGesture", (t, e) => {
@@ -299,7 +298,7 @@ class Qt extends k {
       mode: "Floorplan",
       longitude: 0,
       latitude: Math.PI / 2,
-      fov: H / ((a = e == null ? void 0 : e.scale) != null ? a : 1)
+      fov: T / ((a = e == null ? void 0 : e.scale) != null ? a : 1)
     };
     const i = {
       northDesc: "北",
@@ -314,12 +313,12 @@ class Qt extends k {
       roomAreaEnable: !0,
       roomNameEnable: !0,
       adaptiveRoomLabelVisibleEnable: !0,
-      cameraImageUrl: _,
-      attachedTo: D.BOUNDING_CENTER,
+      cameraImageUrl: x,
+      attachedTo: L.BOUNDING_CENTER,
       getLabelElement: void 0,
-      getRoomAreaText: (n) => (n / 1e6).toFixed(1) + "㎡",
-      getRuleDistanceText: (n) => n.toString()
-    }, r = e ? L(e, ["selector", "scale"]) : {}, d = u(u({}, i), r);
+      getRoomAreaText: (s) => (s / 1e6).toFixed(1) + "㎡",
+      getRuleDistanceText: (s) => s.toString()
+    }, n = e ? y(e, ["selector", "scale"]) : {}, d = u(u({}, i), n);
     this.state = {
       enabled: !0,
       visible: !1,
@@ -328,13 +327,13 @@ class Qt extends k {
   }
   load(t, e, i = !0) {
     return f(this, null, function* () {
-      function r(p) {
+      function n(p) {
         return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
       const d = t;
       d && !d.version && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
-      const a = JSON.parse(JSON.stringify(t)), n = r(a) ? a.data : a, l = this.data;
-      this.data = yield b(n), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, i), this.render();
+      const a = JSON.parse(JSON.stringify(t)), s = n(a) ? a.data : a, l = this.data;
+      this.data = yield g(s), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, i), this.render();
     });
   }
   /** 把插件的渲染DOM插入到对应的容器中去 */
@@ -358,9 +357,9 @@ class Qt extends k {
   }
   /** 更改插件 State */
   setState(t, e = {}) {
-    const i = this.state, r = e.userAction !== void 0 ? e.userAction : !0;
-    if (this.updateState(t, r), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: r }) : this._disable({ userAction: r })), t.visible !== void 0 && i.visible !== t.visible) {
-      const d = { userAction: r };
+    const i = this.state, n = e.userAction !== void 0 ? e.userAction : !0;
+    if (this.updateState(t, n), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: n }) : this._disable({ userAction: n })), t.visible !== void 0 && i.visible !== t.visible) {
+      const d = { userAction: n };
       t.visible ? this._show(d) : this._hide(d);
     }
     this.render();
@@ -370,12 +369,12 @@ class Qt extends k {
   }
   formatData(t) {
     return f(this, null, function* () {
-      return yield b(t.data);
+      return yield g(t.data);
     });
   }
   updateState(t, e) {
-    const i = this.state, r = t.config ? u(u({}, i.config), t.config) : i.config;
-    this.state = v(u(u({}, this.state), t), { config: r }), !x(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, n = t.config ? u(u({}, i.config), t.config) : i.config;
+    this.state = v(u(u({}, this.state), t), { config: n }), !I(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -402,7 +401,7 @@ class Qt extends k {
     this.hasAddedEventListener = !1, t.off("modelLoaded", this.onFiveModelLoaded), t.off("modeChange", this.onFiveModeChange), t.off("interiaPan", this.onFiveInteriaPan), t.off("panoArrived", this.onFivePanoArrived), t.off("cameraUpdate", this.onFiveCameraUpdate), t.off("wantsGesture", this.onFiveWantsGesture), t.off("wantsPanGesture", this.onFiveWantsPanGesture), t.off("wantsTapGesture", this.onFiveWantsTapGesture), t.off("wantsChangeMode", this.onFiveWantsChangeMode), t.off("modelShownFloorChange", this.onModelShownFloorChange);
   }
   render(t) {
-    if (!this.state.enabled || !this.container || !this.data || this.size.width === 0)
+    if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;
     const e = v(u({}, this.state.config), {
       visible: this.state.visible,
@@ -415,9 +414,9 @@ class Qt extends k {
     });
     if (this.app)
       return this.app.$set(e);
-    this.app = new y({ target: this.container, intro: !0, props: e });
+    this.app = new M({ target: this.container, intro: !0, props: e });
   }
 }
 export {
-  Qt as Controller
+  Jt as Controller
 };

package/libs/floorplan/PanoFloorplanRadarPlugin/typing.d.ts

@@ -47,7 +47,7 @@ export interface Parameters extends Partial<Config> {
         cameraImageUrl?: string;
     };
 }
-export interface PluginServerData extends BasePlugin.ServerData {
+export interface PluginServerData {
     version: number;
     data: FloorplanServerData;
 }

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

@@ -60,7 +60,7 @@ export interface Parameters extends Partial<Config> {
     selector?: string | Element;
     scale?: number;
 }
-export interface PluginServerData extends BasePlugin.ServerData {
+export interface PluginServerData {
     version: number;
     data: FloorplanServerData;
 }