@realsee/dnalogel 3.3.3 → 3.3.5-dev.0

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -9,9 +9,9 @@ var v = (d, s, t) => s in d ? A(d, s, { enumerable: !0, configurable: !0, writab
     for (var t of w(s))
       P.call(s, t) && v(d, t, s[t]);
   return d;
-}, m = (d, s) => C(d, S(s));
+}, g = (d, s) => C(d, S(s));
 var o = (d, s, t) => (v(d, typeof s != "symbol" ? s + "" : s, t), t);
-var u = (d, s, t) => new Promise((e, i) => {
+var c = (d, s, t) => new Promise((e, i) => {
   var n = (a) => {
     try {
       r(t.next(a));
@@ -36,9 +36,9 @@ import { omit as _ } from "../../shared-utils/filter.js";
 import { getPxmm as L } from "../../shared-utils/getPxmm.js";
 import { FLOOR_PLAN_ATTACHED_TO as O } from "../constant.js";
 import { Controller as D } from "../../base/BasePluginWithData.js";
-import { checkShowState as k, correctFiveState as T } from "../utils/correctFiveState.js";
+import { correctFiveState as T } from "../utils/correctFiveState.js";
 import { changeModelCanvasOpacity as F } from "../../shared-utils/changeModelCanvasOpacity.js";
-import { FIVE_CAMERA_DEFAULT_FOV as H, FloorplanErrorType as g, SHOW_ANIME_DURATION as G } from "../utils/constant.js";
+import { FIVE_CAMERA_DEFAULT_FOV as k, FloorplanErrorType as p, SHOW_ANIME_DURATION as H } from "../utils/constant.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../vendor/svelte/transition/index.js";
@@ -92,17 +92,17 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
-function W(d) {
+function R(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
   return e || i;
 }
-function R(d) {
+function G(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Yt extends D {
+class Xt extends D {
   constructor(t, e) {
-    var a, f, c;
+    var a, f, m;
     super(t);
     // =============== public properties =================
     o(this, "name", "modelFloorplanPlugin");
@@ -151,22 +151,22 @@ class Yt extends D {
      * @param opts.isAutoShow 是否是自动展示
      * @param opts.userAction 是否是用户行为
      */
-    o(this, "show", (...e) => u(this, [...e], function* (t = {}) {
+    o(this, "show", (...e) => c(this, [...e], function* (t = {}) {
       if (!this.state.enabled || !this.showPromise && this.state.visible)
         return;
       const i = t.userAction !== void 0 ? t.userAction : !0;
       this.updateState({ visible: !0 }, i), this._show(t);
     }));
     /** 隐藏户型图 */
-    o(this, "hide", (...e) => u(this, [...e], function* (t = {}) {
+    o(this, "hide", (...e) => c(this, [...e], function* (t = {}) {
       this.state.enabled && (this.isHiddenByHideFunc = !0, this.state.visible !== !1 && (this.updateState({ visible: !1 }, t.userAction || !0), this._hide(t)));
     }));
     /** 更新户型图大小 */
     o(this, "updateSize", () => {
-      if (!this.data || !k(this.five, this.showState) || !this.container || !this.wrapper)
-        return;
+      if (!this.data || !this.container || !this.wrapper)
+        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, r = L(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * r), f = Math.ceil(n * r);
-      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 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,20 +177,20 @@ class Yt extends D {
     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, g.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;
       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* () {
+    o(this, "_show", (t) => c(this, null, function* () {
       var h;
       if (!this.state.enabled)
         return;
       if (!((h = this.five.model) != null && h.loaded))
-        throw new Error(g.ModelNotLoaded);
+        throw new Error(p.ModelNotLoaded);
       if (!this.data)
-        throw new Error(g.DataNotLoaded);
+        throw new Error(p.DataNotLoaded);
       if (this.showPromise)
         return this.showPromise;
       const e = {
@@ -199,22 +199,24 @@ class Yt extends D {
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = l(l({}, e), t), n = () => u(this, null, function* () {
+      }, i = l(l({}, e), t), n = () => c(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
         let r = !1, a;
-        this.showRejection = (c) => {
-          r = !0, a = c;
+        this.showRejection = (u) => {
+          r = !0, a = u;
         };
         const [f] = yield I(T(this.five, this.showState, i.userAction));
         if (f)
           throw f;
         if (r)
-          throw a ? new Error(a) : new Error(g.UnknownError);
-        this.updateSize(), 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.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 r = i.modelOpacity, a = i.immediately ? 0 : G;
+        const r = i.modelOpacity, a = i.immediately ? 0 : H;
         F(this.five, r, a), this.render(a), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
@@ -226,7 +228,7 @@ class Yt extends D {
     }));
     o(this, "_hide", (t) => {
       var n;
-      (n = this.showRejection) == null || n.call(this, g.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
@@ -257,7 +259,7 @@ class Yt extends D {
       if (!e || this.state.config.autoShowEnable === !1 || this.isHiddenByHideFunc)
         return;
       const i = this.five.getCurrentState();
-      i.mode === "Floorplan" && (this.state.visible || R(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 })));
+      i.mode === "Floorplan" && (this.state.visible || G(i) && (this.updateState({ visible: !0 }, !0), this._show({ isAutoShow: !0 })));
     });
     /** panoIndex 改变时，更新 floorIndex */
     o(this, "onFivePanoArrived", (t) => {
@@ -269,7 +271,7 @@ class Yt extends D {
       if (!this.state.visible || this.showPromise)
         return;
       const i = this.five.getCurrentState();
-      W(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e, isAutoHide: !0 }));
+      R(i) && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e, isAutoHide: !0 }));
     });
     /** 在户型图展示时阻止多指操作, 阻止鼠标放大 */
     o(this, "onFiveWantsGesture", (t, e) => {
@@ -302,12 +304,12 @@ class Yt extends D {
       mode: "Floorplan",
       longitude: 0,
       latitude: Math.PI / 2,
-      fov: H / ((a = e == null ? void 0 : e.scale) != null ? a : 1)
+      fov: k / ((a = e == null ? void 0 : e.scale) != null ? a : 1)
     }, this.defaultMissingFloorConfig = {
       imageURL: this.staticPrefix + "/release/web/saas/missing-floorplan.e274c596.png",
       imageWidth: 200,
       imageHeight: 120,
-      text: (c = (f = e.i18n) == null ? void 0 : f.call(e, "暂无平面图")) != null ? c : "暂无平面图",
+      text: (m = (f = e.i18n) == null ? void 0 : f.call(e, "暂无平面图")) != null ? m : "暂无平面图",
       textFontSize: 14
     };
     const i = {
@@ -327,16 +329,16 @@ class Yt extends D {
       attachedTo: O.BOUNDING_CENTER,
       getLabelElement: void 0,
       missingFloorConfig: l(l({}, this.defaultMissingFloorConfig), e.missingFloorConfig),
-      i18n: (p) => p,
-      getRoomAreaText: (p) => (p / 1e6).toFixed(1) + "㎡",
-      getRuleDistanceText: (p) => p.toString()
-    }, n = e ? _(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), n.missingFloorConfig), r = m(l(l({}, i), n), { missingFloorConfig: h });
+      i18n: (u) => u,
+      getRoomAreaText: (u) => (u / 1e6).toFixed(1) + "㎡",
+      getRuleDistanceText: (u) => u.toString()
+    }, n = e ? _(e, ["selector", "scale"]) : {}, h = l(l({}, i.missingFloorConfig), n.missingFloorConfig), r = g(l(l({}, i), n), { missingFloorConfig: h });
     this.state = { enabled: !0, visible: !1, config: r }, 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 n(c) {
-        return Object.prototype.hasOwnProperty.apply(c, ["version"]);
+    return c(this, null, function* () {
+      function n(m) {
+        return Object.prototype.hasOwnProperty.apply(m, ["version"]);
       }
       const h = t;
       h && !h.version && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
@@ -376,14 +378,14 @@ class Yt extends D {
     this.updateState({ config: t }, e), this.render();
   }
   formatData(t) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       return yield b(t.data);
     });
   }
   updateState(t, e) {
     var r;
-    const i = this.state, n = (r = t.config) != null && r.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 }), !M(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, n = (r = t.config) != null && r.missingFloorConfig ? l(l({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, h = t.config ? g(l(l({}, i.config), t.config), { missingFloorConfig: n }) : i.config;
+    this.state = g(l(l({}, this.state), t), { config: h }), !M(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *
@@ -412,7 +414,7 @@ class Yt extends D {
   render(t) {
     if (!this.state.enabled || !this.container || !this.data || this.size.width === 0 || this.showPromise)
       return;
-    const e = m(l({}, this.state.config), {
+    const e = g(l({}, this.state.config), {
       visible: this.state.visible,
       duration: t != null ? t : 0,
       panoIndex: this.panoIndex,
@@ -427,5 +429,5 @@ class Yt extends D {
   }
 }
 export {
-  Yt as Controller
+  Xt as Controller
 };

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

@@ -30,7 +30,7 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     constructor(five: Five, params?: Parameters);
     load(serverData: PluginServerData | FloorplanServerData, state?: Partial<State>, userAction?: boolean): Promise<void>;
     /** 更新户型图大小 */
-    updateSize: () => void;
+    updateSize: () => boolean;
     /** 更新户型图位置 */
     updatePosition(): void;
     /** 把插件的渲染DOM插入到对应的容器中去 */

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -121,9 +121,9 @@ class Bt extends M {
     /** 更新户型图大小 */
     o(this, "updateSize", () => {
       if (!this.data || !this.container || !this.wrapper || this.five.getCurrentState().mode !== "Topview")
-        return;
+        return !1;
       const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, r = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = P(this.five, this.wrapper, this.floorIndex, r), h = Math.ceil(i * a), c = Math.ceil(s * a);
-      this.size.width === h && this.size.height === c || (this.container.style.width = h + "px", this.container.style.height = c + "px", this.size = { width: h, height: c });
+      return this.size.width === h && this.size.height === c || (this.container.style.width = h + "px", this.container.style.height = c + "px", this.size = { width: h, height: c }), !0;
     });
     /** 销毁插件 */
     o(this, "dispose", () => {

package/libs/floorplan/utils/constant.d.ts

@@ -3,6 +3,8 @@ export declare const enum FloorplanErrorType {
     UnknownError = "UnknownError",
     /** 数据未加载 */
     DataNotLoaded = "DataNotLoaded",
+    /** 更新户型图大小失败 */
+    UpdateSizeError = "UpdateSizeError",
     /** 展示过程被隐藏打断 */
     BreakOffByHide = "BreakOffByHide",
     /** 展示过程中插件被禁用 */

package/libs/floorplan/utils/constant.js

@@ -1,4 +1,4 @@
-var a = /* @__PURE__ */ ((e) => (e.UnknownError = "UnknownError", e.DataNotLoaded = "DataNotLoaded", e.BreakOffByHide = "BreakOffByHide", e.BreakOffByDisable = "BreakOffByDisable", e.ModelNotLoaded = "ModelNotLoaded", e.ChangeModeError = "ChangeModeError", e.UpdateCameraError = "UpdateCameraError", e))(a || {});
+var a = /* @__PURE__ */ ((e) => (e.UnknownError = "UnknownError", e.DataNotLoaded = "DataNotLoaded", e.UpdateSizeError = "UpdateSizeError", e.BreakOffByHide = "BreakOffByHide", e.BreakOffByDisable = "BreakOffByDisable", e.ModelNotLoaded = "ModelNotLoaded", e.ChangeModeError = "ChangeModeError", e.UpdateCameraError = "UpdateCameraError", e))(a || {});
 const d = 500, t = 80;
 export {
   t as FIVE_CAMERA_DEFAULT_FOV,

package/libs/floorplan/utils/correctFiveState.js

@@ -1,4 +1,4 @@
-var c = (e, t, o) => new Promise((m, n) => {
+var l = (e, t, o) => new Promise((m, n) => {
   var i = (r) => {
     try {
       u(o.next(r));
@@ -14,26 +14,26 @@ var c = (e, t, o) => new Promise((m, n) => {
   }, u = (r) => r.done ? m(r.value) : Promise.resolve(r.value).then(i, a);
   u((o = o.apply(e, t)).next());
 });
-import { to as l } from "../../shared-utils/to.js";
+import { to as s } from "../../shared-utils/to.js";
 import { FloorplanErrorType as p } from "./constant.js";
-import { nearlyEqual as s } from "../../shared-utils/nearlyEqual.js";
+import { nearlyEqual as d } from "../../shared-utils/nearlyEqual.js";
 import { changeMode as M } from "../../shared-utils/five/changeMode.js";
 import { omit as g } from "../../shared-utils/filter.js";
 function h(e, t) {
   if (e.currentMode !== t.mode)
     return !1;
   const { latitude: o, longitude: m, fov: n, offset: i } = t, { latitude: a, longitude: u, offset: r } = e.getCurrentState(), f = e.camera.fov;
-  return !(!s(o, a, 2) || !s(m, u, 2) || i !== void 0 && i.distanceTo(r) > 0.01 || n !== f);
+  return !(!d(o, a, 2) || !d(m, u, 2) || i !== void 0 && i.distanceTo(r) > 0.01 || !d(n, f, 2));
 }
 function b(e, t, o = !0) {
-  return c(this, null, function* () {
+  return l(this, null, function* () {
     if (h(e, t) === !0)
       return;
     const n = e.getCurrentState();
     if (n.mode !== t.mode) {
-      const [d] = yield l(M(e, [t.mode, t, void 0, o]));
-      if (d)
-        throw d;
+      const [c] = yield s(M(e, [t.mode, t, void 0, o]));
+      if (c)
+        throw c;
       return;
     }
     const { latitude: i, longitude: a, fov: u } = n, r = Math.min(
@@ -44,12 +44,11 @@ function b(e, t, o = !0) {
         (a > Math.PI ? 2 * Math.PI - a : a) * 500,
         typeof t.fov == "number" ? Math.abs(u - t.fov) * 10 : 1 / 0
       )
-    ), [f] = yield l(e.updateCamera(g(t, ["mode"]), r, o));
+    ), [f] = yield s(e.updateCamera(g(t, ["mode"]), r, o));
     if (f)
       throw new Error(p.UpdateCameraError);
   });
 }
 export {
-  h as checkShowState,
   b as correctFiveState
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.3.3",
+    "%c %c@realsee/dnalogel %cv3.3.5-dev.0",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.3.3",
+  "version": "3.3.5-dev.0",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.0.0-alpha.34",
+    "@realsee/five": "6.0.0-alpha.37",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^20.0.3",