@logicflow/core 2.0.10 → 2.0.11

package/es/LogicFlow.js

@@ -1176,12 +1176,19 @@ var LogicFlow = /** @class */ (function () {
     };
     /** 销毁当前实例 */
     LogicFlow.prototype.destroy = function () {
+        var _a;
         this.clearData();
         render(null, this.container);
         this.keyboard.destroy();
         this.graphModel.destroy();
         this.tool.destroy();
         this.history.destroy();
+        for (var extensionName in this.extension) {
+            var extensionInstance = this.extension[extensionName];
+            if ('destroy' in extensionInstance) {
+                (_a = extensionInstance.destroy) === null || _a === void 0 ? void 0 : _a.call(extensionInstance);
+            }
+        }
     };
     // 全局配置的插件，所有的LogicFlow示例都会使用
     LogicFlow.extensions = new Map();

package/es/model/edge/BezierEdgeModel.js

@@ -46,7 +46,7 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-import { assign, cloneDeep } from 'lodash-es';
+import { get, assign, cloneDeep } from 'lodash-es';
 import { action, observable } from 'mobx';
 import BaseEdgeModel from './BaseEdgeModel';
 import { ModelType } from '../../constant';
@@ -62,7 +62,7 @@ var BezierEdgeModel = /** @class */ (function (_super) {
         return _this;
     }
     BezierEdgeModel.prototype.initEdgeData = function (data) {
-        this.offset = 100;
+        this.offset = get(data, 'properties.offset', 100);
         _super.prototype.initEdgeData.call(this, data);
     };
     BezierEdgeModel.prototype.getEdgeStyle = function () {

package/es/model/edge/PolylineEdgeModel.js

@@ -55,7 +55,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { assign, cloneDeep } from 'lodash-es';
+import { get, assign, cloneDeep } from 'lodash-es';
 import { observable, action } from 'mobx';
 import { BaseEdgeModel } from '.';
 import { ModelType, SegmentDirection } from '../../constant';
@@ -69,7 +69,7 @@ var PolylineEdgeModel = /** @class */ (function (_super) {
         return _this;
     }
     PolylineEdgeModel.prototype.initEdgeData = function (data) {
-        this.offset = 30;
+        this.offset = get(data, 'properties.offset', 30);
         if (data.pointsList) {
             this.pointsList = data.pointsList;
         }

package/es/model/node/BaseNodeModel.js

@@ -645,6 +645,10 @@ var BaseNodeModel = /** @class */ (function () {
             this.text && this.moveText(0, deltaY);
             moveY = deltaY;
         }
+        this.transform = new TranslateMatrix(-this.x, -this.y)
+            .rotate(this.rotate)
+            .translate(this.x, this.y)
+            .toString();
         return [moveX, moveY];
     };
     BaseNodeModel.prototype.moveTo = function (x, y, isIgnoreRule) {

package/es/tool/index.js

@@ -50,7 +50,7 @@ var Tool = /** @class */ (function () {
             this.toolMap.delete(name);
             return true;
         }
-        throw new Error('禁用失败，不存在名为 ${tool} 的工具');
+        throw new Error("\u7981\u7528\u5931\u8D25\uFF0C\u4E0D\u5B58\u5728\u540D\u4E3A ".concat(tool, " \u7684\u5DE5\u5177"));
     };
     Tool.prototype.enableTool = function (name) {
         var tool = this.disabledToolMap.get(name);
@@ -59,7 +59,7 @@ var Tool = /** @class */ (function () {
             this.disabledToolMap.delete(name);
             return true;
         }
-        throw new Error('不存在名为 ${tool} 的工具');
+        throw new Error("\u4E0D\u5B58\u5728\u540D\u4E3A ".concat(tool, " \u7684\u5DE5\u5177"));
     };
     Tool.prototype.getTools = function () {
         return Array.from(this.toolMap.values());

package/es/util/node.d.ts

@@ -15,7 +15,7 @@ export type NodeContaint = {
 export declare const targetNodeInfo: (position: Point, graphModel: GraphModel) => NodeContaint;
 export declare const getClosestAnchor: (position: Point, node: BaseNodeModel) => AnchorInfo;
 export declare const distance: (x1: number, y1: number, x2: number, y2: number) => number;
-export declare const isInNode: (position: Point, node: BaseNodeModel) => boolean;
+export declare const isInNode: (position: Point, node: BaseNodeModel, offset?: number) => boolean;
 export declare const isInNodeBbox: (position: Point, node: BaseNodeModel) => boolean;
 export type NodeBBox = {
     x: number;

package/es/util/node.js

@@ -9,10 +9,27 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 import { pick } from 'lodash-es';
 import { getBytesLength } from './edge';
 import { SegmentDirection } from '../constant';
 import { isInSegment } from '../algorithm/edge';
+import { Matrix } from './matrix';
 /* 获取所有锚点 */
 export var getAnchors = function (data) {
     var anchors = data.anchors;
@@ -72,29 +89,28 @@ export var getClosestAnchor = function (position, node) {
 /* 两点之间距离 */
 export var distance = function (x1, y1, x2, y2) { return Math.hypot(x1 - x2, y1 - y2); };
 /* 是否在某个节点内，手否进行连接，有offset控制粒度，与outline有关，可以优化 */
-export var isInNode = function (position, node) {
+export var isInNode = function (position, node, offset) {
+    if (offset === void 0) { offset = 0; }
     var inNode = false;
-    var offset = 0;
     var bBox = getNodeBBox(node);
-    if (position.x >= bBox.minX - offset &&
-        position.x <= bBox.maxX + offset &&
-        position.y >= bBox.minY - offset &&
-        position.y <= bBox.maxY + offset) {
+    var _a = __read(new Matrix([position.x, position.y, 1])
+        .translate(-node.x, -node.y)
+        .rotate(-node.rotate)
+        .translate(node.x, node.y)[0], 2), x = _a[0], y = _a[1];
+    var reverseRotatedPosition = {
+        x: x,
+        y: y,
+    };
+    if (reverseRotatedPosition.x >= bBox.minX - offset &&
+        reverseRotatedPosition.x <= bBox.maxX + offset &&
+        reverseRotatedPosition.y >= bBox.minY - offset &&
+        reverseRotatedPosition.y <= bBox.maxY + offset) {
         inNode = true;
     }
     return inNode;
 };
 export var isInNodeBbox = function (position, node) {
-    var inNode = false;
-    var offset = 5;
-    var bBox = getNodeBBox(node);
-    if (position.x >= bBox.minX - offset &&
-        position.x <= bBox.maxX + offset &&
-        position.y >= bBox.minY - offset &&
-        position.y <= bBox.maxY + offset) {
-        inNode = true;
-    }
-    return inNode;
+    return isInNode(position, node, 5);
 };
 /* 获取节点bbox */
 export var getNodeBBox = function (node) {

package/es/view/node/BaseNode.js

@@ -58,7 +58,7 @@ import { map } from 'lodash-es';
 import Anchor from '../Anchor';
 import { BaseText } from '../text';
 import { ElementState, EventType, TextMode } from '../../constant';
-import { StepDrag, snapToGrid, isIe, isMultipleSelect, cancelRaf, createRaf, TranslateMatrix,
+import { StepDrag, snapToGrid, isIe, isMultipleSelect, cancelRaf, createRaf,
 // RotateMatrix,
  } from '../../util';
 import RotateControlPoint from '../Rotate';
@@ -135,10 +135,6 @@ var BaseNode = /** @class */ (function (_super) {
             if (_this.t) {
                 cancelRaf(_this.t);
             }
-            model.transform = new TranslateMatrix(-x, -y)
-                .rotate(model.rotate)
-                .translate(x, y)
-                .toString();
             var moveNodes = selectNodes.map(function (node) { return node.id; });
             // 未被选中的节点也可以拖动
             if (moveNodes.indexOf(model.id) === -1) {

package/lib/LogicFlow.js

@@ -1205,12 +1205,19 @@ var LogicFlow = /** @class */ (function () {
     };
     /** 销毁当前实例 */
     LogicFlow.prototype.destroy = function () {
+        var _a;
         this.clearData();
         (0, compat_1.render)(null, this.container);
         this.keyboard.destroy();
         this.graphModel.destroy();
         this.tool.destroy();
         this.history.destroy();
+        for (var extensionName in this.extension) {
+            var extensionInstance = this.extension[extensionName];
+            if ('destroy' in extensionInstance) {
+                (_a = extensionInstance.destroy) === null || _a === void 0 ? void 0 : _a.call(extensionInstance);
+            }
+        }
     };
     // 全局配置的插件，所有的LogicFlow示例都会使用
     LogicFlow.extensions = new Map();

package/lib/model/edge/BezierEdgeModel.js

@@ -68,7 +68,7 @@ var BezierEdgeModel = /** @class */ (function (_super) {
         return _this;
     }
     BezierEdgeModel.prototype.initEdgeData = function (data) {
-        this.offset = 100;
+        this.offset = (0, lodash_es_1.get)(data, 'properties.offset', 100);
         _super.prototype.initEdgeData.call(this, data);
     };
     BezierEdgeModel.prototype.getEdgeStyle = function () {

package/lib/model/edge/PolylineEdgeModel.js

@@ -72,7 +72,7 @@ var PolylineEdgeModel = /** @class */ (function (_super) {
         return _this;
     }
     PolylineEdgeModel.prototype.initEdgeData = function (data) {
-        this.offset = 30;
+        this.offset = (0, lodash_es_1.get)(data, 'properties.offset', 30);
         if (data.pointsList) {
             this.pointsList = data.pointsList;
         }

package/lib/model/node/BaseNodeModel.js

@@ -648,6 +648,10 @@ var BaseNodeModel = /** @class */ (function () {
             this.text && this.moveText(0, deltaY);
             moveY = deltaY;
         }
+        this.transform = new util_1.TranslateMatrix(-this.x, -this.y)
+            .rotate(this.rotate)
+            .translate(this.x, this.y)
+            .toString();
         return [moveX, moveY];
     };
     BaseNodeModel.prototype.moveTo = function (x, y, isIgnoreRule) {

package/lib/tool/index.js

@@ -56,7 +56,7 @@ var Tool = /** @class */ (function () {
             this.toolMap.delete(name);
             return true;
         }
-        throw new Error('禁用失败，不存在名为 ${tool} 的工具');
+        throw new Error("\u7981\u7528\u5931\u8D25\uFF0C\u4E0D\u5B58\u5728\u540D\u4E3A ".concat(tool, " \u7684\u5DE5\u5177"));
     };
     Tool.prototype.enableTool = function (name) {
         var tool = this.disabledToolMap.get(name);
@@ -65,7 +65,7 @@ var Tool = /** @class */ (function () {
             this.disabledToolMap.delete(name);
             return true;
         }
-        throw new Error('不存在名为 ${tool} 的工具');
+        throw new Error("\u4E0D\u5B58\u5728\u540D\u4E3A ".concat(tool, " \u7684\u5DE5\u5177"));
     };
     Tool.prototype.getTools = function () {
         return Array.from(this.toolMap.values());

package/lib/util/node.d.ts

@@ -15,7 +15,7 @@ export type NodeContaint = {
 export declare const targetNodeInfo: (position: Point, graphModel: GraphModel) => NodeContaint;
 export declare const getClosestAnchor: (position: Point, node: BaseNodeModel) => AnchorInfo;
 export declare const distance: (x1: number, y1: number, x2: number, y2: number) => number;
-export declare const isInNode: (position: Point, node: BaseNodeModel) => boolean;
+export declare const isInNode: (position: Point, node: BaseNodeModel, offset?: number) => boolean;
 export declare const isInNodeBbox: (position: Point, node: BaseNodeModel) => boolean;
 export type NodeBBox = {
     x: number;

package/lib/util/node.js

@@ -10,12 +10,29 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatAnchorConnectValidateData = exports.getSvgTextWidthHeight = exports.getHtmlTextHeight = exports.getNodeAnchorPosition = exports.pickNodeConfig = exports.getCrossPointWithPolygon = exports.getCrossPointWithEllipse = exports.inStraightLineOfRect = exports.pointEdgeDirection = exports.getCrossPointWithCircle = exports.getClosestRadiusCenter = exports.getRectRadiusCircle = exports.getNodeBBox = exports.isInNodeBbox = exports.isInNode = exports.distance = exports.getClosestAnchor = exports.targetNodeInfo = exports.getAnchors = void 0;
 var lodash_es_1 = require("lodash-es");
 var edge_1 = require("./edge");
 var constant_1 = require("../constant");
 var edge_2 = require("../algorithm/edge");
+var matrix_1 = require("./matrix");
 /* 获取所有锚点 */
 var getAnchors = function (data) {
     var anchors = data.anchors;
@@ -79,30 +96,29 @@ exports.getClosestAnchor = getClosestAnchor;
 var distance = function (x1, y1, x2, y2) { return Math.hypot(x1 - x2, y1 - y2); };
 exports.distance = distance;
 /* 是否在某个节点内，手否进行连接，有offset控制粒度，与outline有关，可以优化 */
-var isInNode = function (position, node) {
+var isInNode = function (position, node, offset) {
+    if (offset === void 0) { offset = 0; }
     var inNode = false;
-    var offset = 0;
     var bBox = (0, exports.getNodeBBox)(node);
-    if (position.x >= bBox.minX - offset &&
-        position.x <= bBox.maxX + offset &&
-        position.y >= bBox.minY - offset &&
-        position.y <= bBox.maxY + offset) {
+    var _a = __read(new matrix_1.Matrix([position.x, position.y, 1])
+        .translate(-node.x, -node.y)
+        .rotate(-node.rotate)
+        .translate(node.x, node.y)[0], 2), x = _a[0], y = _a[1];
+    var reverseRotatedPosition = {
+        x: x,
+        y: y,
+    };
+    if (reverseRotatedPosition.x >= bBox.minX - offset &&
+        reverseRotatedPosition.x <= bBox.maxX + offset &&
+        reverseRotatedPosition.y >= bBox.minY - offset &&
+        reverseRotatedPosition.y <= bBox.maxY + offset) {
         inNode = true;
     }
     return inNode;
 };
 exports.isInNode = isInNode;
 var isInNodeBbox = function (position, node) {
-    var inNode = false;
-    var offset = 5;
-    var bBox = (0, exports.getNodeBBox)(node);
-    if (position.x >= bBox.minX - offset &&
-        position.x <= bBox.maxX + offset &&
-        position.y >= bBox.minY - offset &&
-        position.y <= bBox.maxY + offset) {
-        inNode = true;
-    }
-    return inNode;
+    return (0, exports.isInNode)(position, node, 5);
 };
 exports.isInNodeBbox = isInNodeBbox;
 /* 获取节点bbox */

package/lib/view/node/BaseNode.js

@@ -139,10 +139,6 @@ var BaseNode = /** @class */ (function (_super) {
             if (_this.t) {
                 (0, util_1.cancelRaf)(_this.t);
             }
-            model.transform = new util_1.TranslateMatrix(-x, -y)
-                .rotate(model.rotate)
-                .translate(x, y)
-                .toString();
             var moveNodes = selectNodes.map(function (node) { return node.id; });
             // 未被选中的节点也可以拖动
             if (moveNodes.indexOf(model.id) === -1) {

package/package.json

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

package/src/LogicFlow.tsx

@@ -1391,6 +1391,12 @@ export class LogicFlow {
     this.graphModel.destroy()
     this.tool.destroy()
     this.history.destroy()
+    for (const extensionName in this.extension) {
+      const extensionInstance = this.extension[extensionName]
+      if ('destroy' in extensionInstance) {
+        extensionInstance.destroy?.()
+      }
+    }
   }
 }
 

package/src/model/edge/BezierEdgeModel.ts

@@ -1,4 +1,4 @@
-import { assign, cloneDeep } from 'lodash-es'
+import { get, assign, cloneDeep } from 'lodash-es'
 import { action, observable } from 'mobx'
 import BaseEdgeModel from './BaseEdgeModel'
 import { BaseNodeModel } from '../node'
@@ -21,7 +21,7 @@ export class BezierEdgeModel extends BaseEdgeModel {
     this.setAttributes()
   }
   initEdgeData(data: EdgeConfig): void {
-    this.offset = 100
+    this.offset = get(data, 'properties.offset', 100)
     super.initEdgeData(data)
   }
   getEdgeStyle() {

package/src/model/edge/PolylineEdgeModel.ts

@@ -1,4 +1,4 @@
-import { assign, cloneDeep } from 'lodash-es'
+import { get, assign, cloneDeep } from 'lodash-es'
 import { observable, action } from 'mobx'
 import { BaseEdgeModel } from '.'
 import { BaseNodeModel, RectNodeModel, CircleNodeModel, Model } from '..'
@@ -34,7 +34,7 @@ export class PolylineEdgeModel extends BaseEdgeModel {
   @observable dbClickPosition?: Point
 
   initEdgeData(data: LogicFlow.EdgeConfig): void {
-    this.offset = 30
+    this.offset = get(data, 'properties.offset', 30)
     if (data.pointsList) {
       this.pointsList = data.pointsList
     }

package/src/model/node/BaseNodeModel.ts

@@ -740,6 +740,10 @@ export class BaseNodeModel<P extends PropertiesType = PropertiesType>
       this.text && this.moveText(0, deltaY)
       moveY = deltaY
     }
+    this.transform = new TranslateMatrix(-this.x, -this.y)
+      .rotate(this.rotate)
+      .translate(this.x, this.y)
+      .toString()
     return [moveX, moveY]
   }
 

package/src/tool/index.ts

@@ -70,7 +70,7 @@ export class Tool {
       this.toolMap.delete(name)
       return true
     }
-    throw new Error('禁用失败，不存在名为 ${tool} 的工具')
+    throw new Error(`禁用失败，不存在名为 ${tool} 的工具`)
   }
 
   @action
@@ -81,7 +81,7 @@ export class Tool {
       this.disabledToolMap.delete(name)
       return true
     }
-    throw new Error('不存在名为 ${tool} 的工具')
+    throw new Error(`不存在名为 ${tool} 的工具`)
   }
 
   getTools() {

package/src/util/node.ts

@@ -13,6 +13,7 @@ import {
 } from '../model'
 import { SegmentDirection } from '../constant'
 import { isInSegment } from '../algorithm/edge'
+import { Matrix } from './matrix'
 
 import Point = LogicFlow.Point
 import Direction = LogicFlow.Direction
@@ -112,33 +113,33 @@ export const distance = (
 ): number => Math.hypot(x1 - x2, y1 - y2)
 
 /* 是否在某个节点内，手否进行连接，有offset控制粒度，与outline有关，可以优化 */
-export const isInNode = (position: Point, node: BaseNodeModel): boolean => {
+export const isInNode = (
+  position: Point,
+  node: BaseNodeModel,
+  offset = 0,
+): boolean => {
   let inNode = false
-  const offset = 0
   const bBox = getNodeBBox(node)
+  const [x, y] = new Matrix([position.x, position.y, 1])
+    .translate(-node.x, -node.y)
+    .rotate(-node.rotate)
+    .translate(node.x, node.y)[0]
+  const reverseRotatedPosition = {
+    x,
+    y,
+  }
   if (
-    position.x >= bBox.minX - offset &&
-    position.x <= bBox.maxX + offset &&
-    position.y >= bBox.minY - offset &&
-    position.y <= bBox.maxY + offset
+    reverseRotatedPosition.x >= bBox.minX - offset &&
+    reverseRotatedPosition.x <= bBox.maxX + offset &&
+    reverseRotatedPosition.y >= bBox.minY - offset &&
+    reverseRotatedPosition.y <= bBox.maxY + offset
   ) {
     inNode = true
   }
   return inNode
 }
 export const isInNodeBbox = (position: Point, node: BaseNodeModel): boolean => {
-  let inNode = false
-  const offset = 5
-  const bBox = getNodeBBox(node)
-  if (
-    position.x >= bBox.minX - offset &&
-    position.x <= bBox.maxX + offset &&
-    position.y >= bBox.minY - offset &&
-    position.y <= bBox.maxY + offset
-  ) {
-    inNode = true
-  }
-  return inNode
+  return isInNode(position, node, 5)
 }
 
 export type NodeBBox = {

package/src/view/node/BaseNode.tsx

@@ -13,7 +13,6 @@ import {
   isMultipleSelect,
   cancelRaf,
   createRaf,
-  TranslateMatrix,
   IDragParams,
   // RotateMatrix,
 } from '../../util'
@@ -297,11 +296,6 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
       cancelRaf(this.t)
     }
 
-    model.transform = new TranslateMatrix(-x, -y)
-      .rotate(model.rotate)
-      .translate(x, y)
-      .toString()
-
     let moveNodes = selectNodes.map((node) => node.id)
     // 未被选中的节点也可以拖动
     if (moveNodes.indexOf(model.id) === -1) {