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

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let A = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.72.4-alpha.1");
+    r(this, "VERSION", "3.72.4-alpha.2");
     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 H = Object.prototype.hasOwnProperty, R = Object.prototype.propertyIsEnumerable;
+var k = Object.prototype.hasOwnProperty, H = 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 = {}))
-    H.call(h, t) && v(l, t, h[t]);
+    k.call(h, t) && v(l, t, h[t]);
   if (b)
     for (var t of b(h))
-      R.call(h, t) && v(l, t, h[t]);
+      H.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 = (n) => {
+  var s = (a) => {
     try {
-      r(t.next(n));
+      r(t.next(a));
     } catch (d) {
       i(d);
     }
-  }, a = (n) => {
+  }, n = (a) => {
     try {
-      r(t.throw(n));
+      r(t.throw(a));
     } catch (d) {
       i(d);
     }
-  }, r = (n) => n.done ? e(n.value) : Promise.resolve(n.value).then(s, a);
+  }, r = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(s, n);
   r((t = t.apply(l, h)).next());
 });
 import S from "./items.js";
 import * as C from "three";
-import { to as k } from "../../shared-utils/to.js";
+import { to as R } from "../../shared-utils/to.js";
 import { equal as U } from "../../shared-utils/equal.js";
 import { Main as N } from "../Components/Main.js";
 import { formatData as A } from "../utils/formatData.js";
@@ -156,7 +156,7 @@ function Q(l) {
 }
 class li extends G {
   constructor(t, e) {
-    var n, d;
+    var a, 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, 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;
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, n = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, r = B(this.five, this.wrapper, this.floorIndex, n), a = Math.ceil(i * r), d = Math.ceil(s * r);
+      return this.size.width === a && this.size.height === d || (this.container.style.width = a + "px", this.container.style.height = d + "px", this.size = { width: a, height: d }), !0;
     });
     o(this, "highlight", (t) => {
       this.state.config.highlightEnable && (this.highlightData = t, this.render());
@@ -231,19 +231,19 @@ class li extends G {
       this.highlightData = {}, this.render();
     });
     o(this, "_disable", (t) => {
-      var i, s, a;
+      var i, s, n;
       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, (a = this.container) == null || a.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, c.BreakOffByDisable), this.showPromise = void 0, (s = this.app) == null || s.$destroy(), this.app = void 0, (n = this.container) == null || n.remove(), this.removeEventListener();
     });
     o(this, "_enable", (t) => {
       const { userAction: e } = t;
       this.addEventListener(), this.wrapper && (this.wrapper.append(this.container), this.hooks.emit("enable", { userAction: e }), this.state.visible && this._show({ userAction: e }));
     });
     o(this, "_show", (t) => f(this, null, function* () {
-      var a;
+      var n;
       if (!this.state.enabled)
         return;
-      if (!((a = this.fiveUtil.model) != null && a.loaded))
+      if (!((n = this.fiveUtil.model) != null && n.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, n;
+        let r = !1, a;
         this.showRejection = (u) => {
-          r = !0, n = u;
+          r = !0, a = u;
         };
-        const [d] = yield k(V(this.five, this.showState, i.userAction));
+        const [d] = yield R(V(this.five, this.showState, i.userAction));
         if (d)
           throw d;
         if (r)
-          throw n ? new Error(n) : new Error(c.UnknownError);
+          throw a ? new Error(a) : 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, n = i.immediately ? 0 : $;
-        E(this.five, r, n), this.render(n), this.hooks.emit("showAnimationEnded", {
+        const r = i.modelOpacity, a = i.immediately ? 0 : $;
+        E(this.five, r, a), this.render(a), 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 e = this.five.model.bounding.getCenter(new C.Vector3());
-      if (this.showState.offset = e, this.state.enabled === !1 || this.wrapper || !this.selector)
+      const i = this.five.models.find((n) => n.name === this.five.state.workCode).bounding.getCenter(new C.Vector3());
+      if (this.showState.offset = i, this.state.enabled === !1 || this.wrapper || !this.selector)
         return;
-      const i = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
-      if (!i)
+      const s = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
+      if (!s)
         throw new Error("不正确的父容器选择器");
-      this.wrapper = i, i.append(this.container);
+      this.wrapper = s, s.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 = (n = e.i18n) == null ? void 0 : n.call(e, "暂无平面图")) != null ? d : "暂无平面图",
+      text: (d = (a = e.i18n) == null ? void 0 : a.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"]) : {}, a = m(m({}, i.missingFloorConfig), s.missingFloorConfig), r = g(m(m({}, i), s), { missingFloorConfig: a });
+    }, s = e ? F(e, ["selector", "scale"]) : {}, n = m(m({}, i.missingFloorConfig), s.missingFloorConfig), r = g(m(m({}, i), s), { missingFloorConfig: n });
     this.state = { enabled: !0, visible: !1, config: r }, this.panoIndex = t.getCurrentState().panoIndex, this.initContainer(), Y(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
@@ -394,22 +394,22 @@ class li extends G {
       function s(p) {
         return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
-      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();
+      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();
     });
   }
   loadItems(t) {
-    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 { 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 { 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) / a },
+          positionInImage: { x: (p - e.x) / s, y: (i.y - u) / n },
           width: P / s,
-          height: x / a,
+          height: x / n,
           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 a = { userAction: s };
-      t.visible ? this._show(a) : this._hide(a);
+      const n = { userAction: s };
+      t.visible ? this._show(n) : this._hide(n);
     }
   }
   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, 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), s = (i.x + 1) / 2, n = -(i.y - 1) / 2;
+    this.container.style.left = s * 100 + "%", this.container.style.top = n * 100 + "%";
   }
   formatData(t) {
     return 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, 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 });
+    const i = this.state, s = (r = t.config) != null && r.missingFloorConfig ? m(m({}, i.config.missingFloorConfig), t.config.missingFloorConfig) : i.config.missingFloorConfig, n = t.config ? g(m(m({}, i.config), t.config), { missingFloorConfig: s }) : i.config;
+    this.state = g(m(m({}, this.state), t), { config: n }), !U(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *

package/libs/shared-utils/logger.js

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

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.72.4-alpha.1",
+  "version": "3.72.4-alpha.2",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",