@logicflow/core 1.2.0-alpha.11 → 1.2.0-alpha.14

package/dist/logic-flow.js

@@ -11337,7 +11337,7 @@ module.exports.f = function (C) {
 /* 161 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.2.0-alpha.10\"}");
+module.exports = JSON.parse("{\"a\":\"1.2.0-alpha.13\"}");
 
 /***/ }),
 /* 162 */
@@ -22727,7 +22727,7 @@ var BaseEdgeModel_BaseEdgeModel = /*#__PURE__*/function () {
     BaseEdgeModel_defineProperty(this, "style", {});
 
     BaseEdgeModel_defineProperty(this, "arrowConfig", {
-      markerEnd: "url(#marker-end-".concat(this.id, ")"),
+      markerEnd: '',
       markerStart: ''
     });
 
@@ -22824,6 +22824,8 @@ var BaseEdgeModel_BaseEdgeModel = /*#__PURE__*/function () {
       if (overlapMode === OverlapMode.INCREASE) {
         this.zIndex = data.zIndex || getZIndex();
       }
+
+      this.arrowConfig.markerEnd = "url(#marker-end-".concat(this.id, ")");
     }
     /**
      * 设置model属性，每次properties发生变化会触发
@@ -24990,14 +24992,41 @@ var edge_getBezierControlPoints = function getBezierControlPoints(_ref) {
       sourceNode = _ref.sourceNode,
       targetNode = _ref.targetNode,
       offset = _ref.offset;
+  var nodeDistance = Math.max(Math.abs(sourceNode.x - targetNode.x), Math.abs(sourceNode.y - targetNode.y));
+  offset = offset || nodeDistance / 4;
   var sBBox = getNodeBBox(sourceNode);
   var tBBox = getNodeBBox(targetNode);
   var sExpendBBox = getExpandedBBox(sBBox, offset);
   var tExpendBBox = getExpandedBBox(tBBox, offset);
   var sDirection = edge_pointDirection(start, sourceNode);
+  var tDirection = edge_pointDirection(end, targetNode); // 1. 避免两个节点连出的多个连线重合。
+  // 2. 避免开始节点和结束节点方向相同时成为一个穿过节点的直线。
+
   var sNext = edge_getExpandedBBoxPoint(sExpendBBox, start, sDirection);
-  var tDirection = edge_pointDirection(end, targetNode);
-  var ePre = edge_getExpandedBBoxPoint(tExpendBBox, end, tDirection);
+  var ePre = edge_getExpandedBBoxPoint(tExpendBBox, end, tDirection); // 计算起点的调整点是否需要偏移
+  // 如果起点的调整点方向和连线方向相反，则添加偏移量
+  // 如果终点的调整点方向与连线方向
+
+  var randomNumberX = Math.ceil((Math.random() + 0.5) * offset);
+  var randomNumberY = Math.ceil((Math.random() + 0.5) * offset); // 如果是调整点在节点水平方向，那么调整的点Y需要向着另一个节点的方向进行一定随机量的偏移。
+  // 如果是调整点在节点垂直方向，那么调整的点X需要向着另一个节点的方向进行一定随机量的偏移。
+
+  if (sDirection === SegmentDirection.HORIZONTAL) {
+    sNext.y += sourceNode.y >= targetNode.y ? randomNumberY : -randomNumberY;
+  }
+
+  if (sDirection === SegmentDirection.VERTICAL) {
+    sNext.x += sourceNode.x >= targetNode.x ? randomNumberX : -randomNumberX;
+  }
+
+  if (tDirection === SegmentDirection.HORIZONTAL) {
+    ePre.y += sourceNode.y > targetNode.y ? randomNumberY : -randomNumberY;
+  }
+
+  if (tDirection === SegmentDirection.VERTICAL) {
+    ePre.x += sourceNode.x > targetNode.x ? randomNumberX : -randomNumberX;
+  }
+
   return {
     sNext: sNext,
     ePre: ePre
@@ -28966,7 +28995,7 @@ var BezierEdgeModel_BezierEdgeModel = /*#__PURE__*/function (_BaseEdgeModel) {
   BezierEdgeModel_createClass(BezierEdgeModel, [{
     key: "initEdgeData",
     value: function initEdgeData(data) {
-      this.offset = 100;
+      this.offset = 0;
 
       BezierEdgeModel_get(BezierEdgeModel_getPrototypeOf(BezierEdgeModel.prototype), "initEdgeData", this).call(this, data);
     }
@@ -31404,7 +31433,9 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
           eventCenter = graphModel.eventCenter,
           width = graphModel.width,
           height = graphModel.height,
-          editConfigModel = graphModel.editConfigModel;
+          _graphModel$editConfi = graphModel.editConfigModel,
+          autoExpand = _graphModel$editConfi.autoExpand,
+          stopMoveGraph = _graphModel$editConfi.stopMoveGraph;
       var clientX = event.clientX,
           clientY = event.clientY;
 
@@ -31444,7 +31475,7 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
 
       _this.moveAnchorEnd(x1, y1);
 
-      if (nearBoundary.length > 0 && !editConfigModel.stopMoveGraph) {
+      if (nearBoundary.length > 0 && !stopMoveGraph && autoExpand) {
         _this.t = setInterval(function () {
           var _nearBoundary = nearBoundary,
               _nearBoundary2 = Anchor_slicedToArray(_nearBoundary, 2),
@@ -35479,7 +35510,11 @@ var History_History = /*#__PURE__*/function () {
 
     this.eventCenter = graphModel.eventCenter;
     var NODE_ADD = EventType.NODE_ADD,
+        NODE_DELETE = EventType.NODE_DELETE,
+        NODE_DND_ADD = EventType.NODE_DND_ADD,
         EDGE_ADD = EventType.EDGE_ADD,
+        EDGE_DELETE = EventType.EDGE_DELETE,
+        TEXT_UPDATE = EventType.TEXT_UPDATE,
         NODE_DROP = EventType.NODE_DROP,
         EDGE_ADJUST = EventType.EDGE_ADJUST,
         SELECTION_DROP = EventType.SELECTION_DROP,
@@ -35490,7 +35525,7 @@ var History_History = /*#__PURE__*/function () {
         NODE_PROPERTY_UPDATE = EventType.NODE_PROPERTY_UPDATE,
         EDGE_PROPERTY_UPDATE = EventType.EDGE_PROPERTY_UPDATE,
         HISTORY_INSERT = EventType.HISTORY_INSERT;
-    var historyChangeKeys = "\n      ".concat(NODE_ADD, ",\n      ").concat(EDGE_ADD, ",\n      ").concat(NODE_DROP, ",\n      ").concat(EDGE_ADJUST, ",\n      ").concat(SELECTION_DROP, ",\n      ").concat(TEXT_DROP, ",\n      ").concat(NODE_TEXT_UPDATE, ",\n      ").concat(EDGE_TEXT_UPDATE, ",\n      ").concat(GRAPH_RENDERED, "\n    ");
+    var historyChangeKeys = "\n      ".concat(NODE_ADD, ",\n      ").concat(EDGE_ADD, ",\n      ").concat(NODE_DELETE, ",\n      ").concat(NODE_DND_ADD, ",\n      ").concat(EDGE_DELETE, ",\n      ").concat(TEXT_UPDATE, ",\n      ").concat(NODE_DROP, ",\n      ").concat(EDGE_ADJUST, ",\n      ").concat(SELECTION_DROP, ",\n      ").concat(TEXT_DROP, ",\n      ").concat(NODE_TEXT_UPDATE, ",\n      ").concat(EDGE_TEXT_UPDATE, ",\n      ").concat(GRAPH_RENDERED, "\n    ");
 
     if (isPropertiesChangeHistory) {
       historyChangeKeys += ",".concat(NODE_PROPERTY_UPDATE, ",").concat(EDGE_PROPERTY_UPDATE);