@logicflow/core 1.2.0-alpha.2 → 1.2.0-alpha.5

package/dist/style/index.css

@@ -6,6 +6,9 @@
   background: #ffffff;
   user-select: none;
 }
+.lf-graph svg {
+  display: block;
+}
 .lf-element-text {
   cursor: text;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/core",
-  "version": "1.2.0-alpha.2",
+  "version": "1.2.0-alpha.5",
   "description": "LogicFlow core, to quickly build flowchart editor",
   "main": "dist/logic-flow.js",
   "unpkg": "dist/logic-flow.js",
@@ -19,7 +19,7 @@
     "build": "npm run build:umd",
     "build:umd": "cross-env NODE_ENV=production webpack --config scripts/webpack.config.build.js && cp -r src/style/ dist/style",
     "build-analyse": "cross-env analyse=true npm run build",
-    "types": "tsc -d --declarationDir ./types --outDir temp && rimraf temp",
+    "types": "tsc -d --declarationDir ./tempTypes --outDir temp && rimraf types && mv ./tempTypes/src ./types && rimraf temp && rimraf tempTypes",
     "lint": "eslint . --ext .ts,.tsx",
     "publish-lib": "npm run types & npm run clean && npm run build && npm publish",
     "publish-next": "npm run types & npm run clean && npm run build && npm publish --tag next"
@@ -73,9 +73,8 @@
     "ids": "^1.0.0",
     "less-loader": "^6.0.0",
     "lodash-es": "^4.17.15",
-    "mobx": "^5.15.7",
-    "mobx-react": "^6.3.0",
-    "mobx-utils": "^5.6.1",
+    "mobx": "^6.5.0",
+    "mobx-react": "^7.3.0",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
     "standard-version": "^9.0.0",

package/types/LogicFlow.d.ts

@@ -468,7 +468,7 @@ export default class LogicFlow {
     /**
      * 触发监听事件
      */
-    emit(evt: string, arg: any): void;
+    emit(evt: string, arg?: any): void;
     /**
      * 添加扩展, 待讨论，这里是不是静态方法好一些？
      * 重复添加插件的时候，把上一次添加的插件的销毁。
@@ -519,7 +519,7 @@ export default class LogicFlow {
        * 用于支持国际化
        */
     static t(text: string): string;
-    renderRawData(graphRawData: any): void;
+    renderRawData(graphRawData: any, isForce?: boolean): void;
     /**
      * 渲染图
      * @example
@@ -548,7 +548,7 @@ export default class LogicFlow {
      * })
      * @param graphData 图数据
      */
-    render(graphData?: {}): void;
+    render(graphData?: {}, isForce?: boolean): void;
     /**
      * 内部保留方法
      * 获取指定类型的view

package/types/constant/constant.d.ts

@@ -46,6 +46,8 @@ export declare enum EventType {
     NODE_MOUSEMOVE = "node:mousemove",
     NODE_MOUSEENTER = "node:mouseenter",
     NODE_MOUSELEAVE = "node:mouseleave",
+    NODE_TEXT_UPDATE = "node:text-update",
+    NODE_PROPERTY_UPDATE = "node:property-update",
     NODE_CONTEXTMENU = "node:contextmenu",
     EDGE_DELETE = "edge:delete",
     EDGE_ADD = "edge:add",
@@ -53,6 +55,8 @@ export declare enum EventType {
     EDGE_DBCLICK = "edge:dbclick",
     EDGE_MOUSEENTER = "edge:mouseenter",
     EDGE_MOUSELEAVE = "edge:mouseleave",
+    EDGE_TEXT_UPDATE = "edge:text-update",
+    EDGE_PROPERTY_UPDATE = "edge:property-update",
     EDGE_CONTEXTMENU = "edge:contextmenu",
     EDGE_ADJUST = "edge:adjust",
     EDGE_EXCHANGE_NODE = "edge:exchange-node",
@@ -76,7 +80,9 @@ export declare enum EventType {
     SELECTION_CONTEXTMENU = "selection:contextmenu",
     CONNECTION_NOT_ALLOWED = "connection:not-allowed",
     HISTORY_CHANGE = "history:change",
+    HISTORY_INSERT = "history:insert",
     TEXT_UPDATE = "text:update",
+    TEXT_DROP = "text:drop",
     GRAPH_TRANSFORM = "graph:transform",
     GRAPH_RENDERED = "graph:rendered"
 }

package/types/history/History.d.ts

@@ -8,13 +8,15 @@ declare class History {
     maxSize: number;
     waitTime: number;
     eventCenter: EventEmitter;
-    constructor(eventCenter: any);
+    model: any;
+    constructor(graphModel: any, isPropertiesChangeHistory: any);
     add(data: any): void;
     undoAble(): boolean;
     undo(): any;
     redoAble(): boolean;
     redo(): any;
-    watch(model: any): void;
+    emitHistoryChange(): void;
+    listenHistoryChange: () => void;
 }
 export { History };
 export default History;

package/types/index.d.ts

@@ -1,9 +1,9 @@
-import { h } from 'preact';
 import LogicFlow from './LogicFlow';
 import * as LogicFlowUtil from './util';
-export declare function observer<P>(props: P): any;
-export { LogicFlow, h };
-export { LogicFlowUtil };
+import { version } from '../package.json';
+export { h } from 'preact';
+export * from './util/stateUtil';
+export { LogicFlowUtil, version, LogicFlow };
 export * from './type/index';
 export * from './view';
 export * from './model';

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

@@ -38,6 +38,7 @@ declare class BaseEdgeModel implements IBaseModel {
     animationData: import("../../constant/DefaultAnimation").Animation;
     [propName: string]: any;
     constructor(data: EdgeConfig, graphModel: GraphModel);
+    init(): void;
     /**
      * @override 支持重写
      * 初始化边数据

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

@@ -5,6 +5,7 @@ export { BezierEdgeModel };
 export default class BezierEdgeModel extends BaseEdgeModel {
     modelType: ModelType;
     path: string;
+    constructor(data: any, graphModel: any);
     initEdgeData(data: any): void;
     getEdgeStyle(): {
         [x: string]: any;

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

@@ -6,6 +6,7 @@ export default class PolylineEdgeModel extends BaseEdgeModel {
     modelType: ModelType;
     draggingPointList: any;
     dbClickPosition: Point;
+    constructor(data: any, graphModel: any);
     initEdgeData(data: any): void;
     getEdgeStyle(): {
         [x: string]: any;

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

@@ -59,6 +59,7 @@ export default class BaseNodeModel implements IBaseNodeModel {
     hasSetSourceRules: boolean;
     [propName: string]: any;
     constructor(data: NodeConfig, graphModel: GraphModel);
+    init(): void;
     /**
      * 获取进入当前节点的边和节点
      */
@@ -105,6 +106,7 @@ export default class BaseNodeModel implements IBaseNodeModel {
      * @override 支持重写
      */
     getData(): NodeData;
+    setIsDragging(isDragging: any): void;
     /**
      * 用于在历史记录时获取节点数据，
      * 在某些情况下，如果希望某个属性变化不引起history的变化，
@@ -193,5 +195,15 @@ export default class BaseNodeModel implements IBaseNodeModel {
     setProperty(key: any, val: any): void;
     setProperties(properties: any): void;
     setZIndex(zIndex?: number): void;
+    /**
+     * 设置节点属性；
+     * 支持属性请参考节点属性文档
+     * http://logic-flow.org/api/nodeModelApi.html#%E6%95%B0%E6%8D%AE%E5%B1%9E%E6%80%A7
+     * @example
+     * nodeModel.updateAttributes({
+     *  width: 100,
+     *  height: 100
+     * })
+     */
     updateAttributes(attributes: any): void;
 }

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

@@ -3,6 +3,7 @@ import { ModelType } from '../../constant/constant';
 declare class CircleNodeModel extends BaseNodeModel {
     modelType: ModelType;
     r: number;
+    constructor(data: any, graphData: any);
     get width(): number;
     get height(): number;
     getNodeStyle(): {

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

@@ -5,6 +5,7 @@ declare class DiamondNodeModel extends BaseNodeModel {
     modelType: ModelType;
     rx: number;
     ry: number;
+    constructor(data: any, graphData: any);
     getNodeStyle(): {
         [x: string]: any;
         fill?: string;

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

@@ -4,6 +4,7 @@ declare class EllipseNodeModel extends BaseNodeModel {
     modelType: ModelType;
     rx: number;
     ry: number;
+    constructor(data: any, graphData: any);
     getNodeStyle(): {
         [x: string]: any;
         fill?: string;

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

@@ -4,6 +4,7 @@ import { ModelType } from '../../constant/constant';
 declare class PolygonNodeModel extends BaseNodeModel {
     modelType: ModelType;
     points: PointTuple[];
+    constructor(data: any, graphModel: any);
     getNodeStyle(): {
         [x: string]: any;
         fill?: string;

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

@@ -3,6 +3,7 @@ import { ModelType } from '../../constant/constant';
 declare class RectNodeModel extends BaseNodeModel {
     modelType: ModelType;
     radius: number;
+    constructor(data: any, graphModel: any);
     getDefaultAnchor(): {
         x: number;
         y: number;

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

@@ -2,6 +2,7 @@ import BaseNodeModel from './BaseNodeModel';
 import { ModelType } from '../../constant/constant';
 declare class TextNodeModel extends BaseNodeModel {
     modelType: ModelType;
+    constructor(data: any, graphModel: any);
     getTextStyle(): {
         [x: string]: any;
         color?: string;

package/types/options.d.ts

@@ -60,6 +60,13 @@ export declare type Definition = {
      * 是否开启历史记录功能，默认开启
      */
     history?: boolean;
+    /**
+     * 节点、连线的属性的变化是否会记录到history中，默认是。
+     * 例如：节点的一个属性为active, 在自定义节点时这个属性为true节点高亮。
+     * 那么在isPropertiesChangeHistory为true的情况下，将节点active设置为true
+     * 会在历史记录中多一个active为false的快照。
+     */
+    isPropertiesChangeHistory?: boolean;
     /**
      * 是否开启局部渲染，默认不开启
      */
@@ -107,6 +114,7 @@ export declare function get(options: Definition): {
     background: boolean;
     grid: boolean;
     textEdit: boolean;
+    isPropertiesChangeHistory: boolean;
     disabledTools: any[];
 } & {
     [key: string]: any;
@@ -155,6 +163,13 @@ export declare function get(options: Definition): {
      * 是否开启历史记录功能，默认开启
      */
     history?: boolean;
+    /**
+     * 节点、连线的属性的变化是否会记录到history中，默认是。
+     * 例如：节点的一个属性为active, 在自定义节点时这个属性为true节点高亮。
+     * 那么在isPropertiesChangeHistory为true的情况下，将节点active设置为true
+     * 会在历史记录中多一个active为false的快照。
+     */
+    isPropertiesChangeHistory?: boolean;
     /**
      * 是否开启局部渲染，默认不开启
      */
@@ -197,6 +212,7 @@ export declare const defaults: {
     background: boolean;
     grid: boolean;
     textEdit: boolean;
+    isPropertiesChangeHistory: boolean;
     disabledTools: any[];
 };
 export {};

package/types/tool/TextEditTool.d.ts

@@ -28,6 +28,7 @@ export default class TextEdit extends Component<IProps, IState> {
     componentDidUpdate(): void;
     keyupHandler: (ev: any) => void;
     inputHandler: (ev: any) => void;
+    keydownHandler: (ev: any) => void;
     placeCaretAtEnd(el: any): void;
     render(): h.JSX.Element;
 }

package/types/util/edge.d.ts

@@ -26,8 +26,11 @@ export declare const isBboxOverLapping: (b1: PBBox, b2: PBBox) => boolean;
 export declare const filterRepeatPoints: (points: PolyPoint[]) => PolyPoint[];
 export declare const getSimplePolyline: (sPoint: PolyPoint, tPoint: PolyPoint) => PolyPoint[];
 export declare const getExpandedBBox: (bbox: PBBox, offset: number) => PBBox;
-export declare const pointDirection: (point: PolyPoint, bbox: PBBox) => Direction;
-export declare const getExpandedBBoxPoint: (bbox: PBBox, point: PolyPoint) => PolyPoint;
+/**
+ * 判断点与中心点边的方向：是否水平，true水平，false垂直
+ */
+export declare const pointDirection: (point: PolyPoint, node: BaseNode) => Direction;
+export declare const getExpandedBBoxPoint: (bbox: PBBox, point: PolyPoint, direction: any) => PolyPoint;
 export declare const mergeBBox: (b1: PBBox, b2: PBBox) => PBBox;
 export declare const getBBoxOfPoints: (points?: PolyPoint[], offset?: number) => PBBox;
 export declare const getPointsFromBBox: (bbox: PBBox) => PolyPoint[];
@@ -46,6 +49,14 @@ export declare const getNextNeighborPoints: (points: PolyPoint[], point: PolyPoi
 export declare const pathFinder: (points: PolyPoint[], start: PolyPoint, goal: PolyPoint, sBBox: PBBox, tBBox: PBBox, os: PolyPoint, ot: PolyPoint) => PolyPoint[];
 export declare const getBoxByOriginNode: (node: BaseNode) => PBBox;
 export declare const pointFilter: (points: PolyPoint[]) => PolyPoint[];
+/**
+ * 计算折线点
+ * @param start 连线的开始点坐标
+ * @param end 连线的结束点坐标
+ * @param sNode 连线连接的开始节点
+ * @param tNode 连线连接的结束节点
+ * @param offset 连线箭头距离
+ */
 export declare const getPolylinePoints: (start: PolyPoint, end: PolyPoint, sNode: BaseNode, tNode: BaseNode, offset: number) => PolyPoint[];
 /**
  * 获取折线中最长的一个线

package/types/util/stateUtil.d.ts

@@ -0,0 +1,4 @@
+export { action, observable, computed, makeObservable, configure, toJS, isObservable, } from 'mobx';
+export declare function observer<P>(props: P): any;
+export type { IReactionDisposer, IReactionPublic, IReactionOptions } from 'mobx';
+export * as mobx from 'mobx';

package/types/view/overlay/CanvasOverlay.d.ts

@@ -13,7 +13,12 @@ declare class CanvasOverlay extends Component<IProps, IState> {
     stepDrag: StepDrag;
     stepScrollX: number;
     stepScrollY: number;
+    ref: HTMLElement;
     constructor(props: IProps);
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    setRef: (dom: any) => void;
+    get rootEl(): HTMLElement;
     onDragging: ({ deltaX, deltaY }: {
         deltaX: any;
         deltaY: any;

package/types/view/text/BaseText.d.ts

@@ -22,6 +22,7 @@ export default class BaseText extends Component<IProps, IState> {
         deltaX: any;
         deltaY: any;
     }) => void;
+    onDragEnd: (e: any) => void;
     dblClickHandler: () => void;
     mouseDownHandle: (ev: MouseEvent) => void;
     render(): h.JSX.Element;

package/types/view/basic-shape/LinearGradient.d.ts

@@ -1 +0,0 @@
-export default function Rect(props: any): void;

package/types/view/behavior/Transform.d.ts

@@ -1,4 +0,0 @@
-import { h, Component } from 'preact';
-export default class TransfromGraph extends Component {
-    render(): h.JSX.Element;
-}