aldehyde 0.2.487 → 0.2.489

package/src/aldehyde/draw-canvas-edit/components/render/graphs/circle.ts

@@ -119,7 +119,7 @@ export class Circle extends BaseGraph {
         graph.setAttr('hover', false);
         graph.setAttr('hoverAnchor', false);
         // 进入其他元素区域时离开需要靠它 redraw
-        render.redraw([GraphDraw.name]);
+        render.redraw([GraphDraw.NAME]);
       });
       anchorAndShadow.shape = anchorShape;
     }
@@ -597,7 +597,7 @@ export class Circle extends BaseGraph {
           }
         }
       }
-      render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]); // 重绘
+      render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]); // 重绘
     }
     BaseGraph.adjust(render, graph, graphSnap, adjustShape, anchorAndShadows, startPoint, endPoint, hoverRect);
   }
@@ -671,7 +671,7 @@ export class Circle extends BaseGraph {
     this.group.size({ width: offsetX, height: offsetY });
     Circle.updateAnchorShadows(this.group, this.anchorShadows);
     Circle.updateLinkAnchorShadows(this.group, this.linkAnchorShadows);
-    this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
   }
 
   // 实现：拖动结束
@@ -693,7 +693,7 @@ export class Circle extends BaseGraph {
       // 更新历史
       this.render.updateHistory();
       // 重绘
-      this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+      this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     }
     super.drawEnd();
   }

package/src/aldehyde/draw-canvas-edit/components/render/graphs/curve.ts

@@ -98,7 +98,7 @@ export class Curve extends BaseGraph {
             document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
             graph.setAttr('hover', false);
             graph.setAttr('hoverAnchor', false);
-            render.redraw([GraphDraw.name]);
+            render.redraw([GraphDraw.NAME]);
           });
           anchorAndShadow.shape = anchorShape;
         } else {
@@ -134,7 +134,7 @@ export class Curve extends BaseGraph {
             document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
             graph.setAttr('hover', false);
             graph.setAttr('hoverAnchor', false);
-            render.redraw([GraphDraw.name]);
+            render.redraw([GraphDraw.NAME]);
           });
           anchorAndShadow.shape = anchorShape;
         }
@@ -267,7 +267,7 @@ export class Curve extends BaseGraph {
           }
         }
       }
-      render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+      render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     }
     const allXs = line.points().reduce((arr, item, idx) => {
       if (idx % 2 === 0) arr.push(item);
@@ -362,7 +362,7 @@ export class Curve extends BaseGraph {
     Curve.updateAnchorShadows(this.group, this.anchorShadows, this.line);
     // 更新 图形 的 连接点 的 锚点位置
     Curve.updateLinkAnchorShadows(this.group, this.linkAnchorShadows, this.line);
-    this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
   }
 
   // 实现：拖动结束
@@ -385,7 +385,7 @@ export class Curve extends BaseGraph {
     this.group.size(size);  // 更新大小
     this.render.attractTool.alignLinesClear();      // 对齐线清除
     this.render.updateHistory();     // 更新历史
-    this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     super.drawEnd(size, {
       x: Math.min(...this.line.points().reduce((arr, item, idx) => {
         if (idx % 2 === 0) arr.push(item);

package/src/aldehyde/draw-canvas-edit/components/render/graphs/line.ts

@@ -98,7 +98,7 @@ export class Line extends BaseGraph {
             document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
             graph.setAttr('hover', false);
             graph.setAttr('hoverAnchor', false);
-            render.redraw([GraphDraw.name]);
+            render.redraw([GraphDraw.NAME]);
           });
           anchorAndShadow.shape = anchorShape;
         } else {
@@ -134,7 +134,7 @@ export class Line extends BaseGraph {
             document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
             graph.setAttr('hover', false);
             graph.setAttr('hoverAnchor', false);
-            render.redraw([GraphDraw.name]);
+            render.redraw([GraphDraw.NAME]);
           });
           anchorAndShadow.shape = anchorShape;
         }
@@ -265,7 +265,7 @@ export class Line extends BaseGraph {
           }
         }
       }
-      render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+      render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     }
     BaseGraph.adjust(
       render,
@@ -355,7 +355,7 @@ export class Line extends BaseGraph {
     Line.updateAnchorShadows(this.group, this.anchorShadows, this.line);
     // 更新 图形 的 连接点 的 锚点位置
     Line.updateLinkAnchorShadows(this.group, this.linkAnchorShadows, this.line);
-    this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
   }
 
   // 实现：拖动结束
@@ -378,7 +378,7 @@ export class Line extends BaseGraph {
     this.group.size(size);
     this.render.attractTool.alignLinesClear();
     this.render.updateHistory();
-    this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     super.drawEnd(size, {
       x: Math.min(...this.line.points().reduce((arr, item, idx) => {
         if (idx % 2 === 0) arr.push(item);

package/src/aldehyde/draw-canvas-edit/components/render/graphs/rect.ts

@@ -118,7 +118,7 @@ export class Rect extends BaseGraph {
         document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
         graph.setAttr('hover', false);
         graph.setAttr('hoverAnchor', false);
-        render.redraw([GraphDraw.name]);
+        render.redraw([GraphDraw.NAME]);
       });
       anchorAndShadow.shape = anchorShape;
     }
@@ -590,7 +590,7 @@ export class Rect extends BaseGraph {
           }
         }
       }
-      render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+      render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     }
     BaseGraph.adjust(render, graph, graphSnap, adjustShape, anchorAndShadows, startPoint, endPoint, hoverRect);
   }
@@ -660,7 +660,7 @@ export class Rect extends BaseGraph {
     this.group.size({ width: offsetX, height: offsetY });
     Rect.updateAnchorShadows(this.group, this.anchorShadows);
     Rect.updateLinkAnchorShadows(this.group, this.linkAnchorShadows);
-    this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
   }
 
   // 实现：拖动结束
@@ -674,7 +674,7 @@ export class Rect extends BaseGraph {
       Rect.updateLinkAnchorShadows(this.group, this.linkAnchorShadows);
       this.render.attractTool.alignLinesClear();
       this.render.updateHistory();
-      this.render.redraw([GraphDraw.name, LinkDraw.name, PreviewDraw.name]);
+      this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
     }
     super.drawEnd();
   }

package/src/aldehyde/draw-canvas-edit/components/render/handlers/drag-handlers.ts

@@ -4,6 +4,7 @@ import { Handler, MouseButton } from '../types';
 import { LinkDraw, BgDraw, GraphDraw, RulerDraw, PreviewDraw } from '../draws';
 
 export class DragHandlers implements Handler {
+  static readonly NAME = 'DragHandlers';
   private render: Render;
   constructor(render: Render) {
     this.render = render;
@@ -19,7 +20,7 @@ export class DragHandlers implements Handler {
       mousedown: (e: Konva.KonvaEventObject<GlobalEventHandlersEventMap['mousedown']>) => {
         // 拐点操作中，防止异常拖动
         // 新建图形并拖动中
-        if (!(this.render.draws[LinkDraw.name] as LinkDraw)?.state.linkManualing && !this.render.graphType) {
+        if (!(this.render.draws[LinkDraw.NAME] as LinkDraw)?.state.linkManualing && !this.render.graphType) {
           if (e.evt.button === MouseButton["右键"] || (e.evt.ctrlKey && e.evt.button === MouseButton["左键"])) // mac 拖动画布快捷键
           {
             const stageState = this.render.getStageState();
@@ -53,11 +54,11 @@ export class DragHandlers implements Handler {
             this.render.stage.position({ x: this.mousedownStagePos.x + offsetX, y: this.mousedownStagePos.y + offsetY });
             // 重绘
             this.render.redraw([
-              BgDraw.name,
-              GraphDraw.name,
-              LinkDraw.name,
-              RulerDraw.name,
-              PreviewDraw.name
+              BgDraw.NAME,
+              GraphDraw.NAME,
+              LinkDraw.NAME,
+              RulerDraw.NAME,
+              PreviewDraw.NAME
             ]);
           }
         }

package/src/aldehyde/draw-canvas-edit/components/render/handlers/drag-outside-handlers.ts

@@ -1,76 +1,77 @@
-import Konva from 'konva';
-import { nanoid } from 'nanoid';
-import { Render } from '../index';
-import { Handler, AssetInfoPoint, LinkDrawPoint } from '../types';
-import { RefLineDraw, PreviewDraw } from '../draws';
-
-export class DragOutsideHandlers implements Handler {
-  private render: Render;
-  constructor(render: Render) {
-    this.render = render;
-  }
-  handlers = {
-    dom: {
-      dragenter: (e: GlobalEventHandlersEventMap['dragenter']) => {
-        this.render.stage.setPointersPositions(e);
-        this.render.redraw([RefLineDraw.name]);  // 更新参考线
-      },
-      dragover: (e: GlobalEventHandlersEventMap['dragover']) => {
-        this.render.stage.setPointersPositions(e);
-        this.render.redraw([RefLineDraw.name]);  // 更新参考线
-      },
-      drop: async (e: GlobalEventHandlersEventMap['drop']) => {
-        const componentItem = JSON.parse(e.dataTransfer?.getData('componentItem') || '{}');
-        const defaultValues = JSON.parse(e.dataTransfer?.getData('defaultValues') || '{}');
-        const src = e.dataTransfer?.getData('src');
-        const componentType = e.dataTransfer?.getData('componentType'); // 组件类型
-        const showPoints = e.dataTransfer?.getData('showPoints'); // 是否显示连接点
-        const type = e.dataTransfer?.getData('type') || "other";
-        const stageState = this.render.getStageState();
-        this.render.stage.setPointersPositions(e);
-        const pos = this.render.stage.getPointerPosition();
-        if (!pos) return;
-        const factory = this.render.componentFactory;
-        let group: Konva.Group | null = null;
-        let points: AssetInfoPoint[] = [];
-        if (componentType) { // 指定组件类型
-          const comGroup = await factory.createTypedComponent({ src, type, componentType });
-          group = comGroup.group;
-          points = comGroup.points;
-        } else if (src && type) { // 图片或组合组件
-          if (type === 'json') { // 组合组件
-            const jsonGroup = await factory.createJsonComponent({ src });
-            group = jsonGroup.group;
-          } else { // 图片组件
-            const imgGroup = await factory.createImageComponent({ src, type });
-            group = imgGroup.group;
-            points = imgGroup.points;
-          }
-        }
-        if (group) { // 存在组件，设置连接点等功能
-          this.render.layer.add(group); // 组件添加到画布
-          if (componentItem?.dataSource) { // 组件存在默认数据源，拖拽插入组件时默认设置数据源配置
-            this.render.setAssetSettings(group, { ...this.render.getAssetSettings(group), dataSource: componentItem.dataSource.split('@R@')[0] }, false);
-          }
-          const x = this.render.toStageValue(pos.x - stageState.x) - group.width() / 2;
-          const y = this.render.toStageValue(pos.y - stageState.y) - group.height() / 2;
-          group.setAttrs({ x, y });
-          // 更新坐标记录
-          this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
-          if (Object.keys(defaultValues).length > 0) { // 设置默认值
-            this.render.setAssetSettings(group, { ...this.render.getAssetSettings(group), ...defaultValues }, false);
-          }
-          // 设置连接点
-          this.render.componentFactory.createComponentLinkPoints({ group, points, showPoints });
-          // 组件鼠标移入移出事件
-          this.render.componentFactory.groupMouseenter({ group });
-          this.render.componentFactory.groupMouseleave({ group });
-          // 更新历史
-          this.render.updateHistory();
-          // 重绘
-          this.render.redraw([PreviewDraw.name]);
-        }
-      }
-    }
-  }
-}
+import Konva from 'konva';
+import { nanoid } from 'nanoid';
+import { Render } from '../index';
+import { Handler, AssetInfoPoint, LinkDrawPoint } from '../types';
+import { RefLineDraw, PreviewDraw } from '../draws';
+
+export class DragOutsideHandlers implements Handler {
+  static readonly NAME = 'DragOutsideHandlers';
+  private render: Render;
+  constructor(render: Render) {
+    this.render = render;
+  }
+  handlers = {
+    dom: {
+      dragenter: (e: GlobalEventHandlersEventMap['dragenter']) => {
+        this.render.stage.setPointersPositions(e);
+        this.render.redraw([RefLineDraw.NAME]);  // 更新参考线
+      },
+      dragover: (e: GlobalEventHandlersEventMap['dragover']) => {
+        this.render.stage.setPointersPositions(e);
+        this.render.redraw([RefLineDraw.NAME]);  // 更新参考线
+      },
+      drop: async (e: GlobalEventHandlersEventMap['drop']) => {
+        const componentItem = JSON.parse(e.dataTransfer?.getData('componentItem') || '{}');
+        const defaultValues = JSON.parse(e.dataTransfer?.getData('defaultValues') || '{}');
+        const src = e.dataTransfer?.getData('src');
+        const componentType = e.dataTransfer?.getData('componentType'); // 组件类型
+        const showPoints = e.dataTransfer?.getData('showPoints'); // 是否显示连接点
+        const type = e.dataTransfer?.getData('type') || "other";
+        const stageState = this.render.getStageState();
+        this.render.stage.setPointersPositions(e);
+        const pos = this.render.stage.getPointerPosition();
+        if (!pos) return;
+        const factory = this.render.componentFactory;
+        let group: Konva.Group | null = null;
+        let points: AssetInfoPoint[] = [];
+        if (componentType) { // 指定组件类型
+          const comGroup = await factory.createTypedComponent({ src, type, componentType });
+          group = comGroup.group;
+          points = comGroup.points;
+        } else if (src && type) { // 图片或组合组件
+          if (type === 'json') { // 组合组件
+            const jsonGroup = await factory.createJsonComponent({ src });
+            group = jsonGroup.group;
+          } else { // 图片组件
+            const imgGroup = await factory.createImageComponent({ src, type });
+            group = imgGroup.group;
+            points = imgGroup.points;
+          }
+        }
+        if (group) { // 存在组件，设置连接点等功能
+          this.render.layer.add(group); // 组件添加到画布
+          if (componentItem?.dataSource) { // 组件存在默认数据源，拖拽插入组件时默认设置数据源配置
+            this.render.setAssetSettings(group, { ...this.render.getAssetSettings(group), dataSource: componentItem.dataSource.split('@R@')[0] }, false);
+          }
+          const x = this.render.toStageValue(pos.x - stageState.x) - group.width() / 2;
+          const y = this.render.toStageValue(pos.y - stageState.y) - group.height() / 2;
+          group.setAttrs({ x, y });
+          // 更新坐标记录
+          this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
+          if (Object.keys(defaultValues).length > 0) { // 设置默认值
+            this.render.setAssetSettings(group, { ...this.render.getAssetSettings(group), ...defaultValues }, false);
+          }
+          // 设置连接点
+          this.render.componentFactory.createComponentLinkPoints({ group, points, showPoints });
+          // 组件鼠标移入移出事件
+          this.render.componentFactory.groupMouseenter({ group });
+          this.render.componentFactory.groupMouseleave({ group });
+          // 更新历史
+          this.render.updateHistory();
+          // 重绘
+          this.render.redraw([PreviewDraw.NAME]);
+        }
+      }
+    }
+  }
+}

package/src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts

@@ -5,6 +5,7 @@ import { BaseGraph, Circle, Rect, Line, Bezier, Curve } from '../graphs';
 import { GraphDraw } from '../draws';
 
 export class GraphHandlers implements Handler {
+  static readonly NAME = 'GraphHandlers';
   private render: Render;
   constructor(render: Render) {
     this.render = render;
@@ -104,7 +105,7 @@ export class GraphHandlers implements Handler {
           this.graphing = false; // 调整结束
           this.render.changeGraphType(); // 清空图形类型选择
           this.render.attractTool.alignLinesClear(); // 对齐线清除
-          this.render.redraw([GraphDraw.name]);
+          this.render.redraw([GraphDraw.NAME]);
         }
       }
     }

package/src/aldehyde/draw-canvas-edit/components/render/handlers/key-move-handlers.ts

@@ -5,6 +5,7 @@ import { GraphDraw, LinkDraw, RulerDraw, PreviewDraw } from '../draws';
 
 // 键盘控制组件移动
 export class KeyMoveHandlers implements Handler {
+  static readonly NAME = 'KeyMoveHandlers';
   private render: Render;
   constructor(render: Render) {
     this.render = render;
@@ -32,10 +33,10 @@ export class KeyMoveHandlers implements Handler {
             this.change();
             // 重绘
             this.render.redraw([
-              GraphDraw.name,
-              LinkDraw.name,
-              RulerDraw.name,
-              PreviewDraw.name
+              GraphDraw.NAME,
+              LinkDraw.NAME,
+              RulerDraw.NAME,
+              PreviewDraw.NAME
             ]);
           }
         }

package/src/aldehyde/draw-canvas-edit/components/render/handlers/link-handlers.ts

@@ -5,6 +5,7 @@ import { LinkDraw } from '../draws';
 // 临时连接线
 
 export class LinkHandlers implements Handler {
+  static readonly NAME = 'LinkHandlers';
   private render: Render;
   constructor(render: Render) {
     this.render = render;
@@ -12,14 +13,14 @@ export class LinkHandlers implements Handler {
   handlers = {
     stage: {
       mouseup: () => {
-        const linkDrawState = (this.render.draws[LinkDraw.name] as LinkDraw)?.state;
+        const linkDrawState = (this.render.draws[LinkDraw.NAME] as LinkDraw)?.state;
         if (linkDrawState) {         // 临时 连接线 移除
           linkDrawState.linkingLine?.line.destroy();
           linkDrawState.linkingLine = null;
         }
       },
       mousemove: () => {
-        const linkDrawState = (this.render.draws[LinkDraw.name] as LinkDraw)?.state;
+        const linkDrawState = (this.render.draws[LinkDraw.NAME] as LinkDraw)?.state;
         if (linkDrawState) {
           const pos = this.render.stage.getPointerPosition();
           if (pos) {