@logicflow/core 1.1.29 → 1.1.31

package/dist/logic-flow.js

@@ -22413,7 +22413,7 @@ var defaultTheme = {
     stroke: 'red',
     strokeDasharray: '10 10',
     strokeDashoffset: '100%',
-    animationName: 'dash',
+    animationName: 'lf_animate_dash',
     animationDuration: '20s',
     animationIterationCount: 'infinite',
     animationTimingFunction: 'linear',
@@ -22712,6 +22712,11 @@ var isMultipleSelect = function isMultipleSelect(e, editConfigModel) {
       isMultiple = e.shiftKey;
       break;
 
+    case 'ctrl':
+      isMultiple = e.ctrlKey; // Mac上ctrl + 点击节点会触发上下文菜单，所以ctrl尽量用在非Mac系统
+
+      break;
+
     default:
       isMultiple = false;
       break;
@@ -24797,7 +24802,7 @@ var PolylineEdgeModel_PolylineEdgeModel = (PolylineEdgeModel_class = /*#__PURE__
         });
       }
 
-      this.updatePointsAfterDrage(draginngPointList);
+      this.updatePointsAfterDrag(draginngPointList);
       this.draginngPointList = draginngPointList;
       this.setText(Object.assign({}, this.text, this.textPosition));
       return {
@@ -24872,10 +24877,9 @@ var PolylineEdgeModel_PolylineEdgeModel = (PolylineEdgeModel_class = /*#__PURE__
           }
         }
 
-        draginngPointList = pointFilter(draginngPointList);
-        this.updatePointsAfterDrage(draginngPointList); // step3: 调整到对应外框的位置后，执行updatePointsAfterDrage，找到当前线段和图形的准确交点
+        this.updatePointsAfterDrag(draginngPointList); // step3: 调整到对应外框的位置后，执行updatePointsAfterDrag，找到当前线段和图形的准确交点
 
-        this.draginngPointList = draginngPointList;
+        this.draggingPointList = draginngPointList;
       } else if (direction === SegmentDirection.VERTICAL) {
         // 垂直，仅调整x坐标， 与水平调整同理
         pointsList[startIndex] = {
@@ -24923,9 +24927,8 @@ var PolylineEdgeModel_PolylineEdgeModel = (PolylineEdgeModel_class = /*#__PURE__
           }
         }
 
-        _draginngPointList = pointFilter(_draginngPointList);
-        this.updatePointsAfterDrage(_draginngPointList);
-        this.draginngPointList = _draginngPointList;
+        this.updatePointsAfterDrag(_draginngPointList);
+        this.draggingPointList = _draginngPointList;
       }
 
       this.setText(Object.assign({}, this.text, this.textPosition));
@@ -24941,7 +24944,7 @@ var PolylineEdgeModel_PolylineEdgeModel = (PolylineEdgeModel_class = /*#__PURE__
     key: "dragAppendEnd",
     value: function dragAppendEnd() {
       if (this.draginngPointList) {
-        var pointsList = points2PointsList(this.points); // 更新pointsList，重新渲染appendWidth
+        var pointsList = pointFilter(points2PointsList(this.points)); // 更新pointsList，重新渲染appendWidth
 
         this.pointsList = pointsList.map(function (i) {
           return i;
@@ -24963,8 +24966,8 @@ var PolylineEdgeModel_PolylineEdgeModel = (PolylineEdgeModel_class = /*#__PURE__
     */
 
   }, {
-    key: "updatePointsAfterDrage",
-    value: function updatePointsAfterDrage(pointsList) {
+    key: "updatePointsAfterDrag",
+    value: function updatePointsAfterDrag(pointsList) {
       // 找到准确的连接点后,更新points, 更新边，同时更新依赖points的箭头
       var list = this.updateCrossPoints(pointsList);
       this.points = list.map(function (point) {
@@ -25010,7 +25013,7 @@ var PolylineEdgeModel_PolylineEdgeModel = (PolylineEdgeModel_class = /*#__PURE__
   enumerable: true,
   writable: true,
   initializer: null
-}), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "initPoints", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "initPoints"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updatePoints", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updatePoints"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updateStartPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updateStartPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "moveStartPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "moveStartPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updateEndPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updateEndPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "moveEndPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "moveEndPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppendStart", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppendStart"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppendSimple", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppendSimple"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppend", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppend"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppendEnd", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppendEnd"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updatePointsAfterDrage", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updatePointsAfterDrage"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "getAdjustStart", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "getAdjustStart"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "getAdjustEnd", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "getAdjustEnd"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updateAfterAdjustStartAndEnd", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updateAfterAdjustStartAndEnd"), PolylineEdgeModel_class.prototype)), PolylineEdgeModel_class);
+}), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "initPoints", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "initPoints"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updatePoints", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updatePoints"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updateStartPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updateStartPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "moveStartPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "moveStartPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updateEndPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updateEndPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "moveEndPoint", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "moveEndPoint"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppendStart", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppendStart"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppendSimple", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppendSimple"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppend", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppend"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "dragAppendEnd", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "dragAppendEnd"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updatePointsAfterDrag", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updatePointsAfterDrag"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "getAdjustStart", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "getAdjustStart"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "getAdjustEnd", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "getAdjustEnd"), PolylineEdgeModel_class.prototype), PolylineEdgeModel_applyDecoratedDescriptor(PolylineEdgeModel_class.prototype, "updateAfterAdjustStartAndEnd", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(PolylineEdgeModel_class.prototype, "updateAfterAdjustStartAndEnd"), PolylineEdgeModel_class.prototype)), PolylineEdgeModel_class);
 
 // CONCATENATED MODULE: ./src/algorithm/index.ts
 // 各类算法的实现
@@ -26525,8 +26528,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
         return a.zIndex - b.zIndex;
       }); // 只显示可见区域的节点和边
 
-      var showElements = [];
-      var topElementIdx = -1; // todo: 缓存, 优化计算效率
+      var showElements = []; // todo: 缓存, 优化计算效率
 
       var visibleLt = [-VisibleMoreSpace, -VisibleMoreSpace];
       var visibleRb = [this.width + VisibleMoreSpace, this.height + VisibleMoreSpace];
@@ -26535,20 +26537,10 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
         var currentItem = elements[i]; // 如果节点不在可见区域，且不是全元素显示模式，则隐藏节点。
 
         if (currentItem.visible && (!this.partial || currentItem.isSelected || this.isElementInArea(currentItem, visibleLt, visibleRb, false, false))) {
-          if (currentItem.zIndex === ElementMaxzIndex) {
-            topElementIdx = showElements.length;
-          }
-
           showElements.push(currentItem);
         }
       }
 
-      if (topElementIdx !== -1) {
-        var lastElement = showElements[showElements.length - 1];
-        showElements[showElements.length - 1] = showElements[topElementIdx];
-        showElements[topElementIdx] = lastElement;
-      }
-
       return showElements;
     }
     /**
@@ -29512,7 +29504,7 @@ var Graph_Graph = src_observer(Graph_class = /*#__PURE__*/function (_Component)
         graphModel: graphModel
       }), adjustEdge ? Object(preact_module["g" /* h */])(BezierAdjustOverlay_BezierAdjustOverlay, {
         graphModel: graphModel
-      }) : '', !options.isSilentMode && options.snapline !== false ? Object(preact_module["g" /* h */])(SnaplineOverlay_SnaplineOverlay, {
+      }) : '', options.snapline !== false ? Object(preact_module["g" /* h */])(SnaplineOverlay_SnaplineOverlay, {
         snaplineModel: snaplineModel
       }) : ''), Object(preact_module["g" /* h */])(ToolOverlay_ToolOverlay, {
         graphModel: graphModel,
@@ -29637,7 +29629,8 @@ var DnD_Dnd = /*#__PURE__*/function () {
       var nodeData = currentNode.getData();
 
       _this.lf.graphModel.eventCenter.emit(EventType.NODE_DND_ADD, {
-        data: nodeData
+        data: nodeData,
+        e: e
       });
     });
 
@@ -35334,7 +35327,7 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
       _this.toFront();
     });
 
-    BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "getIsDraging", function () {
+    BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "getIsDragging", function () {
       return false;
     });
 
@@ -35416,7 +35409,7 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
 
       return Object(preact_module["g" /* h */])("g", null, Object(preact_module["g" /* h */])("defs", null, Object(preact_module["g" /* h */])("marker", {
         id: "marker-start-".concat(id),
-        refX: refX,
+        refX: -refX,
         refY: refY,
         overflow: "visible",
         orient: "auto",
@@ -35519,7 +35512,7 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
           isSelected = _this$props8$model.isSelected,
           isHitable = _this$props8$model.isHitable,
           graphModel = _this$props8.graphModel;
-      var isDraging = this.getIsDraging();
+      var isDragging = this.getIsDragging();
       var adjustEdgeStartAndEnd = graphModel.editConfigModel.adjustEdgeStartAndEnd,
           animation = graphModel.animation; // performance 只允许出现一条edge有动画
 
@@ -35532,7 +35525,7 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
         onMouseOver: this.setHoverON,
         onMouseEnter: this.setHoverON,
         onMouseLeave: this.setHoverOFF
-      }, this.getShape(), this.getAppend(), isShowAnimation && this.getAnimation(), this.getText(), this.getArrow()), adjustEdgeStartAndEnd && isSelected && !isDraging ? this.getAdjustPoints() : '');
+      }, this.getShape(), this.getAppend(), isShowAnimation && this.getAnimation(), this.getText(), this.getArrow()), adjustEdgeStartAndEnd && isSelected && !isDragging ? this.getAdjustPoints() : '');
     }
   }]);
 
@@ -35953,7 +35946,7 @@ var PolylineEdge_PolylineEdge = /*#__PURE__*/function (_BaseEdge) {
       _this.appendInfo = appendInfo;
     });
 
-    PolylineEdge_defineProperty(PolylineEdge_assertThisInitialized(_this), "getIsDraging", function () {
+    PolylineEdge_defineProperty(PolylineEdge_assertThisInitialized(_this), "getIsDragging", function () {
       return _this.isDraging;
     });
 
@@ -37119,18 +37112,17 @@ var TextEditTool_TextEdit = src_observer(TextEditTool_class = (_temp = _class2 =
 
 
       var graphModel = this.props.graphModel;
-      var eventCenter = graphModel.eventCenter,
-          _graphModel$editConfi = graphModel.editConfigModel,
-          edgeTextEdit = _graphModel$editConfi.edgeTextEdit,
-          nodeTextEdit = _graphModel$editConfi.nodeTextEdit;
+      var eventCenter = graphModel.eventCenter;
+      eventCenter.on("".concat(EventType.GRAPH_TRANSFORM, ",").concat(EventType.NODE_CLICK, ",").concat(EventType.BLANK_CLICK, " "), function () {
+        var textEditElement = graphModel.textEditElement,
+            _graphModel$editConfi = graphModel.editConfigModel,
+            edgeTextEdit = _graphModel$editConfi.edgeTextEdit,
+            nodeTextEdit = _graphModel$editConfi.nodeTextEdit; // fix #826, 保留之前的文本可以编辑点击空白才设置为不可编辑。如果以后有其他需求再改。
 
-      if (edgeTextEdit || nodeTextEdit) {
-        eventCenter.on("".concat(EventType.GRAPH_TRANSFORM, ",").concat(EventType.NODE_CLICK, ",").concat(EventType.BLANK_CLICK, " "), function () {
-          if (graphModel.textEditElement) {
-            graphModel.textEditElement.setElementState(ElementState.DEFAULT);
-          }
-        });
-      }
+        if ((edgeTextEdit || nodeTextEdit) && textEditElement) {
+          graphModel.textEditElement.setElementState(ElementState.DEFAULT);
+        }
+      });
     }
   }, {
     key: "componentDidUpdate",
@@ -38008,7 +38000,7 @@ var LogicFlow_LogicFlow = /*#__PURE__*/function () {
       keyboard: options.keyboard
     }); // 不可编辑模式没有开启，且没有关闭对齐线
 
-    if (!options.isSilentMode && options.snapline !== false) {
+    if (options.snapline !== false) {
       this.snaplineModel = new SnaplineModel_SnaplineModel(this.graphModel);
       snaplineTool(this.graphModel.eventCenter, this.snaplineModel);
     } // 先初始化默认内置快捷键
@@ -38216,15 +38208,17 @@ var LogicFlow_LogicFlow = /*#__PURE__*/function () {
      * 将图形选中
      * @param id 选择元素ID
      * @param multiple 是否允许多选，如果为true，不会将上一个选中的元素重置
+     * @param toFront 是否将选中的元素置顶，默认为true
      */
 
   }, {
     key: "selectElementById",
     value: function selectElementById(id) {
       var multiple = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      var toFront = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       this.graphModel.selectElementById(id, multiple);
 
-      if (!multiple) {
+      if (!multiple && toFront) {
         this.graphModel.toFront(id);
       }
     }
@@ -38751,10 +38745,13 @@ var LogicFlow_LogicFlow = /*#__PURE__*/function () {
       edges.forEach(function (edge) {
         var sourceId = edge.sourceNodeId;
         var targetId = edge.targetNodeId;
-        if (nodeIdMap[sourceId]) edge.sourceNodeId = nodeIdMap[sourceId];
-        if (nodeIdMap[targetId]) edge.targetNodeId = nodeIdMap[targetId];
+        if (nodeIdMap[sourceId]) sourceId = nodeIdMap[sourceId];
+        if (nodeIdMap[targetId]) targetId = nodeIdMap[targetId];
 
-        var edgeModel = _this3.graphModel.addEdge(edge);
+        var edgeModel = _this3.graphModel.addEdge(LogicFlow_objectSpread(LogicFlow_objectSpread({}, edge), {}, {
+          sourceNodeId: sourceId,
+          targetNodeId: targetId
+        }));
 
         elements.edges.push(edgeModel);
       });
@@ -39210,7 +39207,7 @@ var LogicFlow_LogicFlow = /*#__PURE__*/function () {
     value: function renderRawData(graphRawData) {
       this.graphModel.graphDataToModel(formatData(graphRawData));
 
-      if (!this.options.isSilentMode && this.options.history !== false) {
+      if (this.options.history !== false) {
         this.history.watch(this.graphModel);
       }