@realsee/dnalogel 3.48.0 → 3.48.1

package/libs/Sculpt/Objects/Rectangle/index.js

@@ -1,47 +1,44 @@
-var U = Object.defineProperty, k = Object.defineProperties;
-var B = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, B = Object.defineProperties;
+var I = Object.getOwnPropertyDescriptors;
 var A = Object.getOwnPropertySymbols;
-var I = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
+var _ = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
 var E = (s, t, e) => t in s ? U(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, d = (s, t) => {
   for (var e in t || (t = {}))
-    I.call(t, e) && E(s, e, t[e]);
+    _.call(t, e) && E(s, e, t[e]);
   if (A)
     for (var e of A(t))
-      _.call(t, e) && E(s, e, t[e]);
+      j.call(t, e) && E(s, e, t[e]);
   return s;
-}, u = (s, t) => k(s, B(t));
+}, u = (s, t) => B(s, I(t));
 var L = (s, t, e) => (E(s, typeof t != "symbol" ? t + "" : t, e), e);
 var D = (s, t, e) => new Promise((c, p) => {
   var a = (l) => {
     try {
-      g(e.next(l));
+      m(e.next(l));
     } catch (h) {
       p(h);
     }
-  }, m = (l) => {
+  }, g = (l) => {
     try {
-      g(e.throw(l));
+      m(e.throw(l));
     } catch (h) {
       p(h);
     }
-  }, g = (l) => l.done ? c(l.value) : Promise.resolve(l.value).then(a, m);
-  g((e = e.apply(s, t)).next());
+  }, m = (l) => l.done ? c(l.value) : Promise.resolve(l.value).then(a, g);
+  m((e = e.apply(s, t)).next());
 });
-import { hotkeys as j } from "../../../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { BaseObject as q } from "../Base/index.js";
+import { BaseObject as k } from "../Base/index.js";
 import * as o from "three";
 import { PolylineWithDotsMesh as M } from "../../Meshes/Polyline.js";
-import { RectangleEditor as G } from "./Editor.js";
+import { RectangleEditor as q } from "./Editor.js";
 import { RectangleWithEdgeMesh as H } from "../../Meshes/RectangleWithEdge.js";
 const P = new o.Vector3();
-class S extends q {
+class Z extends k {
   constructor(e, c) {
     super(e, c);
     L(this, "type", "Rectangle");
     L(this, "rectangleMesh");
-    this.config.canEdit && (this.editor = new G(this)), e && (this.rectangleMesh = new H(d(d({}, e.style), e)), this.add(this.rectangleMesh)), j("esc", () => {
-      this.stopCreating();
-    });
+    this.config.canEdit && (this.editor = new q(this)), e && (this.rectangleMesh = new H(d(d({}, e.style), e)), this.add(this.rectangleMesh));
   }
   get data() {
     return u(d({}, this.baseData), {
@@ -65,23 +62,23 @@ class S extends q {
     return D(this, null, function* () {
       this.removeChildren();
       const c = new H(e);
-      this.rectangleMesh = c, this.add(this.rectangleMesh), yield J(this.rectangleMesh, this.pointSelector, e);
+      this.rectangleMesh = c, this.add(this.rectangleMesh), yield G(this.rectangleMesh, this.pointSelector, e);
     });
   }
 }
-function J(s, t, e) {
+function G(s, t, e) {
   return new Promise((c, p) => {
     var N, T;
     const a = s.parent;
     if (!a)
       return p(new Error("No container"));
-    const m = (N = e == null ? void 0 : e.limit) != null ? N : "none", g = (T = e == null ? void 0 : e.drawMethod) != null ? T : "diagonal", l = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !0 })), h = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !1 })), y = new M(u(d({}, s.style), { dashed: !1, lengthEnable: !1 }));
+    const g = (N = e == null ? void 0 : e.limit) != null ? N : "none", m = (T = e == null ? void 0 : e.drawMethod) != null ? T : "diagonal", l = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !0 })), h = new M(u(d({}, s.style), { dashed: !0, lengthEnable: !1 })), y = new M(u(d({}, s.style), { dashed: !1, lengthEnable: !1 }));
     a.add(l, y, h), t.enable();
     const n = [];
     let i = new o.Vector3(), v = new o.Vector3();
-    const f = new o.Plane(), C = () => {
-      n.push(i.clone()), n.length === 1 ? (m === "xoz" && f.setFromNormalAndCoplanarPoint(new o.Vector3(0, 1, 0), n[0]), m === "none" && f.setFromNormalAndCoplanarPoint(v, n[0])) : n.length === 2 ? m === "y" ? (V(), c()) : y.setPoints([n[0], n[1]]) : n.length === 3 && (V(), c());
-    }, x = (r) => {
+    const w = new o.Plane(), x = () => {
+      n.push(i.clone()), n.length === 1 ? (g === "xoz" && w.setFromNormalAndCoplanarPoint(new o.Vector3(0, 1, 0), n[0]), g === "none" && w.setFromNormalAndCoplanarPoint(v, n[0])) : n.length === 2 ? g === "y" ? (V(), c()) : y.setPoints([n[0], n[1]]) : n.length === 3 && (V(), c());
+    }, C = (r) => {
       var W;
       if (!(r != null && r.raycaster))
         return;
@@ -90,36 +87,36 @@ function J(s, t, e) {
         i = r.point.clone(), v = r.face.normal;
         return;
       }
-      if (n.length === 1 && m === "y") {
-        const w = new o.Line3(new o.Vector3(0, 1, 0).add(n[0]), new o.Vector3(0, -1, 0).add(n[0])).closestPointToPoint(r.point, !1, new o.Vector3());
-        s.setPoints([n[0], w, r.point]);
+      if (n.length === 1 && g === "y") {
+        const f = new o.Line3(new o.Vector3(0, 1, 0).add(n[0]), new o.Vector3(0, -1, 0).add(n[0])).closestPointToPoint(r.point, !1, new o.Vector3());
+        s.setPoints([n[0], f, r.point]);
         return;
       }
       if (n.length === 1) {
-        f ? (i = r.raycaster.ray.intersectPlane(f, P), h.setPoints([i, r.point])) : i = r.point.clone(), l.setPoints([O, i]);
+        w ? (i = r.raycaster.ray.intersectPlane(w, P), h.setPoints([i, r.point])) : i = r.point.clone(), l.setPoints([O, i]);
         return;
       }
       if (n.length === 2) {
         a.remove(l);
-        const z = r.raycaster.ray.intersectPlane(f, P);
-        if (g === "diagonal") {
-          const w = n[0].distanceTo(n[1]) / 2, b = new o.Vector3().lerpVectors(n[0], n[1], 0.5), F = new o.Vector3().subVectors(z, b).normalize();
-          i = new o.Vector3().addVectors(b, F.multiplyScalar(w)), s.setPoints([n[0], i, n[1]]);
-        } else if (g === "vertex") {
-          const w = P.crossVectors(n[0].clone().sub(n[1]), f.normal).normalize();
-          i = new o.Line3(n[1].clone().add(w), n[1].clone().sub(w)).closestPointToPoint(r.point, !1, P), s.setPoints([n[0], n[1], i]);
+        const z = r.raycaster.ray.intersectPlane(w, P);
+        if (m === "diagonal") {
+          const f = n[0].distanceTo(n[1]) / 2, b = new o.Vector3().lerpVectors(n[0], n[1], 0.5), F = new o.Vector3().subVectors(z, b).normalize();
+          i = new o.Vector3().addVectors(b, F.multiplyScalar(f)), s.setPoints([n[0], i, n[1]]);
+        } else if (m === "vertex") {
+          const f = P.crossVectors(n[0].clone().sub(n[1]), w.normal).normalize();
+          i = new o.Line3(n[1].clone().add(f), n[1].clone().sub(f)).closestPointToPoint(r.point, !1, P), s.setPoints([n[0], n[1], i]);
         }
         return;
       }
     }, V = () => {
-      t.off("select", C), t.off("intersectionUpdate", x), t.off("disable", R), t.disable(), a == null || a.remove(l, y, h);
+      t.off("select", x), t.off("intersectionUpdate", C), t.off("disable", R), t.disable(), a == null || a.remove(l, y, h);
     }, R = () => {
       V(), a == null || a.remove(s), p(new Error("Cancelled"));
     };
-    t.on("select", C), t.on("intersectionUpdate", x), t.on("disable", R);
+    t.on("select", x), t.on("intersectionUpdate", C), t.on("disable", R);
   });
 }
 export {
-  S as Rectangle,
-  J as createRectangle
+  Z as Rectangle,
+  G as createRectangle
 };

package/libs/Sculpt/index.d.ts

@@ -109,6 +109,7 @@ export declare class Sculpt extends Subscribe<Event> {
     get items(): BuiltInItem[];
     private five;
     private theme;
+    private creatingItem;
     constructor(five: Five, theme?: Theme);
     /**
      * @description: 加载数据 展示
@@ -158,14 +159,16 @@ export declare class Sculpt extends Subscribe<Event> {
      * @description: 开始绘制 Box
      */
     createBox(params?: Parameters<Box['create']>[0]): Promise<Box>;
+    canUndo(): false | void;
+    canRedo(): false | void;
     /**
      * @description: 撤销
      */
-    undo(): void;
+    undo: () => void;
     /**
      * @description: 重做
      */
-    redo(): void;
+    redo: () => void;
     /**
      * @description: 清空数据
      */

package/libs/Sculpt/index.js

@@ -1,35 +1,35 @@
-var _ = Object.defineProperty, x = Object.defineProperties;
-var E = Object.getOwnPropertyDescriptors;
-var f = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
-var d = (m, i, e) => i in m ? _(m, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[i] = e, r = (m, i) => {
+var U = Object.defineProperty, _ = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
+var g = Object.getOwnPropertySymbols;
+var E = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
+var f = (m, i, e) => i in m ? U(m, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[i] = e, r = (m, i) => {
   for (var e in i || (i = {}))
-    L.call(i, e) && d(m, e, i[e]);
-  if (f)
-    for (var e of f(i))
-      O.call(i, e) && d(m, e, i[e]);
+    E.call(i, e) && f(m, e, i[e]);
+  if (g)
+    for (var e of g(i))
+      L.call(i, e) && f(m, e, i[e]);
   return m;
-}, w = (m, i) => x(m, E(i));
-var a = (m, i, e) => (d(m, typeof i != "symbol" ? i + "" : i, e), e);
-var c = (m, i, e) => new Promise((t, o) => {
+}, I = (m, i) => _(m, x(i));
+var h = (m, i, e) => (f(m, typeof i != "symbol" ? i + "" : i, e), e);
+var c = (m, i, e) => new Promise((t, n) => {
   var l = (u) => {
     try {
-      n(e.next(u));
+      o(e.next(u));
     } catch (y) {
-      o(y);
+      n(y);
     }
   }, s = (u) => {
     try {
-      n(e.throw(u));
+      o(e.throw(u));
     } catch (y) {
-      o(y);
+      n(y);
     }
-  }, n = (u) => u.done ? t(u.value) : Promise.resolve(u.value).then(l, s);
-  n((e = e.apply(m, i)).next());
+  }, o = (u) => u.done ? t(u.value) : Promise.resolve(u.value).then(l, s);
+  o((e = e.apply(m, i)).next());
 });
-import { globalModules as R } from "./utils/Modules/Global.js";
+import { globalModules as O } from "./utils/Modules/Global.js";
 import { Subscribe as S } from "../shared-utils/Subscribe.js";
-import { IObject3D as U } from "../shared-utils/three/IObject3D.js";
+import { IObject3D as z } from "../shared-utils/three/IObject3D.js";
 import "three";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -37,30 +37,46 @@ import "@realsee/five/line";
 import "../shared-utils/tag.js";
 import "../shared-utils/three/THREESphere.js";
 import "animejs";
-import { notNil as H } from "../shared-utils/isNil.js";
+import { notNil as k } from "../shared-utils/isNil.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import { recurveFindObject as M } from "../shared-utils/three/recurveFindObject.js";
-import { Polyline as g } from "./Objects/Polyline/index.js";
+import { recurveFindObject as H } from "../shared-utils/three/recurveFindObject.js";
+import { Polyline as w } from "./Objects/Polyline/index.js";
 import { Point as P } from "./Objects/Point/index.js";
-import { Polygon as I } from "./Objects/Polygon/index.js";
-import { Prism as b } from "./Objects/Prism/index.js";
-import { Rectangle as v } from "./Objects/Rectangle/index.js";
-import { Circle as C } from "./Objects/Circle/index.js";
+import { Polygon as b } from "./Objects/Polygon/index.js";
+import { Prism as v } from "./Objects/Prism/index.js";
+import { Rectangle as C } from "./Objects/Rectangle/index.js";
+import { Circle as R } from "./Objects/Circle/index.js";
 import { Cylinder as D } from "./Objects/Cylinder/index.js";
 import { Box as j } from "./Objects/Box/index.js";
-import { forReverseEach as k } from "../shared-utils/forReverseEach.js";
+import { forReverseEach as M } from "../shared-utils/forReverseEach.js";
 import { Line as B } from "./Objects/Line/index.js";
-const p = class extends S {
+import { hotkeys as p } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+const a = class extends S {
   constructor(e, t) {
     super();
-    a(this, "group");
-    a(this, "five");
-    a(this, "theme");
-    this.five = e, this.theme = t, this.group = new U(), this.group.name = "Sculpt", e.scene.add(this.group), p.modules.init(e), p.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: o }) => {
+    h(this, "group");
+    h(this, "five");
+    h(this, "theme");
+    h(this, "creatingItem", null);
+    /**
+     * @description: 撤销
+     */
+    h(this, "undo", () => {
+      var e;
+      (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
+    });
+    /**
+     * @description: 重做
+     */
+    h(this, "redo", () => {
+      var e;
+      (e = this.creatingItem) == null || e.redo(), this.five.needsRender = !0;
+    });
+    this.five = e, this.theme = t, this.group = new z(), this.group.name = "Sculpt", e.scene.add(this.group), a.modules.init(e), p.unbind("ctrl+z", this.undo), p.unbind("ctrl+shift+z", this.redo), p("ctrl+z", this.undo), p("ctrl+shift+z", this.redo), a.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: n }) => {
       var s;
-      const l = M((s = o == null ? void 0 : o[0]) == null ? void 0 : s.object, (n) => n.isSculptObject);
+      const l = H((s = n == null ? void 0 : n[0]) == null ? void 0 : s.object, (o) => o.isSculptObject);
       return l ? this.emit("click", l) : !1;
-    }), window.__SCLUPT_DEBUG__ = this, window.__SCLUPT_MODULES_DEBUG__ = p.modules;
+    }), window.__SCLUPT_DEBUG__ = this, window.__SCLUPT_MODULES_DEBUG__ = a.modules;
   }
   get data() {
     return {
@@ -70,7 +86,7 @@ const p = class extends S {
         } catch (t) {
           return console.error(t), null;
         }
-      }).filter(H)
+      }).filter(k)
     };
   }
   get items() {
@@ -82,14 +98,14 @@ const p = class extends S {
   load(e, t) {
     var l;
     this.clear();
-    const o = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((s) => {
+    const n = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((s) => {
       var u;
-      const n = w(r({}, s), {
+      const o = I(r({}, s), {
         style: r(r({}, (u = this.theme) == null ? void 0 : u[s.type.toLowerCase()]), s.style)
       });
-      return s.type === "Point" ? new P(n, t) : s.type === "line" ? new B(n, t) : s.type === "Polyline" ? new g(n, t) : s.type === "Polygon" ? new I(n, t) : s.type === "Prism" ? new b(n, t) : s.type === "Rectangle" ? new v(n, t) : s.type === "Circle" ? new C(n, t) : s.type === "Cylinder" ? new D(n, t) : s.type === "Box" ? new j(n, t) : null;
+      return s.type === "Point" ? new P(o, t) : s.type === "line" ? new B(o, t) : s.type === "Polyline" ? new w(o, t) : s.type === "Polygon" ? new b(o, t) : s.type === "Prism" ? new v(o, t) : s.type === "Rectangle" ? new C(o, t) : s.type === "Circle" ? new R(o, t) : s.type === "Cylinder" ? new D(o, t) : s.type === "Box" ? new j(o, t) : null;
     });
-    this.group.add(...o), this.five.needsRender = !0;
+    this.group.add(...n), this.five.needsRender = !0;
   }
   /**
    * @description: 获取物体实例
@@ -103,8 +119,8 @@ const p = class extends S {
   putObject(e) {
     var l;
     this.group.add(e);
-    const t = p.modules.object3DHelper, o = t.addObject3DHelper(e);
-    return (l = o == null ? void 0 : o.moveController) == null || l.moveByMouse(), t;
+    const t = a.modules.object3DHelper, n = t.addObject3DHelper(e);
+    return (l = n == null ? void 0 : n.moveController) == null || l.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
@@ -130,7 +146,7 @@ const p = class extends S {
   createPolyline(e) {
     return c(this, null, function* () {
       var t;
-      return this.createItem(g, r(r({}, (t = this.theme) == null ? void 0 : t.polyline), e));
+      return this.createItem(w, r(r({}, (t = this.theme) == null ? void 0 : t.polyline), e));
     });
   }
   /**
@@ -139,7 +155,7 @@ const p = class extends S {
   createPolygon(e) {
     return c(this, null, function* () {
       var t;
-      return this.createItem(I, r(r({}, (t = this.theme) == null ? void 0 : t.polygon), e));
+      return this.createItem(b, r(r({}, (t = this.theme) == null ? void 0 : t.polygon), e));
     });
   }
   /**
@@ -148,7 +164,7 @@ const p = class extends S {
   createPrism(e) {
     return c(this, null, function* () {
       var t;
-      return this.createItem(b, r(r({}, (t = this.theme) == null ? void 0 : t.prism), e));
+      return this.createItem(v, r(r({}, (t = this.theme) == null ? void 0 : t.prism), e));
     });
   }
   /**
@@ -157,7 +173,7 @@ const p = class extends S {
   createRectangle(e) {
     return c(this, null, function* () {
       var t;
-      return this.createItem(v, r(r({}, (t = this.theme) == null ? void 0 : t.rectangle), e));
+      return this.createItem(C, r(r({}, (t = this.theme) == null ? void 0 : t.rectangle), e));
     });
   }
   /**
@@ -166,7 +182,7 @@ const p = class extends S {
   createCircle(e) {
     return c(this, null, function* () {
       var t;
-      return this.createItem(C, r(r({}, (t = this.theme) == null ? void 0 : t.circle), e));
+      return this.createItem(R, r(r({}, (t = this.theme) == null ? void 0 : t.circle), e));
     });
   }
   /**
@@ -187,35 +203,34 @@ const p = class extends S {
       return this.createItem(j, r(r({}, (t = this.theme) == null ? void 0 : t.box), e));
     });
   }
-  /**
-   * @description: 撤销
-   */
-  undo() {
+  canUndo() {
+    var e;
+    return this.creatingItem ? (e = this.creatingItem) == null ? void 0 : e.canUndo() : !1;
   }
-  /**
-   * @description: 重做
-   */
-  redo() {
+  canRedo() {
+    var e;
+    return this.creatingItem ? (e = this.creatingItem) == null ? void 0 : e.canRedo() : !1;
   }
   /**
    * @description: 清空数据
    */
   clear() {
-    k(this.items, (e) => e.delete()), this.five.needsRender = !0;
+    M(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
     return c(this, null, function* () {
-      const o = new e();
-      return this.group.add(o), yield o.create(...t).catch((l) => {
-        console.error(l), this.group.remove(o);
-      }), o;
+      this.creatingItem && (this.creatingItem.stopCreating(), this.creatingItem = null);
+      const n = new e();
+      return this.creatingItem = n, this.group.add(n), yield n.create(...t).then((...l) => (this.creatingItem = null, l)).catch((l) => {
+        console.error(l), this.group.remove(n);
+      }), n;
     });
   }
 };
-let h = p;
-a(h, "modules", R);
-const le = (m) => new h(m);
+let d = a;
+h(d, "modules", O);
+const ue = (m) => new d(m);
 export {
-  h as Sculpt,
-  le as SculptPlugin
+  d as Sculpt,
+  ue as SculptPlugin
 };

package/libs/base/BasePlugin.js

@@ -17,7 +17,7 @@ let x = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.48.0");
+    i(this, "VERSION", "3.48.1");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");