@realsee/dnalogel 2.19.0-3 → 2.19.1

package/libs/PanoMeasurePlugin/Controller/index.js

@@ -1,28 +1,28 @@
 var y = Object.defineProperty;
 var d = Object.getOwnPropertySymbols;
 var M = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
-var m = (s, e, t) => e in s ? y(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, n = (s, e) => {
+var p = (s, e, t) => e in s ? y(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, n = (s, e) => {
   for (var t in e || (e = {}))
-    M.call(e, t) && m(s, t, e[t]);
+    M.call(e, t) && p(s, t, e[t]);
   if (d)
     for (var t of d(e))
-      P.call(e, t) && m(s, t, e[t]);
+      P.call(e, t) && p(s, t, e[t]);
   return s;
 };
-var i = (s, e, t) => (m(s, typeof e != "symbol" ? e + "" : e, t), t);
+var i = (s, e, t) => (p(s, typeof e != "symbol" ? e + "" : e, t), t);
 import v from "../Modules/Magnifier.js";
 import w from "../Modules/FiveHelper.js";
-import h from "./EditController.js";
+import a from "./EditController.js";
 import f from "./ViewController.js";
 import g from "./WatchController.js";
 import l from "./MixedController.js";
 import { omit as I } from "../../shared-utils/filter.js";
 import { Group as b } from "three";
 import { Model as U } from "../Model/index.js";
-import { Subscribe as k } from "@realsee/five";
-import { getMouseGroup as D } from "../utils/mouseGroup.js";
+import { Subscribe as E } from "@realsee/five";
+import { getMouseGroup as k } from "../utils/mouseGroup.js";
 import { UIController as C } from "../Modules/UIController/index.js";
-import { GuideController as E } from "../Modules/GuideController.js";
+import { GuideController as D } from "../Modules/GuideController.js";
 import { ShortcutKeyController as G } from "./ShortcutKeyController.js";
 import "hammerjs";
 import "../Model/line.js";
@@ -61,10 +61,10 @@ import "../Modules/UIController/style.js";
 import "../Modules/UIController/MainBtnController.js";
 import "../Modules/UIController/mobileMainBtnController.js";
 import "../Modules/UIController/Revoke/index.js";
-class Ee {
+class De {
   constructor(e, t) {
     i(this, "hasOpen", !1);
-    i(this, "hook", new k());
+    i(this, "hook", new E());
     i(this, "magnifier");
     i(this, "five");
     i(this, "model");
@@ -78,7 +78,7 @@ class Ee {
     i(this, "container", document.createElement("div"));
     i(this, "shortcutKeyController");
     i(this, "controller", null);
-    i(this, "getCurrentMode", () => this.controller instanceof h ? "Edit" : this.controller instanceof g ? "Watch" : this.controller instanceof l ? "Mixed" : this.controller instanceof f ? "View" : null);
+    i(this, "getCurrentMode", () => this.controller instanceof a ? "Edit" : this.controller instanceof g ? "Watch" : this.controller instanceof l ? "Mixed" : this.controller instanceof f ? "View" : null);
     /** 变更场景
      * @description 如果从编辑场景改变到观看场景，不会自动保存，默认丢弃所有改动
      */
@@ -90,7 +90,7 @@ class Ee {
       const t = {
         View: f,
         Watch: g,
-        Edit: h,
+        Edit: a,
         Mixed: l
       };
       if (!t[e])
@@ -98,21 +98,21 @@ class Ee {
       const r = this.createControllerParams();
       this.controller = new t[e](r), this.hook.emit("modeChange", e);
     });
-    var o, p, c, u;
-    this.five = e, this.params = t, this.config = I(t, ["openParams", "magnifierParams"]), this.model = new U(this.config), this.fiveHelper = new w(e), this.isMobile = (p = (o = t == null ? void 0 : t.openParams) == null ? void 0 : o.isMobile) != null ? p : !1, this.magnifier = new v(e, (c = t.magnifierParams) != null ? c : { width: 190, height: 190, scale: 2 }), this.group = new b(), this.group.name = "plugin-measure-group", this.container.classList.add("five-plugin-measure-container"), this.container.style.position = "absolute", this.container.style.left = "0", this.container.style.top = "0", this.container.style.pointerEvents = "none", this.container.style.width = "100%", this.container.style.height = "100%", this.container.style.opacity = "0";
+    var o, h, c, u;
+    this.five = e, this.params = t, this.config = I(t, ["openParams", "magnifierParams"]), this.model = new U(this.config), this.fiveHelper = new w(e), this.isMobile = (h = (o = t == null ? void 0 : t.openParams) == null ? void 0 : o.isMobile) != null ? h : !1, this.magnifier = new v(e, (c = t.magnifierParams) != null ? c : { width: 190, height: 190, scale: 2 }), this.group = new b(), this.group.name = "plugin-measure-group", this.container.classList.add("five-plugin-measure-container"), this.container.style.position = "absolute", this.container.style.left = "0", this.container.style.top = "0", this.container.style.pointerEvents = "none", this.container.style.width = "100%", this.container.style.height = "100%", this.container.style.opacity = "0";
     const r = (u = this.params.openParams) != null ? u : {};
     if (this.params.useUIController !== !1) {
-      const a = n({
+      const m = n({
         container: this.container,
         openParams: r
       }, typeof this.params.useUIController == "object" ? this.params.useUIController : {});
-      this.useUIController = new C(this, a);
+      this.useUIController = new C(this, m);
     }
     if (this.params.useGuideController !== !1) {
-      const a = n({
+      const m = n({
         container: this.container
       }, typeof this.params.useGuideController == "object" ? this.params.useGuideController : {});
-      this.useGuideController = new E(this, a);
+      this.useGuideController = new D(this, m);
     }
   }
   appendTo(e) {
@@ -152,7 +152,7 @@ class Ee {
   }
   /** 撤销编辑 */
   revoke() {
-    this.controller instanceof h && this.controller.revoke();
+    this.controller instanceof a && this.controller.revoke();
   }
   removePolyline(e) {
     this.model.removePolyline(e);
@@ -183,10 +183,12 @@ class Ee {
    */
   save(e) {
     var o;
-    if (!(this.controller instanceof h) && !(this.controller instanceof l))
+    if (!(this.controller instanceof a) && !(this.controller instanceof l))
       return this;
-    const t = (o = e == null ? void 0 : e.mode) != null ? o : "View", r = this.controller.polyline;
-    return this.model.addPolyline(r), this.changeMode(t), this;
+    const t = (o = e == null ? void 0 : e.mode) != null ? o : "View";
+    return this.controller.model.polylines.forEach((h) => {
+      this.model.addPolyline(h);
+    }), this.changeMode(t), this;
   }
   /** Mixed 模式才有用，添加起点 */
   addStartPoint() {
@@ -240,11 +242,11 @@ class Ee {
       container: this.container,
       fiveHelper: this.fiveHelper,
       openParams: e,
-      mouseGroup: D(n({}, e.crossHairParameter)),
+      mouseGroup: k(n({}, e.crossHairParameter)),
       userDistanceItemCreator: this.params.userDistanceItemCreator
     };
   }
 }
 export {
-  Ee as default
+  De as default
 };

package/libs/PanoMeasurePlugin/Model/polyline.js

@@ -1,6 +1,6 @@
-var a = Object.defineProperty;
-var m = (r, i, t) => i in r ? a(r, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[i] = t;
-var s = (r, i, t) => (m(r, typeof i != "symbol" ? i + "" : i, t), t);
+var m = Object.defineProperty;
+var a = (r, i, t) => i in r ? m(r, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[i] = t;
+var s = (r, i, t) => (a(r, typeof i != "symbol" ? i + "" : i, t), t);
 import P from "./line.js";
 import g from "./point.js";
 import { uuid as L } from "../../shared-utils/uuid.js";
@@ -12,7 +12,7 @@ import "three";
 import "../utils/distanceDom.js";
 import "../utils/isNDCPointInScreen.js";
 import "../../shared-utils/removeArrayItem.js";
-class R {
+class C {
   constructor(i) {
     s(this, "id", L());
     s(this, "lines", []);
@@ -28,8 +28,8 @@ class R {
       console.error(new Error("不能重复添加线段"));
       return;
     }
-    const t = this.getLastPoint(), l = t && i.findAnotherPoint(t);
-    t ? t && l ? (this.lines.push(i), this.points.push(...i.points), this.hook.emit("lineAdded", i)) : console.error(new Error("传入线段无法与当前折线进行连接")) : (this.lines.push(i), this.points.push(...i.points), this.hook.emit("lineAdded", i));
+    const t = this.getLastPoint(), h = t && i.findAnotherPoint(t);
+    t ? t && h ? (this.lines.push(i), this.points.push(...i.points), this.hook.emit("lineAdded", i)) : console.error(new Error("传入线段无法与当前折线进行连接")) : (this.lines.push(i), this.points.push(...i.points), this.hook.emit("lineAdded", i));
   }
   removeLine(i) {
     if (this.lines.length !== 0) {
@@ -48,7 +48,8 @@ class R {
     return this.lines.slice(-1)[0];
   }
   clear() {
-    this.lines.slice(0, this.lines.length), this.points.slice(0, this.points.length);
+    const i = this.lines.slice();
+    this.lines.slice(0, this.lines.length), this.points.slice(0, this.points.length), i.reduceRight((t, h) => this.hook.emit("lineRemoved", h), void 0);
   }
   /** 是否产生重叠 */
   overlapWith(i) {
@@ -75,27 +76,27 @@ class R {
   }
   fromJson(i) {
     this.clear(), this.id = i.id;
-    const { getPoint: t, getAllPoints: l } = f(), d = i.lines.map((e) => {
-      const [p, u] = e.points, n = t(p), h = t(u);
-      if (!n || !h)
+    const { getPoint: t, getAllPoints: h } = f(), u = i.lines.map((e) => {
+      const [p, d] = e.points, n = t(p), l = t(d);
+      if (!n || !l)
         throw new Error("线上的点不存在");
-      const o = new P(n, h, this.model);
+      const o = new P(n, l, this.model);
       return o.id = e.id, o.text = e.text, o;
-    }), c = l();
-    this.points.push(...c), this.lines.push(...d), this.visiblePanoIndexes = i.visiblePanoIndexes;
+    }), c = h();
+    this.points.push(...c), this.lines.push(...u), this.visiblePanoIndexes = i.visiblePanoIndexes;
     function f() {
       const e = /* @__PURE__ */ new Map();
       function p(n) {
-        const h = e.get(n.id);
-        if (h)
-          return h;
+        const l = e.get(n.id);
+        if (l)
+          return l;
         const o = new g(n.position);
         return o.id = n.id, e.set(n.id, o), o;
       }
-      function u() {
+      function d() {
         return Array.from(e.values());
       }
-      return { getPoint: p, getAllPoints: u };
+      return { getPoint: p, getAllPoints: d };
     }
     return this;
   }
@@ -104,5 +105,5 @@ class R {
   }
 }
 export {
-  R as Polyline
+  C as Polyline
 };

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.19.0-3");
+    e(this, "VERSION", "2.19.1");
     e(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

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

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.19.0-3",
+  "version": "2.19.1",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",