@logicflow/core 2.0.0-beta.5 → 2.0.0-beta.6

package/lib/view/overlay/ToolOverlay.d.ts

@@ -12,7 +12,7 @@ export declare class ToolOverlay extends Component<IProps> {
     /**
      * 外部传入的一般是HTMLElement
      */
-    getTools(): import("preact").VNode<import("../../tool").IToolProps>[];
+    getTools(): import("preact").VNode<import("../..").IToolProps>[];
     triggerToolRender(): void;
     render(): h.JSX.Element;
 }

package/lib/view/overlay/ToolOverlay.js

@@ -52,7 +52,7 @@ var ToolOverlay = /** @class */ (function (_super) {
             return (0, compat_1.createElement)(t, {
                 textEditElement: textEditElement,
                 graphModel: graphModel,
-                logicFlow: tool.instance,
+                lf: tool.instance,
             });
         });
         tool.components = components;

package/lib/view/overlay/ToolOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToolOverlay.js","sourceRoot":"","sources":["../../../src/view/overlay/ToolOverlay.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA6D;AAC7D,sBAAkC;AAClC,2BAAgC;AAWhC;IAAiC,+BAAiB;IAAlD;;IAiDA,CAAC;IAhDC,yFAAyF;IACzF,+DAA+D;IAC/D,6DAA6D;IAC7D,6DAA6D;IAC7D,uCAAiB,GAAjB;QACE,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC1B,CAAC;IAED,wCAAkB,GAAlB;QACE,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC1B,CAAC;IAED;;OAEG;IACH,8BAAQ,GAAR;QACQ,IAAA,KAAuB,IAAI,CAAC,KAAK,EAA/B,IAAI,UAAA,EAAE,UAAU,gBAAe,CAAA;QAC/B,IAAA,eAAe,GAAK,UAAU,gBAAf,CAAe;QACtC,IAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC7B,IAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC;YAC7B,OAAA,IAAA,sBAAC,EAAC,CAAC,EAAE;gBACH,eAAe,iBAAA;gBACf,UAAU,YAAA;gBACV,SAAS,EAAE,IAAI,CAAC,QAAQ;aACzB,CAAC;QAJF,CAIE,CACH,CAAA;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,uCAAiB,GAAjB;QACQ,IAAA,KAAuB,IAAI,CAAC,KAAK,EAA/B,IAAI,UAAA,EAAE,UAAU,gBAAe,CAAA;QACvC,IAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAC/C,uBAAgB,UAAU,CAAC,MAAM,CAAE,CACrB,CAAA;QAChB,IAAM,EAAE,GAAc,IAAI,CAAC,WAAW,EAAE,CAAA;QACxC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,EAAE,EAAE,kBAAkB,CAAC,EAA9B,CAA8B,CAAC,CAAA;QACjE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAA,CAAC,4BAA4B;IACjD,CAAC;IAED,4BAAM,GAAN;QACU,IAAA,UAAU,GAAK,IAAI,CAAC,KAAK,WAAf,CAAe;QACjC,OAAO,CACL,gCAAK,SAAS,EAAC,iBAAiB,EAAC,EAAE,EAAE,sBAAe,UAAU,CAAC,MAAM,CAAE,YACpE,IAAI,CAAC,QAAQ,EAAE,GACZ,CACP,CAAA;IACH,CAAC;IAhDU,WAAW;QADvB,YAAQ;OACI,WAAW,CAiDvB;IAAD,kBAAC;CAAA,AAjDD,CAAiC,kBAAS,GAiDzC;AAjDY,kCAAW;AAmDxB,kBAAe,iBAAc,CAAA"}
+{"version":3,"file":"ToolOverlay.js","sourceRoot":"","sources":["../../../src/view/overlay/ToolOverlay.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA6D;AAC7D,sBAAkC;AAClC,2BAAgC;AAWhC;IAAiC,+BAAiB;IAAlD;;IAiDA,CAAC;IAhDC,yFAAyF;IACzF,+DAA+D;IAC/D,6DAA6D;IAC7D,6DAA6D;IAC7D,uCAAiB,GAAjB;QACE,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC1B,CAAC;IAED,wCAAkB,GAAlB;QACE,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC1B,CAAC;IAED;;OAEG;IACH,8BAAQ,GAAR;QACQ,IAAA,KAAuB,IAAI,CAAC,KAAK,EAA/B,IAAI,UAAA,EAAE,UAAU,gBAAe,CAAA;QAC/B,IAAA,eAAe,GAAK,UAAU,gBAAf,CAAe;QACtC,IAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC7B,IAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC;YAC7B,OAAA,IAAA,sBAAC,EAAC,CAAC,EAAE;gBACH,eAAe,iBAAA;gBACf,UAAU,YAAA;gBACV,EAAE,EAAE,IAAI,CAAC,QAAQ;aAClB,CAAC;QAJF,CAIE,CACH,CAAA;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,uCAAiB,GAAjB;QACQ,IAAA,KAAuB,IAAI,CAAC,KAAK,EAA/B,IAAI,UAAA,EAAE,UAAU,gBAAe,CAAA;QACvC,IAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAC/C,uBAAgB,UAAU,CAAC,MAAM,CAAE,CACrB,CAAA;QAChB,IAAM,EAAE,GAAc,IAAI,CAAC,WAAW,EAAE,CAAA;QACxC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,EAAE,EAAE,kBAAkB,CAAC,EAA9B,CAA8B,CAAC,CAAA;QACjE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAA,CAAC,4BAA4B;IACjD,CAAC;IAED,4BAAM,GAAN;QACU,IAAA,UAAU,GAAK,IAAI,CAAC,KAAK,WAAf,CAAe;QACjC,OAAO,CACL,gCAAK,SAAS,EAAC,iBAAiB,EAAC,EAAE,EAAE,sBAAe,UAAU,CAAC,MAAM,CAAE,YACpE,IAAI,CAAC,QAAQ,EAAE,GACZ,CACP,CAAA;IACH,CAAC;IAhDU,WAAW;QADvB,YAAQ;OACI,WAAW,CAiDvB;IAAD,kBAAC;CAAA,AAjDD,CAAiC,kBAAS,GAiDzC;AAjDY,kCAAW;AAmDxB,kBAAe,iBAAc,CAAA"}

package/lib/view/text/BaseText.js

@@ -74,11 +74,14 @@ var BaseText = /** @class */ (function (_super) {
         };
         _this.dbClickHandler = function () {
             // 静默模式下，双击不更改状态，不可编辑
-            var editable = _this.props.editable;
+            var _a = _this.props, editable = _a.editable, eventCenter = _a.graphModel.eventCenter, model = _a.model;
             if (editable) {
-                var model = _this.props.model;
                 model.setElementState(constant_1.ElementState.TEXT_EDIT);
             }
+            eventCenter.emit(constant_1.EventType.TEXT_DBCLICK, {
+                data: model.text,
+                model: model,
+            });
         };
         var draggable = props.draggable;
         // TODO: 确认为什么不在 new 的时候传入 model，而在下面使用的时候赋值
@@ -86,6 +89,7 @@ var BaseText = /** @class */ (function (_super) {
             onDragging: _this.onDragging,
             step: 1,
             // model,
+            eventType: 'TEXT',
             isStopPropagation: draggable,
         });
         return _this;

package/lib/view/text/BaseText.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseText.js","sourceRoot":"","sources":["../../../src/view/text/BaseText.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseText.js","sourceRoot":"","sources":["../../../src/view/text/BaseText.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAmC;AACnC,wCAA6D;AAC7D,2CAAwD;AAExD,kCAA+B;AAC/B,mCAAkD;AAalD;IAGU,4BAAe;IAGvB,kBAAY,KAAQ;QAClB,YAAA,MAAK,WAAE,SAAA;QAkDT,sBAAgB,GAAG,UAAC,CAAa;YACzB,IAAA,KAAmC,KAAI,CAAC,KAAK,EAA3C,SAAS,eAAA,EAAE,KAAK,WAAA,EAAE,UAAU,gBAAe,CAAA;YAE9B,IAAA,iBAAiB,GAClC,UAAU,kCADwB,CACxB;YAEd,IAAI,SAAS,IAAI,iBAAiB,EAAE,CAAC;gBACnC,KAAI,CAAC,WAAW,CAAC,KAAK,GAAG,KAAK,CAAA;gBAC9B,KAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACrC,CAAC;QACH,CAAC,CAAA;QAED,gBAAU,GAAG,UAAC,EAA+B;gBAA7B,MAAM,YAAA,EAAE,MAAM,YAAA;YACtB,IAAA,KAGF,KAAI,CAAC,KAAK,EAFZ,KAAK,WAAA,EACS,cAAc,+BAChB,CAAA;YAEd,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBACf,IAAA,KAAA,OAAyB,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,IAAA,EAAjE,SAAS,QAAA,EAAE,SAAS,QAA6C,CAAA;gBACxE,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;YACtC,CAAC;QACH,CAAC,CAAA;QAED,oBAAc,GAAG;YACf,qBAAqB;YACf,IAAA,KAIF,KAAI,CAAC,KAAK,EAHZ,QAAQ,cAAA,EACM,WAAW,4BAAA,EACzB,KAAK,WACO,CAAA;YACd,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,CAAC,eAAe,CAAC,uBAAY,CAAC,SAAS,CAAC,CAAA;YAC/C,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,oBAAS,CAAC,YAAY,EAAE;gBACvC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,OAAA;aACN,CAAC,CAAA;QACJ,CAAC,CAAA;QAvFS,IAAA,SAAS,GAAK,KAAK,UAAV,CAAU;QAC3B,4CAA4C;QAC5C,KAAI,CAAC,WAAW,GAAG,IAAI,eAAQ,CAAC;YAC9B,UAAU,EAAE,KAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,CAAC;YACP,SAAS;YACT,SAAS,EAAE,MAAM;YACjB,iBAAiB,EAAE,SAAS;SAC7B,CAAC,CAAA;;IACJ,CAAC;IAED,2BAAQ,GAAR;QACQ,IAAA,KAAwB,IAAI,CAAC,KAAK,EAAhC,KAAK,WAAA,EAAE,UAAU,gBAAe,CAAA;QAChC,IAAA,eAAe,GAAK,UAAU,gBAAf,CAAe;QAEpC,IAAA,KACE,KAAK,KADmC,EAAlC,KAAK,WAAA,EAAE,CAAC,OAAA,EAAE,CAAC,OAAA,EAAE,QAAQ,cAAA,EAAE,SAAS,eAAE,CACnC;QACT,IAAM,IAAI,GAAG;YACX,CAAC,GAAA;YACD,CAAC,GAAA;YACD,SAAS,EAAE,EAAE;YACb,KAAK,OAAA;SACN,CAAA;QACD,gCAAgC;QAChC,+BAA+B;QAC/B,kBAAkB;QAClB,wCAAwC;QACxC,+DAA+D;QAC/D,0CAA0C;QAC1C,WAAW;QACX,yCAAyC;QACzC,IAAI;QACJ,IAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAA;QAClC,IAAM,WAAW,GAAG,eAAe,CAAC,iBAAiB,IAAI,SAAS,CAAA;QAElE,OAAO,CACL,uBAAC,YAAI,eACC,IAAI,EACJ,KAAK,IACT,SAAS,EAAE,IAAA,oBAAU,EAAC;gBACpB,iBAAiB,EAAE,QAAQ;gBAC3B,mBAAmB,EAAE,CAAC,QAAQ,IAAI,WAAW;gBAC7C,kBAAkB,EAAE,CAAC,QAAQ,IAAI,CAAC,WAAW;aAC9C,CAAC,EACF,KAAK,EAAE,KAAK,IACZ,CACH,CAAA;IACH,CAAC;IA0CD,yBAAM,GAAN;QAEa,IAAA,IAAI,GACX,IAAI,CAAC,KAAK,WADC,CACD;QACd,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CACL,8BAAG,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,cAAc,YACnE,IAAI,CAAC,QAAQ,EAAE,GACd,CACL,CAAA;QACH,CAAC;IACH,CAAC;IACH,eAAC;AAAD,CAAC,AA7GD,CAGU,kBAAS,GA0GlB;AA7GY,4BAAQ;AA+GrB,kBAAe,QAAQ,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/core",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "description": "LogicFlow, help you quickly create flowcharts",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/LogicFlow.tsx

@@ -6,7 +6,7 @@ import * as _Model from './model'
 import {
   BaseEdgeModel,
   BaseNodeModel,
-  EditConfigInterface,
+  IEditConfigType,
   GraphModel,
   SnaplineModel,
   ZoomParamType,
@@ -16,11 +16,10 @@ import Graph from './view/Graph'
 import * as _View from './view'
 import { formatData } from './util'
 
-import Dnd from './view/behavior/dnd'
-import Tool from './tool/tool'
-import { snapline } from './tool'
-import Keyboard from './keyboard'
+import { Dnd, snapline } from './view/behavior'
+import Tool from './tool'
 import History from './history'
+import Keyboard from './keyboard'
 import { EventCallback, CallbackArgs, EventArgs } from './event/eventEmitter'
 import { ElementType, EventType, SegmentDirection } from './constant'
 import { initDefaultShortcut } from './keyboard/shortcut'
@@ -698,8 +697,8 @@ export class LogicFlow {
     distance = 40,
   ): GraphElements | undefined {
     // TODO: 1. 解决下面方法中 distance 传参缺未使用的问题；该方法在快捷键中有调用
-    console.log('addElements', nodes, edges, distance)
     // TODO: 2. review 一下本函数代码逻辑，确认 nodeIdMap 的作用，看是否有优化的空间
+    console.log('distance', distance)
     const nodeIdMap: Record<string, string> = {}
     const elements: GraphElements = {
       nodes: [],
@@ -708,11 +707,9 @@ export class LogicFlow {
     forEach(nodes, (node) => {
       const nodeId = node.id
       const nodeModel = this.addNode(node)
-
       if (nodeId) nodeIdMap[nodeId] = nodeModel.id
       elements.nodes.push(nodeModel)
     })
-
     forEach(edges, (edge) => {
       let { sourceNodeId, targetNodeId } = edge
       if (nodeIdMap[sourceNodeId]) sourceNodeId = nodeIdMap[sourceNodeId]
@@ -890,7 +887,7 @@ export class LogicFlow {
    * @param {object} config 编辑配置
    * @see todo docs link
    */
-  updateEditConfig(config: EditConfigInterface) {
+  updateEditConfig(config: Partial<IEditConfigType>) {
     const { editConfigModel, transformModel } = this.graphModel
     editConfigModel.updateEditConfig(config)
     if (config?.stopMoveGraph !== undefined) {
@@ -1074,6 +1071,7 @@ export class LogicFlow {
     )
     this.emit(EventType.GRAPH_RENDERED, {
       data: this.graphModel.modelToGraphData(),
+      graphModel: this.graphModel,
     })
   }
 
@@ -1324,7 +1322,7 @@ export class LogicFlow {
       ([, extension]) => extension,
     )
     // 安装插件，优先使用个性插件
-    const extensions = [...extensionsAddByUse, ...this.plugins]
+    const extensions = [...this.plugins, ...extensionsAddByUse]
     forEach(extensions, (ext) => {
       let extension: ExtensionConstructor | ExtensionDefinition
       let props: Record<string, any> | undefined
@@ -1362,15 +1360,18 @@ export class LogicFlow {
     }
 
     const ExtensionCtor = extension as ExtensionConstructor
+    const pluginName = ExtensionCtor.pluginName
     const extensionIns = new ExtensionCtor({
       lf: this,
       LogicFlow,
       props,
-      options: this.options.pluginsOptions ?? {},
+      // TODO: 这里的 options 应该传入插件对应的 options，而不是全局的 options
+      // 所以应该这么写 this.options.pluginsOptions[ExtensionCtor.pluginName] ?? {}
+      options: this.options.pluginsOptions?.[pluginName] ?? {},
     })
     extensionIns.render &&
       this.components.push(extensionIns.render.bind(extensionIns))
-    this.extension[ExtensionCtor.pluginName] = extensionIns
+    this.extension[pluginName] = extensionIns
   }
 }
 
@@ -1442,9 +1443,48 @@ export namespace LogicFlow {
     y: number
     editable?: boolean
     draggable?: boolean
+    // 直接在这儿设置文本模式
     // overflowMode?: 'default' | 'autoWrap' | 'ellipsis'
   }
 
+  // label数据类型声明
+  export type LabelConfig = {
+    id?: string // label唯一标识
+    x: number
+    y: number
+    content?: string // 富文本内容
+    value: string // 纯文本内容
+    rotate?: number // 旋转角度
+    // 样式属性
+    style?: h.JSX.CSSProperties // label自定义样式
+
+    // 编辑状态属性
+    editable?: boolean
+    draggable?: boolean
+    labelWidth?: number
+    textOverflowMode?: 'ellipsis' | 'wrap' | 'clip' | 'nowrap' | 'default'
+
+    // 当前 Label 是否渲染纵向文本
+    vertical?: boolean
+  }
+
+  export type LabelOption = {
+    // 节点的所有 Label 是否纵向展示
+    isVertical: boolean
+    // 是否支持多个 label
+    isMultiple: boolean
+    // 允许设置多个 label 时最大个数
+    maxCount?: number
+  }
+
+  export interface LabelData extends LabelConfig {
+    id: string
+    x: number
+    y: number
+    content: string
+    value: string
+  }
+
   export type AppendConfig = {
     startIndex: number
     endIndex: number
@@ -1507,7 +1547,6 @@ export namespace LogicFlow {
   export interface NodeData extends NodeConfig {
     id: string
     text?: TextConfig
-
     [key: string]: unknown
   }
 
@@ -1519,7 +1558,6 @@ export namespace LogicFlow {
     sourceAnchorId?: string
     targetNodeId: string
     targetAnchorId?: string
-
     startPoint?: Point
     endPoint?: Point
     text?: TextConfig | string

package/src/algorithm/edge.ts

@@ -1,4 +1,5 @@
 import LogicFlow from '../LogicFlow'
+
 import Point = LogicFlow.Point
 
 /**

package/src/algorithm/index.ts

@@ -1,4 +1,6 @@
 // 各类算法的实现
+export * from './outline'
+export * from './edge'
 
 /*
  * 计算垂直边的与起始点有一定距离对称，边垂直于边的点

package/src/algorithm/outline.ts

@@ -1,11 +1,11 @@
 import { ModelType } from '../constant'
 import {
   Model,
-  PolylineEdgeModel,
-  BezierEdgeModel,
   BaseNodeModel,
   BaseEdgeModel,
   LineEdgeModel,
+  BezierEdgeModel,
+  PolylineEdgeModel,
 } from '../model'
 import { points2PointsList, getBBoxOfPoints, getBezierPoints } from '../util'
 

package/src/common/drag.ts

@@ -23,7 +23,14 @@ export type ICreateDragParams = {
 }
 
 export type IStepperDragProps = {
-  eventType?: 'NODE' | 'BLANK' | 'SELECTION' | 'ADJUST_POINT' | ''
+  eventType?:
+    | 'NODE'
+    | 'BLANK'
+    | 'SELECTION'
+    | 'ADJUST_POINT'
+    | 'TEXT'
+    | 'LABEL'
+    | ''
   eventCenter?: EventEmitter
   model?: Model.BaseModel
   data?: Record<string, unknown>
@@ -41,7 +48,14 @@ export class StepperDrag {
 
   step: number
   isStopPropagation: boolean
-  eventType: 'NODE' | 'BLANK' | 'SELECTION' | 'ADJUST_POINT' | ''
+  eventType:
+    | 'NODE'
+    | 'BLANK'
+    | 'SELECTION'
+    | 'ADJUST_POINT'
+    | 'TEXT'
+    | 'LABEL'
+    | ''
   eventCenter?: EventEmitter
   model?: Model.BaseModel
   data?: Record<string, unknown>

package/src/constant/index.ts

@@ -109,9 +109,45 @@ export enum EventType {
   SELECTION_CONTEXTMENU = 'selection:contextmenu',
   CONNECTION_NOT_ALLOWED = 'connection:not-allowed',
 
+  // Text events
+  TEXT_MOUSEDOWN = 'text:mousedown',
+  TEXT_DRAGSTART = 'text:dragstart',
+  TEXT_DRAG = 'text:drag',
+  TEXT_DROP = 'text:drop',
+  TEXT_CLICK = 'text:click',
+  TEXT_DBCLICK = 'text:dbclick',
+  TEXT_BLUR = 'text:blur',
+  TEXT_MOUSEMOVE = 'text:mousemove',
+  TEXT_MOUSEUP = 'text:mouseup',
+  TEXT_FOCUS = 'text:focus',
+  TEXT_ADD = 'text:add',
+  TEXT_UPDATE = 'text:update',
+  TEXT_CLEAR = 'text:clear',
+
+  // label events
+  LABEL_MOUSEDOWN = 'label:mousedown',
+  LABEL_DRAGSTART = 'label:dragstart',
+  LABEL_DRAG = 'label:drag',
+  LABEL_DROP = 'label:drop',
+  LABEL_CLICK = 'label:click',
+  LABEL_DBCLICK = 'label:dbclick',
+  LABEL_BLUR = 'label:blur',
+  LABEL_MOUSEMOVE = 'label:mousemove',
+  LABEL_MOUSEUP = 'label:mouseup',
+  LABEL_FOCUS = 'label:focus',
+  LABEL_ADD = 'label:add',
+  LABEL_UPDATE = 'label:update',
+  LABEL_CLEAR = 'label:clear',
+  LABEL_DELETE = 'label:delete',
+  LABEL_SHOULD_ADD = 'label:should-add',
+  LABEL_BATCH_ADD = 'label:batch-add',
+  LABEL_SHOULD_UPDATE = 'label:should-update',
+  LABEL_SHOULD_DELETE = 'label:should-delete',
+  LABEL_BATCH_DELETE = 'label:batch-delete',
+  LABEL_NOT_ALLOWED_ADD = 'label:not-allowed-add',
+
   // Other events
   HISTORY_CHANGE = 'history:change',
-  TEXT_UPDATE = 'text:update',
   GRAPH_TRANSFORM = 'graph:transform',
   GRAPH_RENDERED = 'graph:rendered',
   GRAPH_UPDATED = 'graph:updated',
@@ -126,3 +162,8 @@ export enum SegmentDirection {
   HORIZONTAL = 'horizontal',
   VERTICAL = 'vertical',
 }
+
+export enum TextMode {
+  TEXT = 'text',
+  LABEL = 'label',
+}

package/src/event/eventArgs.ts

@@ -1,8 +1,8 @@
-import {
-  LogicFlow,
+import LogicFlow, {
   BaseNodeModel,
   BaseEdgeModel,
   Model,
+  GraphModel,
   TransformData,
   TransformType,
 } from '..'
@@ -24,12 +24,29 @@ type ClickEventArgs = {
   isMultiple: boolean
 }
 
-type NodeEventArgsPick<T extends 'data' | 'e' | 'position'> = Pick<
+type NodeEventArgsPick<
+  T extends
+    | 'preData'
+    | 'data'
+    | 'model'
+    | 'e'
+    | 'position'
+    | 'deltaX'
+    | 'deltaY',
+> = Pick<
   {
+    /**
+     * 上一个状态的节点数据
+     */
+    preData: NodeData
     /**
      * 节点数据
      */
     data: NodeData
+    /**
+     * 节点 model
+     */
+    model: BaseNodeModel
     /**
      * 原生鼠标事件对象
      */
@@ -38,6 +55,35 @@ type NodeEventArgsPick<T extends 'data' | 'e' | 'position'> = Pick<
      * 鼠标触发点相对于画布左上角的坐标
      */
     position: ClientPosition
+    /**
+     * 鼠标 X轴移动的距离
+     */
+    deltaX: number
+    /**
+     * 鼠标Y轴移动的距离
+     */
+    deltaY: number
+  },
+  T
+>
+
+type TextEventArgsPick<
+  T extends 'data' | 'e' | 'model' | 'element' | 'position',
+> = Pick<
+  {
+    // 节点数据
+    data?: any
+    // 原生鼠标事件对象
+    e?: MouseEvent | FocusEvent
+    // 文本所在元素model
+    model?: BaseNodeModel | BaseEdgeModel | unknown
+    // 文本dom
+    element?: HTMLElement | null
+    // 文本位置
+    position?: {
+      x: number
+      y: number
+    }
   },
   T
 >
@@ -65,7 +111,7 @@ interface NodeEventArgs {
   /**
    * 鼠标移动节点
    */
-  'node:mousemove': NodeEventArgsPick<'data' | 'e'>
+  'node:mousemove': NodeEventArgsPick<'data' | 'e' | 'deltaX' | 'deltaY'>
   /**
    * 鼠标进入节点
    */
@@ -97,7 +143,7 @@ interface NodeEventArgs {
   /**
    * 拖拽节点
    */
-  'node:drag': NodeEventArgsPick<'data' | 'e'>
+  'node:drag': NodeEventArgsPick<'data' | 'e' | 'deltaX' | 'deltaY'>
   /**
    * 拖拽节点结束
    */
@@ -106,6 +152,14 @@ interface NodeEventArgs {
    * 右键点击节点
    */
   'node:contextmenu': NodeEventArgsPick<'data' | 'e' | 'position'>
+  /**
+   * 节点旋转
+   */
+  'node:rotate': NodeEventArgsPick<'data' | 'e' | 'model'>
+  /**
+   * 节点缩放
+   */
+  'node:resize': NodeEventArgsPick<'preData' | 'data' | 'model'>
 }
 
 type EdgeEventArgsPick<T extends 'data' | 'e' | 'position'> = Pick<
@@ -179,6 +233,88 @@ interface EdgeEventArgs {
   }
 }
 
+/**
+ * 文本事件
+ */
+interface TextEventArgs {
+  // 鼠标按下文本
+  'text:mousedown': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 开始拖拽文本
+  'text:dragstart': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本拖拽
+  'text:drag': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本拖拽结束
+  'text:drop': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本单击
+  'text:click': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本双击
+  'text:dbclick': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本失焦
+  'text:blur': TextEventArgsPick<'data' | 'e' | 'model' | 'element'>
+  // 鼠标移动文本
+  'text:mousemove': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 鼠标抬起
+  'text:mouseup': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本获焦
+  'text:focus': TextEventArgsPick<'data' | 'e' | 'model' | 'element'>
+  // 文本新增
+  'text:add': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本更新
+  'text:update': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本清空
+  'text:clear': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本删除
+  'text:delete': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 不允许增加文本
+  'text:not-allowed-add': TextEventArgsPick<'data' | 'e' | 'model'>
+}
+
+/**
+ * label插件文本事件
+ */
+interface TextEventArgs {
+  // 鼠标按下文本
+  'label:mousedown': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 开始拖拽文本
+  'label:dragstart': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本拖拽
+  'label:drag': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本拖拽结束
+  'label:drop': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本单击
+  'label:click': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本双击
+  'label:dbclick': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本失焦
+  'label:blur': TextEventArgsPick<'data' | 'e' | 'model' | 'element'>
+  // 鼠标移动文本
+  'label:mousemove': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 鼠标抬起
+  'label:mouseup': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本获焦
+  'label:focus': TextEventArgsPick<'data' | 'e' | 'model' | 'element'>
+  // 文本新增
+  'label:add': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本更新
+  'label:update': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本清空
+  'label:clear': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本删除
+  'label:delete': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本新增
+  'label:should-add': TextEventArgsPick<'data' | 'e' | 'model' | 'position'>
+  // 文本批量新增
+  'label:batch-add': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本更新
+  'label:should-update': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本删除
+  'label:should-delete': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 文本批量删除
+  'label:batch-delete': TextEventArgsPick<'data' | 'e' | 'model'>
+  // 不允许增加文本
+  'label:not-allowed-add': TextEventArgsPick<'data' | 'e' | 'model'>
+}
+
 /**
  * 连线事件
  */
@@ -240,26 +376,6 @@ interface CommonEventArgs {
       properties: Record<string, any>
     }
   }
-  /**
-   * 节点/边的文本更新
-   */
-  // TODO: 更新文本事件抛出的对象是否需要更详细？
-  'text:update': {
-    data: {
-      /**
-       * 更新的文本
-       */
-      text: string
-      /**
-       * 节点/边的 id
-       */
-      id: string
-      /**
-       * 节点/边的类型
-       */
-      type: string
-    }
-  }
   /**
    * 进行画布平移或缩放等变化操作时触发
    */
@@ -281,6 +397,10 @@ interface CommonEventArgs {
      * 渲染后的画布数据
      */
     data: GraphData
+    /**
+     * 渲染后的画布 model
+     */
+    graphModel: GraphModel
   }
   /**
    * 画布重新更新后触发. 即 lf.render(graphData)方法被调用后或者改变画布（garphModel）上的属性后触发。
@@ -471,12 +591,13 @@ interface SelectionEventArgs {
   'selection:contextmenu': SelectionEventArgsPick<'data' | 'e' | 'position'>
 }
 
-export interface EventArgs
-  extends NodeEventArgs,
-    EdgeEventArgs,
-    ConnectionEventArgs,
-    CommonEventArgs,
-    AnchorEventArgs,
-    BlankEventArgs,
-    HistoryEventArgs,
-    SelectionEventArgs {}
+// 此处主要是对事件参数进行聚合
+export type EventArgs = NodeEventArgs &
+  EdgeEventArgs &
+  ConnectionEventArgs &
+  CommonEventArgs &
+  AnchorEventArgs &
+  BlankEventArgs &
+  HistoryEventArgs &
+  SelectionEventArgs &
+  TextEventArgs

package/src/index.ts

@@ -10,10 +10,14 @@ export function observer<P>(props: P) {
 
 export { LogicFlow, h, createRef, Component, LogicFlowUtil }
 
+export * from './util'
+export * from './tool'
 export * from './view'
 export * from './model'
 export * from './options'
 export * from './keyboard'
+export * from './constant'
+export * from './algorithm'
 export { ElementState, ModelType, ElementType, EventType } from './constant'
 
 export { formatAnchorConnectValidateData } from './util/node'