@logicflow/core 1.1.23 → 1.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/core",
-  "version": "1.1.23",
+  "version": "1.1.26",
   "description": "LogicFlow core, to quickly build flowchart editor",
   "main": "dist/entry.js",
   "module": "dist/logic-flow.js",

package/types/LogicFlow.d.ts

@@ -338,7 +338,7 @@ export default class LogicFlow {
      * @param leftTopPoint 区域左上角坐标, dom层坐标
      * @param rightBottomPoint 区域右下角坐标，dom层坐标
      */
-    getAreaElement(leftTopPoint: PointTuple, rightBottomPoint: PointTuple, wholeEdge?: boolean, wholeNode?: boolean): any[];
+    getAreaElement(leftTopPoint: PointTuple, rightBottomPoint: PointTuple, wholeEdge?: boolean, wholeNode?: boolean, ignoreHideElement?: boolean): any[];
     /**
      * 获取选中的元素数据
      * @param isIgnoreCheck 是否包括sourceNode和targetNode没有被选中的边,默认包括。

package/types/model/BaseModel.d.ts

@@ -53,7 +53,14 @@ interface IBaseModel {
      * 元素是否被选中
      */
     isSelected: boolean;
+    /**
+     * 节点是否显示
+     */
     visible: boolean;
+    /**
+     * 节点是否可以通过getGraphData获取
+     */
+    virtual: boolean;
     /**
      * 元素堆叠是层级，默认情况下节点zIndex值为1，边zIndex为0。
      * todo：写完善

package/types/model/GraphModel.d.ts

@@ -53,6 +53,10 @@ declare class GraphModel {
      * @see todo docs link
      */
     idGenerator: (type?: string) => string;
+    /**
+     * 节点间连线、连线变更时的边的生成规则
+     */
+    edgeGenerator: Definition['edgeGenerator'];
     /**
      * 节点移动规则判断
      * 在节点移动的时候，会出发此数组中的所有规则判断
@@ -142,8 +146,9 @@ declare class GraphModel {
      * @param rightBottomPoint 表示区域右下角的点
      * @param wholeEdge 是否要整个边都在区域内部
      * @param wholeNode 是否要整个节点都在区域内部
+     * @param ignoreHideElement 是否忽略隐藏的节点
      */
-    getAreaElement(leftTopPoint: PointTuple, rightBottomPoint: PointTuple, wholeEdge?: boolean, wholeNode?: boolean): any[];
+    getAreaElement(leftTopPoint: PointTuple, rightBottomPoint: PointTuple, wholeEdge?: boolean, wholeNode?: boolean, ignoreHideElement?: boolean): any[];
     /**
      * 获取指定类型元素对应的Model
      */

package/types/model/edge/BaseEdgeModel.d.ts

@@ -25,6 +25,7 @@ declare class BaseEdgeModel implements IBaseModel {
     isHitable: boolean;
     draggable: boolean;
     visible: boolean;
+    virtual: boolean;
     isAnimation: boolean;
     graphModel: GraphModel;
     zIndex: number;

package/types/model/node/BaseNodeModel.d.ts

@@ -45,6 +45,7 @@ export default class BaseNodeModel implements IBaseNodeModel {
     isHitable: boolean;
     draggable: boolean;
     visible: boolean;
+    virtual: boolean;
     graphModel: GraphModel;
     zIndex: number;
     state: number;
@@ -183,8 +184,9 @@ export default class BaseNodeModel implements IBaseNodeModel {
     get anchors(): PointAnchor[];
     getAnchorInfo(anchorId: string): PointAnchor;
     addNodeMoveRules(fn: NodeMoveRule): void;
-    move(deltaX: any, deltaY: any, isignoreRule?: boolean): boolean;
-    moveTo(x: any, y: any, isignoreRule?: boolean): boolean;
+    move(deltaX: any, deltaY: any, isIgnoreRule?: boolean): boolean;
+    getMoveDistance(deltaX: number, deltaY: number, isIgnoreRule?: boolean): [number, number];
+    moveTo(x: any, y: any, isIgnoreRule?: boolean): boolean;
     moveText(deltaX: any, deltaY: any): void;
     updateText(value: string): void;
     setSelected(flag?: boolean): void;

package/types/options.d.ts

@@ -97,6 +97,17 @@ export declare type Definition = {
      * AnimationConfig: 配置部分动画开启
      */
     animation?: boolean | Partial<AnimationConfig>;
+    /**
+     * 节点间连线、连线变更时的边的生成规则
+     * @param sourceNode 起始节点数据
+     * @param targetNode 终止节点数据
+     * @param currentEdge 当前边的数据, 仅移动已有边的时候有值
+     *
+     * @return undefined: 使用默认边
+     *        string: 自定义边类型
+     *        any: 自定义边及其他数据
+     */
+    edgeGenerator?: (sourceNode: any, targetNode: any, currentEdge?: any) => string | any | undefined;
     [key: string]: any;
 } & EditConfigInterface;
 export interface GuardsTypes {
@@ -192,6 +203,17 @@ export declare function get(options: Definition): {
      * AnimationConfig: 配置部分动画开启
      */
     animation?: boolean | Partial<AnimationConfig>;
+    /**
+     * 节点间连线、连线变更时的边的生成规则
+     * @param sourceNode 起始节点数据
+     * @param targetNode 终止节点数据
+     * @param currentEdge 当前边的数据, 仅移动已有边的时候有值
+     *
+     * @return undefined: 使用默认边
+     *        string: 自定义边类型
+     *        any: 自定义边及其他数据
+     */
+    edgeGenerator?: (sourceNode: any, targetNode: any, currentEdge?: any) => any;
 } & EditConfigInterface;
 export declare const defaults: {
     background: boolean;

package/types/util/edge.d.ts

@@ -99,4 +99,10 @@ declare type Position = {
     y: number;
 };
 export declare const twoPointDistance: (source: Position, target: Position) => number;
+/**
+ * 包装边生成函数
+ * @param graphModel graph model
+ * @param generator 用户自定义的边生成函数
+ */
+export declare function createEdgeGenerator(graphModel: any, generator?: Function): (sourceNode: any, targetNode: any, currentEdge?: any) => any;
 export {};