npm - @next-bricks/diagram - Versions diffs - 0.56.1 → 0.57.0 - Mend

@next-bricks/diagram 0.56.1 → 0.57.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/dist/manifest.json CHANGED Viewed

@@ -3,6 +3,170 @@
   "package": "@next-bricks/diagram",
   "name": "diagram",
   "bricks": [
+    {
+      "name": "diagram.editable-label",
+      "properties": [
+        {
+          "name": "label",
+          "type": "string"
+        },
+        {
+          "name": "type",
+          "type": "LabelType"
+        },
+        {
+          "name": "readOnly",
+          "type": "boolean"
+        }
+      ],
+      "events": [
+        {
+          "name": "label.editing.change",
+          "detail": {
+            "type": "boolean"
+          }
+        },
+        {
+          "name": "label.change",
+          "detail": {
+            "type": "string"
+          }
+        }
+      ],
+      "slots": [],
+      "methods": [
+        {
+          "name": "enableEditing",
+          "params": []
+        }
+      ],
+      "parts": [],
+      "description": "构件 `diagram.editable-label`"
+    },
+    {
+      "name": "eo-display-canvas",
+      "properties": [
+        {
+          "name": "cells",
+          "description": "用于查看的画布可以更新 `cells` 属性。",
+          "attribute": false,
+          "type": "InitialCell[]"
+        },
+        {
+          "name": "layout",
+          "type": "LayoutType"
+        },
+        {
+          "name": "layoutOptions",
+          "attribute": false,
+          "type": "LayoutOptions"
+        },
+        {
+          "name": "defaultNodeSize",
+          "attribute": false,
+          "type": "SizeTuple",
+          "default": "[DEFAULT_NODE_SIZE, DEFAULT_NODE_SIZE]"
+        },
+        {
+          "name": "defaultNodeBricks",
+          "attribute": false,
+          "type": "NodeBrickConf[]"
+        },
+        {
+          "name": "degradedThreshold",
+          "description": "当节点数量达到或超过 `degradedThreshold` 时，节点将被降级展示。",
+          "default": "500",
+          "type": "number"
+        },
+        {
+          "name": "degradedNodeLabel",
+          "description": "设置节点将降级展示时显示的名称。",
+          "default": "\"<% DATA.node.id %>\"",
+          "attribute": false,
+          "type": "string"
+        },
+        {
+          "name": "defaultEdgeLines",
+          "description": "使用条件判断设置默认的边对应的连线。在 `if` 表达式中 `DATA` 为 `{ edge }`，例如：\n\n```yaml\ndefaultEdgeLines:\n  - if: <% DATA.edge.data?.virtual %>\n    dashed: true\n```",
+          "attribute": false,
+          "type": "EdgeLineConf[]"
+        },
+        {
+          "name": "activeTarget",
+          "attribute": false,
+          "type": "ActiveTarget | null"
+        },
+        {
+          "name": "fadeUnrelatedCells",
+          "description": "当鼠标悬浮到某节点上时，隐藏其他跟该节点无关的元素。",
+          "type": "boolean"
+        },
+        {
+          "name": "zoomable",
+          "type": "boolean",
+          "default": "true"
+        },
+        {
+          "name": "scrollable",
+          "type": "boolean",
+          "default": "true"
+        },
+        {
+          "name": "pannable",
+          "type": "boolean",
+          "default": "true"
+        },
+        {
+          "name": "scaleRange",
+          "attribute": false,
+          "type": "RangeTuple"
+        },
+        {
+          "name": "hideZoomBar",
+          "description": "隐藏右下角放大缩小的控制栏",
+          "type": "boolean"
+        },
+        {
+          "name": "autoCenterWhenCellsChange",
+          "description": "每当 cells 改变时，重新自动居中",
+          "type": "boolean"
+        },
+        {
+          "name": "doNotResetActiveTargetForSelector",
+          "description": "选择器，点击该选择器对应的元素时不重置 `activeTarget`。",
+          "type": "string"
+        },
+        {
+          "name": "doNotResetActiveTargetOutsideCanvas",
+          "description": "在画布外点击时不重置 `activeTarget`。",
+          "type": "boolean"
+        }
+      ],
+      "events": [
+        {
+          "name": "activeTarget.change",
+          "detail": {
+            "type": "ActiveTarget | null"
+          }
+        },
+        {
+          "name": "cell.contextmenu",
+          "detail": {
+            "type": "CellContextMenuDetail"
+          }
+        },
+        {
+          "name": "cell.click",
+          "detail": {
+            "type": "CellContextMenuDetail"
+          }
+        }
+      ],
+      "slots": [],
+      "methods": [],
+      "parts": [],
+      "description": "用于展示查看的画布。"
+    },
     {
       "name": "eo-diagram",
       "properties": [
@@ -139,128 +303,45 @@
       "description": "构件 `eo-diagram`"
     },
     {
-      "name": "eo-display-canvas",
+      "name": "diagram.experimental-node",
       "properties": [
         {
-          "name": "cells",
-          "description": "用于查看的画布可以更新 `cells` 属性。",
-          "attribute": false,
-          "type": "InitialCell[]"
-        },
-        {
-          "name": "layout",
-          "type": "LayoutType"
-        },
-        {
-          "name": "layoutOptions",
-          "attribute": false,
-          "type": "LayoutOptions"
-        },
-        {
-          "name": "defaultNodeSize",
-          "attribute": false,
-          "type": "SizeTuple",
-          "default": "[DEFAULT_NODE_SIZE, DEFAULT_NODE_SIZE]"
-        },
-        {
-          "name": "defaultNodeBricks",
-          "attribute": false,
-          "type": "NodeBrickConf[]"
-        },
-        {
-          "name": "degradedThreshold",
-          "description": "当节点数量达到或超过 `degradedThreshold` 时，节点将被降级展示。",
-          "default": "500",
-          "type": "number"
-        },
-        {
-          "name": "degradedNodeLabel",
-          "description": "设置节点将降级展示时显示的名称。",
-          "default": "\"<% DATA.node.id %>\"",
-          "attribute": false,
-          "type": "string"
-        },
-        {
-          "name": "defaultEdgeLines",
-          "description": "使用条件判断设置默认的边对应的连线。在 `if` 表达式中 `DATA` 为 `{ edge }`，例如：\n\n```yaml\ndefaultEdgeLines:\n  - if: <% DATA.edge.data?.virtual %>\n    dashed: true\n```",
-          "attribute": false,
-          "type": "EdgeLineConf[]"
-        },
-        {
-          "name": "activeTarget",
-          "attribute": false,
-          "type": "ActiveTarget | null"
-        },
-        {
-          "name": "fadeUnrelatedCells",
-          "description": "当鼠标悬浮到某节点上时，隐藏其他跟该节点无关的元素。",
-          "type": "boolean"
-        },
-        {
-          "name": "zoomable",
-          "type": "boolean",
-          "default": "true"
-        },
-        {
-          "name": "scrollable",
-          "type": "boolean",
-          "default": "true"
-        },
-        {
-          "name": "pannable",
-          "type": "boolean",
-          "default": "true"
-        },
-        {
-          "name": "scaleRange",
-          "attribute": false,
-          "type": "RangeTuple"
-        },
-        {
-          "name": "hideZoomBar",
-          "description": "隐藏右下角放大缩小的控制栏",
-          "type": "boolean"
-        },
-        {
-          "name": "autoCenterWhenCellsChange",
-          "description": "每当 cells 改变时，重新自动居中",
-          "type": "boolean"
+          "name": "usage",
+          "type": "ExperimentalUsage"
         },
         {
-          "name": "doNotResetActiveTargetForSelector",
-          "description": "选择器，点击该选择器对应的元素时不重置 `activeTarget`。",
-          "type": "string"
+          "name": "status",
+          "type": "NodeStatus"
         },
         {
-          "name": "doNotResetActiveTargetOutsideCanvas",
-          "description": "在画布外点击时不重置 `activeTarget`。",
-          "type": "boolean"
+          "name": "decorator",
+          "type": "DecoratorType"
         }
       ],
       "events": [
         {
-          "name": "activeTarget.change",
+          "name": "drag.start",
           "detail": {
-            "type": "ActiveTarget | null"
+            "type": "PositionTuple"
           }
         },
         {
-          "name": "cell.contextmenu",
+          "name": "drag.move",
           "detail": {
-            "type": "CellContextMenuDetail"
+            "type": "PositionTuple"
           }
         },
         {
-          "name": "cell.click",
+          "name": "drag.end",
           "detail": {
-            "type": "CellContextMenuDetail"
+            "type": "PositionTuple"
           }
         }
       ],
       "slots": [],
       "methods": [],
       "parts": [],
-      "description": "用于展示查看的画布。"
+      "description": "构件 `diagram.experimental-node`"
     },
     {
       "name": "eo-draw-canvas",
@@ -563,87 +644,6 @@
       ],
       "parts": [],
       "description": "用于手工绘图的画布。\n\n注意：将配套另外一个用于展示的画布构件。"
-    },
-    {
-      "name": "diagram.experimental-node",
-      "properties": [
-        {
-          "name": "usage",
-          "type": "ExperimentalUsage"
-        },
-        {
-          "name": "status",
-          "type": "NodeStatus"
-        },
-        {
-          "name": "decorator",
-          "type": "DecoratorType"
-        }
-      ],
-      "events": [
-        {
-          "name": "drag.start",
-          "detail": {
-            "type": "PositionTuple"
-          }
-        },
-        {
-          "name": "drag.move",
-          "detail": {
-            "type": "PositionTuple"
-          }
-        },
-        {
-          "name": "drag.end",
-          "detail": {
-            "type": "PositionTuple"
-          }
-        }
-      ],
-      "slots": [],
-      "methods": [],
-      "parts": [],
-      "description": "构件 `diagram.experimental-node`"
-    },
-    {
-      "name": "diagram.editable-label",
-      "properties": [
-        {
-          "name": "label",
-          "type": "string"
-        },
-        {
-          "name": "type",
-          "type": "LabelType"
-        },
-        {
-          "name": "readOnly",
-          "type": "boolean"
-        }
-      ],
-      "events": [
-        {
-          "name": "label.editing.change",
-          "detail": {
-            "type": "boolean"
-          }
-        },
-        {
-          "name": "label.change",
-          "detail": {
-            "type": "string"
-          }
-        }
-      ],
-      "slots": [],
-      "methods": [
-        {
-          "name": "enableEditing",
-          "params": []
-        }
-      ],
-      "parts": [],
-      "description": "构件 `diagram.editable-label`"
     }
   ],
   "providers": []

package/dist/types.json CHANGED Viewed

@@ -1,4 +1,78 @@
 {
+  "diagram.editable-label": {
+    "properties": [
+      {
+        "name": "label",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "type",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "LabelType"
+          }
+        }
+      },
+      {
+        "name": "readOnly",
+        "annotation": {
+          "type": "keyword",
+          "value": "boolean"
+        }
+      }
+    ],
+    "events": [
+      {
+        "name": "label.editing.change",
+        "detail": {
+          "annotation": {
+            "type": "keyword",
+            "value": "boolean"
+          }
+        }
+      },
+      {
+        "name": "label.change",
+        "detail": {
+          "annotation": {
+            "type": "keyword",
+            "value": "string"
+          }
+        }
+      }
+    ],
+    "methods": [
+      {
+        "name": "enableEditing",
+        "params": [],
+        "returns": {}
+      }
+    ],
+    "types": [
+      {
+        "type": "typeAlias",
+        "name": "LabelType",
+        "annotation": {
+          "type": "union",
+          "types": [
+            {
+              "type": "jsLiteral",
+              "value": "line"
+            },
+            {
+              "type": "jsLiteral",
+              "value": "default"
+            }
+          ]
+        }
+      }
+    ]
+  },
   "diagram.experimental-node": {
     "properties": [
       {
@@ -172,80 +246,6 @@
       }
     ]
   },
-  "diagram.editable-label": {
-    "properties": [
-      {
-        "name": "label",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "type",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "LabelType"
-          }
-        }
-      },
-      {
-        "name": "readOnly",
-        "annotation": {
-          "type": "keyword",
-          "value": "boolean"
-        }
-      }
-    ],
-    "events": [
-      {
-        "name": "label.editing.change",
-        "detail": {
-          "annotation": {
-            "type": "keyword",
-            "value": "boolean"
-          }
-        }
-      },
-      {
-        "name": "label.change",
-        "detail": {
-          "annotation": {
-            "type": "keyword",
-            "value": "string"
-          }
-        }
-      }
-    ],
-    "methods": [
-      {
-        "name": "enableEditing",
-        "params": [],
-        "returns": {}
-      }
-    ],
-    "types": [
-      {
-        "type": "typeAlias",
-        "name": "LabelType",
-        "annotation": {
-          "type": "union",
-          "types": [
-            {
-              "type": "jsLiteral",
-              "value": "line"
-            },
-            {
-              "type": "jsLiteral",
-              "value": "default"
-            }
-          ]
-        }
-      }
-    ]
-  },
   "eo-draw-canvas": {
     "properties": [
       {
@@ -2650,6 +2650,19 @@
             },
             "optional": true,
             "computed": false
+          },
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "jumps"
+            },
+            "annotation": {
+              "type": "keyword",
+              "value": "boolean"
+            },
+            "optional": true,
+            "computed": false
           }
         ]
       },
@@ -7830,6 +7843,19 @@
             },
             "optional": true,
             "computed": false
+          },
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "jumps"
+            },
+            "annotation": {
+              "type": "keyword",
+              "value": "boolean"
+            },
+            "optional": true,
+            "computed": false
           }
         ]
       },

package/dist-types/diagram/lines/curveLine.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { CurveType, NodePosition } from "../interfaces";
+import type { LineSegmentJumps } from "../../draw-canvas/interfaces";
 /**
  * Generate Line from points
  */
-export declare function curveLine(points: Array<NodePosition> | null | undefined, curveType: CurveType | undefined, startOffset: number, endOffset: number): string;
+export declare function curveLine(points: Array<NodePosition> | null | undefined, curveType: CurveType | undefined, startOffset: number, endOffset: number, jumpsMap?: Map<number, LineSegmentJumps> | null): string;

package/dist-types/diagram/lines/intersect.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import type { PositionTuple } from "../interfaces";
2	+ export declare function intersect([x1, y1]: PositionTuple, [x2, y2]: PositionTuple, [x3, y3]: PositionTuple, [x4, y4]: PositionTuple): null \| PositionTuple;

package/dist-types/diagram/lines/intersect.spec.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/dist-types/draw-canvas/interfaces.d.ts CHANGED Viewed

@@ -129,6 +129,7 @@ export interface BaseEdgeLineConf {
     showEndArrow?: boolean;
     animate?: LineAnimate;
     overrides?: EdgeLineConfOverrides;
+    jumps?: boolean;
 }
 export interface EdgeLineConfOverrides {
     active?: EdgeLineConfOverridable;
@@ -341,17 +342,18 @@ export interface ControlPoint extends NodePosition {
     index: number;
 }
 export type EditableLine = EditableEdgeLine | EditableDecoratorLine;
-export interface EditableEdgeLine {
+export interface EditableEdgeLine extends BaseEditableLine {
     edge: EdgeCell;
-    points: NodePosition[];
     source: NodeBrickCell | DecoratorCell;
     target: NodeBrickCell | DecoratorCell;
-    parallelGap: number;
 }
-export interface EditableDecoratorLine {
+export interface EditableDecoratorLine extends BaseEditableLine {
     decorator: DecoratorCell;
+}
+export interface BaseEditableLine {
     points: NodePosition[];
     parallelGap: number;
+    jumpsMap?: Map<number, LineSegmentJumps> | null;
 }
 export type PositionAndAngle = [
     x: number,
@@ -360,3 +362,14 @@ export type PositionAndAngle = [
     angle: number,
     offset: number
 ];
+/**
+ * 一段线段上的交叉跨线点列表
+ */
+export interface LineSegmentJumps {
+    /** 交叉跨线圆弧的中心点列表，这些点应该遵循从线段起点到终点的顺序 */
+    jumpPoints: NodePosition[];
+    /** 该线段在整个连线中的索引 */
+    index: number;
+    /** 交叉跨线圆弧的半径 */
+    radius: number;
+}

package/dist-types/shared/canvas/collectLineJumpsFactory.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import type { ComputedEdgeLineConf, LineSegmentJumps } from "../../draw-canvas/interfaces";
+import type { NodePosition } from "../../diagram/interfaces";
+export declare function collectLineJumpsFactory(): (points: NodePosition[], lineConf: ComputedEdgeLineConf) => Map<number, LineSegmentJumps> | null;

package/dist-types/shared/canvas/collectLineJumpsFactory.spec.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/docs/eo-draw-canvas.md CHANGED Viewed

@@ -794,6 +794,8 @@
                           : "default"
                       %>
             cells: <% CTX.initialCells %>
+            defaultEdgeLines:
+              - jumps: true
             lineConnector: true
             lineSettings: |
               <%= { type: CTX.lineType } %>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/diagram",
-  "version": "0.56.1",
+  "version": "0.57.0",
   "homepage": "https://github.com/easyops-cn/next-advanced-bricks/tree/master/bricks/diagram",
   "repository": {
     "type": "git",
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "@next-bricks/basic": "*"
   },
-  "gitHead": "0925acfb30dfceb83b4729476e8591af91c8d587"
+  "gitHead": "bd1caf612bd2673b14bea015b95569f137c35327"
 }