@realsee/dnalogel 3.44.5 → 3.45.0

package/libs/Sculpt/index.d.ts

@@ -12,6 +12,7 @@ import { Circle } from './Objects/Circle';
 import { Cylinder } from './Objects/Cylinder';
 import { Box } from './Objects/Box';
 import type { BuiltInData, BuiltInItem, Theme } from './typings';
+import { Line } from './Objects/Line';
 export type { SculptData } from './typings';
 interface Data {
     items: Array<BuiltInData>;
@@ -125,6 +126,10 @@ export declare class Sculpt extends Subscribe<Event> {
      * @description: 开始绘制点
      */
     createPoint(params?: Parameters<Point['create']>[0]): Promise<Point>;
+    /**
+     * @description: 开始绘制线段
+     */
+    createline(params?: Parameters<Line['create']>[0]): Promise<Line>;
     /**
      * @description: 开始绘制空间折线
      */

package/libs/Sculpt/index.js

@@ -1,44 +1,44 @@
-var B = Object.defineProperty, _ = Object.defineProperties;
-var x = Object.getOwnPropertyDescriptors;
+var _ = Object.defineProperty, x = Object.defineProperties;
+var E = Object.getOwnPropertyDescriptors;
 var f = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
-var d = (n, i, e) => i in n ? B(n, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[i] = e, r = (n, i) => {
+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) => {
   for (var e in i || (i = {}))
-    E.call(i, e) && d(n, e, i[e]);
+    L.call(i, e) && d(m, e, i[e]);
   if (f)
     for (var e of f(i))
-      O.call(i, e) && d(n, e, i[e]);
-  return n;
-}, w = (n, i) => _(n, x(i));
-var a = (n, i, e) => (d(n, typeof i != "symbol" ? i + "" : i, e), e);
-var u = (n, i, e) => new Promise((t, o) => {
-  var l = (c) => {
+      O.call(i, e) && d(m, e, i[e]);
+  return m;
+}, w = (m, i) => x(m, E(i));
+var h = (m, i, e) => (d(m, typeof i != "symbol" ? i + "" : i, e), e);
+var c = (m, i, e) => new Promise((t, o) => {
+  var l = (u) => {
     try {
-      m(e.next(c));
+      n(e.next(u));
     } catch (y) {
       o(y);
     }
-  }, s = (c) => {
+  }, s = (u) => {
     try {
-      m(e.throw(c));
+      n(e.throw(u));
     } catch (y) {
       o(y);
     }
-  }, m = (c) => c.done ? t(c.value) : Promise.resolve(c.value).then(l, s);
-  m((e = e.apply(n, i)).next());
+  }, n = (u) => u.done ? t(u.value) : Promise.resolve(u.value).then(l, s);
+  n((e = e.apply(m, i)).next());
 });
 import { globalModules as R } from "./utils/Modules/Global.js";
 import { Subscribe as S } from "../shared-utils/Subscribe.js";
-import { IObject3D as L } from "../shared-utils/three/IObject3D.js";
+import { IObject3D as U } from "../shared-utils/three/IObject3D.js";
 import "three";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
 import "../shared-utils/three/THREESphere.js";
 import "animejs";
-import { notNil as U } from "../shared-utils/isNil.js";
+import { notNil as H } from "../shared-utils/isNil.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import { recurveFindObject as H } from "../shared-utils/three/recurveFindObject.js";
+import { recurveFindObject as M } from "../shared-utils/three/recurveFindObject.js";
 import { Polyline as g } from "./Objects/Polyline/index.js";
 import { Point as P } from "./Objects/Point/index.js";
 import { Polygon as I } from "./Objects/Polygon/index.js";
@@ -47,18 +47,19 @@ import { Rectangle as v } from "./Objects/Rectangle/index.js";
 import { Circle as C } 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 M } from "../shared-utils/forReverseEach.js";
-const p = class extends S {
+import { forReverseEach as k } from "../shared-utils/forReverseEach.js";
+import { Line as B } from "./Objects/Line/index.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 L(), 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");
+    this.five = e, this.theme = t, this.group = new U(), this.group.name = "Sculpt", e.scene.add(this.group), a.modules.init(e), a.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: o }) => {
       var s;
-      const l = H((s = o == null ? void 0 : o[0]) == null ? void 0 : s.object, (m) => m.isSculptObject);
+      const l = M((s = o == null ? void 0 : o[0]) == null ? void 0 : s.object, (n) => n.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 {
@@ -68,7 +69,7 @@ const p = class extends S {
         } catch (t) {
           return console.error(t), null;
         }
-      }).filter(U)
+      }).filter(H)
     };
   }
   get items() {
@@ -81,11 +82,11 @@ const p = class extends S {
     var l;
     this.clear();
     const o = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((s) => {
-      var c;
-      const m = w(r({}, s), {
-        style: r(r({}, (c = this.theme) == null ? void 0 : c[s.type.toLowerCase()]), s.style)
+      var u;
+      const n = w(r({}, s), {
+        style: r(r({}, (u = this.theme) == null ? void 0 : u[s.type.toLowerCase()]), s.style)
       });
-      return s.type === "Point" ? new P(m, t) : s.type === "Polyline" ? new g(m, t) : s.type === "Polygon" ? new I(m, t) : s.type === "Prism" ? new b(m, t) : s.type === "Rectangle" ? new v(m, t) : s.type === "Circle" ? new C(m, t) : s.type === "Cylinder" ? new D(m, t) : s.type === "Box" ? new j(m, t) : null;
+      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;
     });
     this.group.add(...o), this.five.needsRender = !0;
   }
@@ -101,23 +102,32 @@ const p = class extends S {
   putObject(e) {
     var l;
     this.group.add(e);
-    const t = p.modules.object3DHelper, o = t.addObject3DHelper(e);
+    const t = a.modules.object3DHelper, o = t.addObject3DHelper(e);
     return (l = o == null ? void 0 : o.moveController) == null || l.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
    */
   createPoint(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(P, r(r({}, (t = this.theme) == null ? void 0 : t.point), e));
     });
   }
+  /**
+   * @description: 开始绘制线段
+   */
+  createline(e) {
+    return c(this, null, function* () {
+      var t;
+      return this.createItem(B, r(r({}, (t = this.theme) == null ? void 0 : t.line), e));
+    });
+  }
   /**
    * @description: 开始绘制空间折线
    */
   createPolyline(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(g, r(r({}, (t = this.theme) == null ? void 0 : t.polyline), e));
     });
@@ -126,7 +136,7 @@ const p = class extends S {
    * @description: 开始绘制平面多边形
    */
   createPolygon(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(I, r(r({}, (t = this.theme) == null ? void 0 : t.polygon), e));
     });
@@ -135,7 +145,7 @@ const p = class extends S {
    * @description: 开始绘制多棱柱
    */
   createPrism(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(b, r(r({}, (t = this.theme) == null ? void 0 : t.prism), e));
     });
@@ -144,7 +154,7 @@ const p = class extends S {
    * @description: 开始绘制矩形
    */
   createRectangle(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(v, r(r({}, (t = this.theme) == null ? void 0 : t.rectangle), e));
     });
@@ -153,7 +163,7 @@ const p = class extends S {
    * @description: 开始绘制圆形
    */
   createCircle(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(C, r(r({}, (t = this.theme) == null ? void 0 : t.circle), e));
     });
@@ -162,7 +172,7 @@ const p = class extends S {
    * @description: 开始绘制圆柱
    */
   createCylinder(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(D, r(r({}, (t = this.theme) == null ? void 0 : t.cylinder), e));
     });
@@ -171,7 +181,7 @@ const p = class extends S {
    * @description: 开始绘制 Box
    */
   createBox(e) {
-    return u(this, null, function* () {
+    return c(this, null, function* () {
       var t;
       return this.createItem(j, r(r({}, (t = this.theme) == null ? void 0 : t.box), e));
     });
@@ -190,10 +200,10 @@ const p = class extends S {
    * @description: 清空数据
    */
   clear() {
-    M(this.items, (e) => e.delete()), this.five.needsRender = !0;
+    k(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
-    return u(this, null, function* () {
+    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);
@@ -201,10 +211,10 @@ const p = class extends S {
     });
   }
 };
-let h = p;
-a(h, "modules", R);
-const se = (n) => new h(n);
+let p = a;
+h(p, "modules", R);
+const me = (m) => new p(m);
 export {
-  h as Sculpt,
-  se as SculptPlugin
+  p as Sculpt,
+  me as SculptPlugin
 };

package/libs/Sculpt/typings/index.d.ts

@@ -1,8 +1,9 @@
-import type { SimplifyDeep } from './SimplifyDeep';
 import type { PartialDeep } from 'type-fest';
-export type { SimplifyDeep } from './SimplifyDeep';
-import type { Polyline, PolylineImportData } from '../Objects/Polyline';
+import type { SimplifyDeep } from './utils.type';
+export type { SimplifyDeep };
 import type { Point, PointImportData } from '../Objects/Point';
+import type { Line, LineImportData } from '../Objects/Line';
+import type { Polyline, PolylineImportData } from '../Objects/Polyline';
 import type { Polygon, PolygonImportData } from '../Objects/Polygon';
 import type { Prism, PrismImportData } from '../Objects/Prism';
 import type { Rectangle, RectangleImportData } from '../Objects/Rectangle';
@@ -10,6 +11,7 @@ import type { Circle, CircleImportData } from '../Objects/Circle';
 import type { Cylinder, CylinderImportData } from '../Objects/Cylinder';
 import type { Box, BoxImportData } from '../Objects/Box';
 import type { PointStyle } from '../Meshes/Point';
+import type { LineMeshStyle } from '../Meshes/Line';
 import type { PolylineStyle } from '../Meshes/Polyline';
 import type { PrismStyle } from '../Meshes/Prism';
 import type { RectangleWithEdgeMeshStyle as RectangleStyle } from '../Meshes/RectangleWithEdge';
@@ -27,8 +29,9 @@ export declare namespace SculptData {
     type CylinderData = SimplifyDeep<CylinderImportData>;
     type BoxData = SimplifyDeep<BoxImportData>;
 }
-export type { Polyline, PolylineImportData };
 export type { Point, PointImportData };
+export type { Line, LineImportData };
+export type { Polyline, PolylineImportData };
 export type { Polygon, PolygonImportData };
 export type { Prism, PrismImportData };
 export type { Rectangle, RectangleImportData };
@@ -36,6 +39,7 @@ export type { Circle, CircleImportData };
 export type { Cylinder, CylinderImportData };
 export type { Box, BoxImportData };
 export type { PointStyle };
+export type { LineMeshStyle };
 export type { PolylineStyle };
 export type { PrismStyle };
 export type { RectangleStyle };
@@ -43,10 +47,11 @@ export type { CircleStyle };
 export type { CylinderStyle };
 export type { BoxStyle };
 export type { AreaStyle };
-export type BuiltInData = PolylineImportData | PointImportData | PolygonImportData | PrismImportData | RectangleImportData | CircleImportData | CylinderImportData | BoxImportData;
-export type BuiltInItem = Polyline | Point | Polygon | Prism | Rectangle | Circle | Cylinder | Box;
+export type BuiltInData = PolylineImportData | PointImportData | PolygonImportData | PrismImportData | RectangleImportData | CircleImportData | CylinderImportData | BoxImportData | LineImportData;
+export type BuiltInItem = Polyline | Point | Polygon | Prism | Rectangle | Circle | Cylinder | Box | Line;
 export type Theme = PartialDeep<{
     point: PointStyle;
+    line: LineMeshStyle;
     polyline: PolylineStyle;
     polygon: AreaStyle;
     prism: PrismStyle;

package/libs/Sculpt/{utils/color.d.ts → typings/style.d.ts}

@@ -31,6 +31,13 @@ export type LineWidthStyle = {
      */
     lineWidth?: number;
 };
+export type LimitPlaneConfig = {
+    /**
+     * @description 限制折线绘制的平面; `xoz` 限制在水平面; `y` 限制垂直面; `none` 不限制
+     * @default `none`
+     */
+    limit: 'xoz' | 'y' | 'none';
+};
 export type OcclusionStyle = {
     /**
      * @description 是否以一种半透明的方式显示遮挡的部分

package/libs/Sculpt/typings/utils.type.d.ts

@@ -1,6 +1,8 @@
 import type * as THREE from 'three';
 import type { Merge, UnknownArray } from 'type-fest';
+import type { ConditionalSimplifyDeep } from 'type-fest/source/conditional-simplify';
 import type { IsNull, NonRecursiveType } from 'type-fest/source/internal';
+export type SimplifyDeep<T> = ConditionalSimplifyDeep<T, THREE.Color | THREE.Vector3 | Function | Iterable<unknown>, object>;
 export type ImportDataToExportData<T> = Merge<JsonData<T>, {
     id: string | number;
 }>;

package/libs/Sculpt/utils/three/ColoredMesh.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { type ColorStyle, type OpacityStyle, type OcclusionStyle } from '../color';
+import { type ColorStyle, type OpacityStyle, type OcclusionStyle } from '../../typings/style';
 import { IObject3D } from '../../../shared-utils/three/IObject3D';
 export type ColoredMeshStyle = OpacityStyle & ColorStyle & OcclusionStyle;
 export default class ColoredMesh<TGeometry extends THREE.Geometry | THREE.BufferGeometry = THREE.Geometry | THREE.BufferGeometry> extends IObject3D {

package/libs/Sculpt/utils/three/ColoredMesh.js

@@ -11,7 +11,7 @@ var d = (i, t, e) => t in i ? g(i, t, { enumerable: !0, configurable: !0, writab
 };
 var c = (i, t, e) => (d(i, typeof t != "symbol" ? t + "" : t, e), e);
 import * as s from "three";
-import { DEFAULT_COLOR as M } from "../color.js";
+import { DEFAULT_COLOR as M } from "../../typings/style.js";
 import { IObject3D as B } from "../../../shared-utils/three/IObject3D.js";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";

package/libs/Sculpt/utils/three/rayOnLine.d.ts

@@ -1,13 +1,11 @@
 import * as THREE from 'three';
 /**
  * @description: 求射线与线段的交点（交点在线段上）
- * @param {THREE.Vector3} cameraPosition 摄像机位置
- * @param {THREE.Ray} ray 射线
- * @param {THREE.Line3} line 线段
- * @param {boolean} clampToLine 是否限制交点在线段上，默认为true，不限制则可以相交在线段的延长线上
+ * @param {THREE.Raycaster} params.ray 射线
+ * @param {THREE.Line3} params.line 线段
+ * @param {boolean} params.clampToLine `true` 限制交点在线段上, `false` 可以相交在线段的延长线上；默认为`true`
  */
 export declare function rayOnLine(params: {
-    cameraPosition: THREE.Vector3;
     raycaster: THREE.Raycaster;
     line: THREE.Line3;
     clampToLine?: boolean;

package/libs/Sculpt/utils/three/rayOnLine.js

@@ -1,20 +1,21 @@
-import * as e from "three";
-function w(m) {
-  var p;
-  const { cameraPosition: r, raycaster: a, line: n, clampToLine: T = !0 } = m;
-  if (((p = a.camera) == null ? void 0 : p.type) === "OrthographicCamera") {
-    const t = a.ray.origin.clone();
-    return n.closestPointToPoint(t, !1, new e.Vector3());
+import * as t from "three";
+const y = new t.Vector3();
+function O(p) {
+  var d;
+  const { raycaster: e, line: n, clampToLine: m = !0 } = p;
+  if (((d = e.camera) == null ? void 0 : d.type) === "OrthographicCamera") {
+    const o = e.ray.origin.clone();
+    return n.closestPointToPoint(o, !1, new t.Vector3());
   }
-  const s = new e.Plane().setFromNormalAndCoplanarPoint(a.ray.direction.clone().normalize(), r), o = s.projectPoint(n.start, new e.Vector3()), l = s.projectPoint(n.end, new e.Vector3()), P = new e.Line3(o, l), c = P.closestPointToPoint(r, T, new e.Vector3()), d = c.distanceTo(l), u = c.distanceTo(o), i = P.distance();
-  if (d > u && d > i) {
-    const t = -c.distanceTo(o) / i, O = n.start.clone().sub(n.end).normalize();
-    return n.start.sub(O.clone().multiplyScalar(t * n.distance()));
+  const a = new t.Plane().setFromNormalAndCoplanarPoint(e.ray.direction.clone().normalize(), e.ray.origin), r = a.projectPoint(n.start, new t.Vector3()), s = a.projectPoint(n.end, new t.Vector3()), l = new t.Line3(r, s), c = l.closestPointToPoint(e.ray.origin, m, y), P = c.distanceTo(s), T = c.distanceTo(r), i = l.distance();
+  if (P > T && P > i) {
+    const o = -c.distanceTo(r) / i, u = n.start.clone().sub(n.end).normalize();
+    return n.start.sub(u.clone().multiplyScalar(o * n.distance()));
   } else {
-    const t = c.distanceTo(o) / i;
-    return new e.Vector3().lerpVectors(n.start, n.end, t);
+    const o = c.distanceTo(r) / i;
+    return new t.Vector3().lerpVectors(n.start, n.end, o);
   }
 }
 export {
-  w as rayOnLine
+  O as rayOnLine
 };

package/libs/base/BasePlugin.js

@@ -16,7 +16,7 @@ let c = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "3.44.5");
+    e(this, "VERSION", "3.45.0");
     e(this, "NAME");
     e(this, "five");
     e(this, "workUtil");

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -282,10 +282,11 @@ class Jt extends O {
     });
     /** 模型楼层高亮改变时，自动进行楼层切换 */
     o(this, "onModelShownFloorChange", (t) => {
+      var e;
       if (this.floorIndex !== t) {
         if (t === null) {
-          const e = this.five.getCurrentState().panoIndex;
-          this.floorIndex = this.five.work.observers[e].floorIndex;
+          const i = this.five.getCurrentState().panoIndex;
+          this.floorIndex = (e = this.five.work) == null ? void 0 : e.observers[i].floorIndex;
           return;
         }
         this.floorIndex = t, this.updateSize(), this.render();