@realsee/dnalogel 3.67.1 → 3.67.3-alpha.1

package/libs/Sculpt/index.d.ts

@@ -13,6 +13,7 @@ import { Cylinder } from './Objects/Cylinder';
 import { Box } from './Objects/Box';
 import type { BuiltInData, BuiltInItem, SculptType } from './typings';
 import { Line } from './Objects/Line';
+import type { MagnifierParameter } from '../shared-utils/three/Magnifier';
 export type { SculptData } from './typings';
 export type { SculptType } from './typings';
 export { createPoint } from './Objects/Point';
@@ -24,6 +25,17 @@ export { createRectangle } from './Objects/Rectangle';
 export { createCircle } from './Objects/Circle';
 export { createCylinder } from './Objects/Cylinder';
 export { createBox } from './Objects/Box';
+/**
+ * Sculpt 配置选项
+ */
+export interface SculptConfig {
+    /**
+     * @description 放大镜配置
+     * 设置为 null 或 false 可禁用放大镜功能
+     * @default { width: 190, height: 190, scale: 2, dragEnabled: true }
+     */
+    magnifier?: MagnifierParameter | null | false;
+}
 interface Data {
     items: Array<BuiltInData>;
 }
@@ -39,6 +51,7 @@ type Event = {
 export declare class Sculpt extends Subscribe<Event> {
     static modules: {
         five: Five;
+        config?: SculptConfig;
         _cursor?: import("./utils/Modules/Cursor").Cursor;
         _pointSelector?: import("../shared-utils").PointSelector;
         _fiveDomEvents?: import("../shared-utils").FiveDomEvents;
@@ -48,7 +61,7 @@ export declare class Sculpt extends Subscribe<Event> {
         readonly pointSelector: import("../shared-utils").PointSelector;
         readonly fiveDomEvents: import("../shared-utils").FiveDomEvents;
         readonly object3DHelper: import("..").Object3DHelperController;
-        init: (five: Five) => void;
+        init: (five: Five, config?: SculptConfig) => void;
     };
     get data(): {
         items: ({
@@ -83,12 +96,6 @@ export declare class Sculpt extends Subscribe<Event> {
             readonly style: {
                 readonly color: number;
                 readonly lineWidth: number;
-                /**
-                 * @description: 点击事件
-                 * @param {MouseEvent} e 鼠标事件
-                 * @param {BuiltInItem} item 点击的物体
-                 * 返回 false 来禁用 Five 默认行为
-                 */
                 readonly lineColor: number;
             };
             readonly id: string;
@@ -115,10 +122,11 @@ export declare class Sculpt extends Subscribe<Event> {
     };
     group: IObject3D;
     theme: SculptType.Theme;
+    config: SculptConfig;
     get items(): BuiltInItem[];
     private five;
     private creatingItem;
-    constructor(five: Five, theme?: SculptType.Theme);
+    constructor(five: Five, theme?: SculptType.Theme, config?: SculptConfig);
     /**
      * @description: 加载数据 展示
      */
@@ -190,4 +198,24 @@ export declare class Sculpt extends Subscribe<Event> {
 /**
  * @description: Sculpt 插件
  */
-export declare const SculptPlugin: (five: Five, theme?: SculptType.Theme) => Sculpt;
+export declare const SculptPlugin: (five: Five, themeOrParams?: Partial<{
+    point: Partial<import("./typings").PointStyle>;
+    line: Partial<import("./typings").LineMeshStyle>;
+    polyline: Partial<import("./typings").LineMeshStyle>;
+    polygon: Partial<import("./typings").AreaStyle>;
+    prism: Partial<import("./typings").PrismStyle>;
+    rectangle: Partial<import("./typings").RectangleStyle>;
+    circle: Partial<import("./typings").CircleStyle>;
+    cylinder: Partial<import("./typings").CircleStyle>;
+    box: Partial<import("./typings").BoxStyle>;
+}> | {
+    theme?: SculptType.Theme;
+    config?: SculptConfig;
+}, config?: SculptConfig) => Sculpt;
+/**
+ * @description: Sculpt 插件 - 适配Five插件系统的版本
+ */
+export declare const SculptPluginForFive: (five: Five, params?: {
+    theme?: SculptType.Theme;
+    config?: SculptConfig;
+}) => Sculpt;

package/libs/Sculpt/index.js

@@ -1,34 +1,34 @@
 var L = Object.defineProperty, B = Object.defineProperties;
-var U = Object.getOwnPropertyDescriptors;
+var E = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
-var _ = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
-var g = (c, i, e) => i in c ? L(c, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[i] = e, a = (c, i) => {
-  for (var e in i || (i = {}))
-    _.call(i, e) && g(c, e, i[e]);
+var S = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
+var p = (o, r, e) => r in o ? L(o, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[r] = e, f = (o, r) => {
+  for (var e in r || (r = {}))
+    S.call(r, e) && p(o, e, r[e]);
   if (y)
-    for (var e of y(i))
-      x.call(i, e) && g(c, e, i[e]);
-  return c;
-}, f = (c, i) => B(c, U(i));
-var h = (c, i, e) => (g(c, typeof i != "symbol" ? i + "" : i, e), e);
-var m = (c, i, e) => new Promise((t, r) => {
-  var l = (s) => {
+    for (var e of y(r))
+      U.call(r, e) && p(o, e, r[e]);
+  return o;
+}, a = (o, r) => B(o, E(r));
+var u = (o, r, e) => (p(o, typeof r != "symbol" ? r + "" : r, e), e);
+var m = (o, r, e) => new Promise((t, i) => {
+  var l = (c) => {
     try {
-      o(e.next(s));
-    } catch (d) {
-      r(d);
+      n(e.next(c));
+    } catch (h) {
+      i(h);
     }
-  }, n = (s) => {
+  }, s = (c) => {
     try {
-      o(e.throw(s));
-    } catch (d) {
-      r(d);
+      n(e.throw(c));
+    } catch (h) {
+      i(h);
     }
-  }, o = (s) => s.done ? t(s.value) : Promise.resolve(s.value).then(l, n);
-  o((e = e.apply(c, i)).next());
+  }, n = (c) => c.done ? t(c.value) : Promise.resolve(c.value).then(l, s);
+  n((e = e.apply(o, r)).next());
 });
-import { globalModules as E } from "./utils/Modules/Global.js";
-import { Subscribe as S } from "../shared-utils/Subscribe.js";
+import { globalModules as _ } from "./utils/Modules/Global.js";
+import { Subscribe as x } from "../shared-utils/Subscribe.js";
 import { IObject3D as z } from "../shared-utils/three/IObject3D.js";
 import "../shared-utils/tag.js";
 import "three";
@@ -44,45 +44,48 @@ import "../vendor/animejs/lib/anime.es.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../shared-utils/five/FivePuppet.js";
-import { recurveFindObject as H } from "../shared-utils/three/recurveFindObject.js";
+import { recurveFindObject as F } from "../shared-utils/three/recurveFindObject.js";
 import { Polyline as I } from "./Objects/Polyline/index.js";
 import { Point as b } from "./Objects/Point/index.js";
 import { Polygon as w } from "./Objects/Polygon/index.js";
 import { Prism as j } from "./Objects/Prism/index.js";
-import { Rectangle as O } from "./Objects/Rectangle/index.js";
-import { Circle as P } from "./Objects/Circle/index.js";
-import { Cylinder as v } from "./Objects/Cylinder/index.js";
-import { Box as C } from "./Objects/Box/index.js";
-import { forReverseEach as M } from "../shared-utils/forReverseEach.js";
-import { Line as R } from "./Objects/Line/index.js";
+import { Rectangle as v } from "./Objects/Rectangle/index.js";
+import { Circle as C } from "./Objects/Circle/index.js";
+import { Cylinder as P } from "./Objects/Cylinder/index.js";
+import { Box as R } from "./Objects/Box/index.js";
+import { forReverseEach as H } from "../shared-utils/forReverseEach.js";
+import { Line as O } from "./Objects/Line/index.js";
 import { hotkeys as D } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { withResolvers as G } from "../shared-utils/promise/withResolvers.js";
-const u = class extends S {
-  constructor(e, t) {
+import { withResolvers as M } from "../shared-utils/promise/withResolvers.js";
+const g = class extends x {
+  constructor(e, t, i) {
     super();
-    h(this, "group");
-    h(this, "theme");
-    h(this, "five");
-    h(this, "creatingItem", null);
+    u(this, "group");
+    u(this, "theme");
+    u(this, "config");
+    u(this, "five");
+    u(this, "creatingItem", null);
     /**
      * @description: 撤销
      */
-    h(this, "undo", () => {
+    u(this, "undo", () => {
       var e;
       console.log("undo"), (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
     });
     /**
      * @description: 重做
      */
-    h(this, "redo", () => {
+    u(this, "redo", () => {
       var e;
       console.log("redo"), (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), u.modules.init(e), D("ctrl+z, command+z", this.undo), D("ctrl+shift+z, command+shift+z", this.redo), u.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: r, origDomEvent: l }) => {
-      var o;
-      const n = H((o = r == null ? void 0 : r[0]) == null ? void 0 : o.object, (s) => s.isSculptObject);
-      return n && !n.editing ? this.emit("click", l, n) : !1;
-    }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = u.modules;
+    this.five = e, this.theme = t, this.config = f({
+      magnifier: { width: 190, height: 190, scale: 2, dragEnabled: !0 }
+    }, i), this.group = new z(), this.group.name = "Sculpt", e.scene.add(this.group), g.modules.init(e, this.config), D("ctrl+z, command+z", this.undo), D("ctrl+shift+z, command+shift+z", this.redo), g.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: l, origDomEvent: s }) => {
+      var c;
+      const n = F((c = l == null ? void 0 : l[0]) == null ? void 0 : c.object, (h) => h.isSculptObject);
+      return n && !n.editing ? this.emit("click", s, n) : !1;
+    }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = g.modules;
   }
   get data() {
     return {
@@ -104,14 +107,14 @@ const u = class extends S {
   load(e, t) {
     var l;
     this.clear();
-    const r = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((n) => {
-      var s;
-      const o = f(a({}, n), {
-        style: a(a({}, (s = this.theme) == null ? void 0 : s[n.type.toLowerCase()]), n.style)
+    const i = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((s) => {
+      var c;
+      const n = a(f({}, s), {
+        style: f(f({}, (c = this.theme) == null ? void 0 : c[s.type.toLowerCase()]), s.style)
       });
-      return n.type === "Point" ? new b(o, t) : n.type === "line" ? new R(o, t) : n.type === "Polyline" ? new I(o, t) : n.type === "Polygon" ? new w(o, t) : n.type === "Prism" ? new j(o, t) : n.type === "Rectangle" ? new O(o, t) : n.type === "Circle" ? new P(o, t) : n.type === "Cylinder" ? new v(o, t) : n.type === "Box" ? new C(o, t) : null;
+      return s.type === "Point" ? new b(n, t) : s.type === "line" ? new O(n, t) : s.type === "Polyline" ? new I(n, t) : s.type === "Polygon" ? new w(n, t) : s.type === "Prism" ? new j(n, t) : s.type === "Rectangle" ? new v(n, t) : s.type === "Circle" ? new C(n, t) : s.type === "Cylinder" ? new P(n, t) : s.type === "Box" ? new R(n, t) : null;
     });
-    this.group.add(...r), this.five.needsRender = !0;
+    this.group.add(...i), this.five.needsRender = !0;
   }
   /**
    * @description: 获取物体实例
@@ -125,16 +128,16 @@ const u = class extends S {
   putObject(e) {
     var l;
     this.group.add(e);
-    const t = u.modules.object3DHelper, r = t.addObject3DHelper(e);
-    return (l = r == null ? void 0 : r.moveController) == null || l.moveByMouse(), t;
+    const t = g.modules.object3DHelper, i = t.addObject3DHelper(e);
+    return (l = i == null ? void 0 : i.moveController) == null || l.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
    */
   createPoint(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.point, e[0]), this.createItem(b, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.point, e[0]), this.createItem(b, ...e);
     });
   }
   /**
@@ -142,8 +145,8 @@ const u = class extends S {
    */
   createLine(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.line, e[0]), this.createItem(R, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.line, e[0]), this.createItem(O, ...e);
     });
   }
   /**
@@ -159,8 +162,8 @@ const u = class extends S {
    */
   createPolyline(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.polyline, e[0]), this.createItem(I, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.polyline, e[0]), this.createItem(I, ...e);
     });
   }
   /**
@@ -168,8 +171,8 @@ const u = class extends S {
    */
   createPolygon(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.polygon, e[0]), this.createItem(w, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.polygon, e[0]), this.createItem(w, ...e);
     });
   }
   /**
@@ -177,8 +180,8 @@ const u = class extends S {
    */
   createPrism(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.prism, e[0]), this.createItem(j, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.prism, e[0]), this.createItem(j, ...e);
     });
   }
   /**
@@ -186,8 +189,8 @@ const u = class extends S {
    */
   createRectangle(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.rectangle, e[0]), this.createItem(O, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.rectangle, e[0]), this.createItem(v, ...e);
     });
   }
   /**
@@ -195,8 +198,8 @@ const u = class extends S {
    */
   createCircle(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.circle, e[0]), this.createItem(P, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.circle, e[0]), this.createItem(C, ...e);
     });
   }
   /**
@@ -204,8 +207,8 @@ const u = class extends S {
    */
   createCylinder(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.cylinder, e[0]), this.createItem(v, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.cylinder, e[0]), this.createItem(P, ...e);
     });
   }
   /**
@@ -213,8 +216,8 @@ const u = class extends S {
    */
   createBox(...e) {
     return m(this, null, function* () {
-      var t, r;
-      return Object.assign((t = e[0]) != null ? t : {}, (r = this.theme) == null ? void 0 : r.box, e[0]), this.createItem(C, ...e);
+      var t, i;
+      return Object.assign((t = e[0]) != null ? t : {}, (i = this.theme) == null ? void 0 : i.box, e[0]), this.createItem(R, ...e);
     });
   }
   canUndo() {
@@ -229,24 +232,31 @@ const u = class extends S {
    * @description: 清空数据
    */
   clear() {
-    M(this.items, (e) => e.delete()), this.five.needsRender = !0;
+    H(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
     return m(this, null, function* () {
       this.creatingItem && (this.creatingItem.stopCreating(), this.creatingItem = null);
-      const r = new e();
-      this.creatingItem = r, this.group.add(r);
-      const { promise: l, resolve: n, reject: o } = G();
-      return yield r.create(...t).then((...s) => (this.creatingItem = null, n(r), s)).catch((s) => {
-        o(s), this.group.remove(r);
+      const i = new e();
+      this.creatingItem = i, this.group.add(i);
+      const { promise: l, resolve: s, reject: n } = M();
+      return yield i.create(...t).then((...c) => (this.creatingItem = null, s(i), c)).catch((c) => {
+        n(c), this.group.remove(i);
       }), l;
     });
   }
 };
-let p = u;
-h(p, "modules", E);
-const fe = (c, i) => new p(c, i);
+let d = g;
+u(d, "modules", _);
+const ae = (o, r, e) => {
+  if (r && typeof r == "object" && ("theme" in r || "config" in r)) {
+    const t = r;
+    return new d(o, t.theme, t.config);
+  }
+  return new d(o, r, e);
+}, Ie = (o, r) => new d(o, r == null ? void 0 : r.theme, r == null ? void 0 : r.config);
 export {
-  p as Sculpt,
-  fe as SculptPlugin
+  d as Sculpt,
+  ae as SculptPlugin,
+  Ie as SculptPluginForFive
 };

package/libs/Sculpt/utils/Modules/Global.d.ts

@@ -3,8 +3,10 @@ import { Cursor } from './Cursor';
 import { Object3DHelperController } from '../../../Object3DHelperPlugin';
 import { FiveDomEvents } from '../../../shared-utils/five/FiveDomEvents';
 import { PointSelector } from '../../../shared-utils/three/PointSelector';
+import type { SculptConfig } from '../..';
 declare class GlobalModules {
     five: Five;
+    config?: SculptConfig;
     _cursor?: Cursor;
     _pointSelector?: PointSelector;
     _fiveDomEvents?: FiveDomEvents;
@@ -14,7 +16,7 @@ declare class GlobalModules {
     get pointSelector(): PointSelector;
     get fiveDomEvents(): FiveDomEvents;
     get object3DHelper(): Object3DHelperController;
-    init: (five: Five) => void;
+    init: (five: Five, config?: SculptConfig) => void;
 }
 declare const globalModules: GlobalModules;
 export { globalModules };

package/libs/Sculpt/utils/Modules/Global.js

@@ -1,45 +1,53 @@
-var r = Object.defineProperty;
-var n = (i, e, o) => e in i ? r(i, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : i[e] = o;
-var t = (i, e, o) => (n(i, typeof e != "symbol" ? e + "" : e, o), o);
-import { Cursor as s } from "./Cursor.js";
-import { Object3DHelperController as l } from "../../../Object3DHelperPlugin/Controller.js";
-import { FiveDomEvents as h } from "../../../shared-utils/five/FiveDomEvents.js";
+var n = Object.defineProperty;
+var s = (o, e, t) => e in o ? n(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
+var i = (o, e, t) => (s(o, typeof e != "symbol" ? e + "" : e, t), t);
+import { Cursor as l } from "./Cursor.js";
+import { Object3DHelperController as h } from "../../../Object3DHelperPlugin/Controller.js";
+import { FiveDomEvents as f } from "../../../shared-utils/five/FiveDomEvents.js";
 import { PointSelector as c } from "../../../shared-utils/three/PointSelector/index.js";
-class f {
+class v {
   constructor() {
-    t(this, "five");
-    t(this, "_cursor");
-    t(this, "_pointSelector");
-    t(this, "_fiveDomEvents");
-    t(this, "_object3DHelper");
-    t(this, "inited", !1);
-    t(this, "init", (e) => {
-      this.inited = !0, this.five = e, this._cursor = void 0, this._pointSelector = void 0, this._fiveDomEvents = void 0, this._object3DHelper = void 0;
+    i(this, "five");
+    i(this, "config");
+    i(this, "_cursor");
+    i(this, "_pointSelector");
+    i(this, "_fiveDomEvents");
+    i(this, "_object3DHelper");
+    i(this, "inited", !1);
+    i(this, "init", (e, t) => {
+      this.inited = !0, this.five = e, this.config = t, this._cursor = void 0, this._pointSelector = void 0, this._fiveDomEvents = void 0, this._object3DHelper = void 0;
     });
   }
   get cursor() {
     if (!this.inited)
       throw new Error("Global not inited");
-    return this._cursor ? this._cursor : (this._cursor = new s(this.five.getElement()), this._cursor);
+    return this._cursor ? this._cursor : (this._cursor = new l(this.five.getElement()), this._cursor);
   }
   get pointSelector() {
+    var r;
     if (!this.inited)
       throw new Error("Global not inited");
-    return this._pointSelector ? this._pointSelector : (this._pointSelector = new c(this.five, { mode: "cursor" }), this._pointSelector);
+    if (this._pointSelector)
+      return this._pointSelector;
+    const e = (r = this.config) == null ? void 0 : r.magnifier, t = e === null || e === !1 ? { magnifier: null } : { magnifierParams: e };
+    return this._pointSelector = new c(this.five, {
+      mode: "cursor",
+      helper: t
+    }), this._pointSelector;
   }
   get fiveDomEvents() {
     if (!this.inited)
       throw new Error("Global not inited");
-    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new h(this.five, { noEmitWhenNotInScene: !0 }), this._fiveDomEvents);
+    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new f(this.five, { noEmitWhenNotInScene: !0 }), this._fiveDomEvents);
   }
   get object3DHelper() {
     if (!this.inited)
       throw new Error("Global not inited");
-    return this._object3DHelper ? this._object3DHelper : (this._object3DHelper = new l(this.five), this._object3DHelper);
+    return this._object3DHelper ? this._object3DHelper : (this._object3DHelper = new h(this.five), this._object3DHelper);
   }
 }
-const v = new f();
-window.globalModules = v;
+const m = new v();
+window.globalModules = m;
 export {
-  v as globalModules
+  m as globalModules
 };

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let F = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.67.1");
+    i(this, "VERSION", "3.67.3-alpha.1");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");