@logicflow/core 1.2.0-next.2 → 1.2.0-next.4

package/dist/logic-flow.js

@@ -20659,7 +20659,7 @@ var EditConfigModel_EditConfigModel = (_class = /*#__PURE__*/function () {
   enumerable: true,
   writable: true,
   initializer: function initializer() {
-    return true;
+    return false;
   }
 }), _applyDecoratedDescriptor(_class.prototype, "updateEditConfig", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(_class.prototype, "updateEditConfig"), _class.prototype)), _class);
 
@@ -27305,18 +27305,10 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
         var nodeAsTarget = this.edges[i].targetNodeId === nodeId;
 
         if (nodeAsSource) {
-          // edgeModel.updateStartPoint({
-          //   x: edgeModel.startPoint.x + deltaX,
-          //   y: edgeModel.startPoint.y + deltaY,
-          // });
           edgeModel.moveStartPoint(deltaX, deltaY);
         }
 
         if (nodeAsTarget) {
-          // edgeModel.updateEndPoint({
-          //   x: edgeModel.endPoint.x + deltaX,
-          //   y: edgeModel.endPoint.y + deltaY,
-          // });
           edgeModel.moveEndPoint(deltaX, deltaY);
         } // 如果有文案了，当节点移动引起文案位置修改时，找出当前文案位置与最新边距离最短距离的点
         // 最大程度保持节点位置不变且在边上
@@ -27552,9 +27544,43 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
       var _this2 = this;
 
       var isIgnoreRule = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-      nodeIds.forEach(function (nodeId) {
-        return _this2.moveNode(nodeId, deltaX, deltaY, isIgnoreRule);
-      });
+      // FIX: https://github.com/didi/LogicFlow/issues/1015
+      // 如果节点之间存在连线，则只移动连线一次。
+      var nodeIdMap = nodeIds.reduce(function (acc, cur) {
+        var nodeModel = _this2.nodesMap[cur].model;
+        var moveDistance = nodeModel.getMoveDistance(deltaX, deltaY, isIgnoreRule);
+        acc[cur] = moveDistance;
+        return acc;
+      }, {});
+
+      for (var i = 0; i < this.edges.length; i++) {
+        var edgeModel = this.edges[i];
+        var sourceMoveDistance = nodeIdMap[edgeModel.sourceNodeId];
+        var textDistanceX = void 0;
+        var textDistanceY = void 0;
+
+        if (sourceMoveDistance) {
+          var _sourceMoveDistance = GraphModel_slicedToArray(sourceMoveDistance, 2);
+
+          textDistanceX = _sourceMoveDistance[0];
+          textDistanceY = _sourceMoveDistance[1];
+          edgeModel.moveStartPoint(textDistanceX, textDistanceY);
+        }
+
+        var targetMoveDistance = nodeIdMap[edgeModel.sourceNodeId];
+
+        if (targetMoveDistance) {
+          var _targetMoveDistance = GraphModel_slicedToArray(targetMoveDistance, 2);
+
+          textDistanceX = _targetMoveDistance[0];
+          textDistanceY = _targetMoveDistance[1];
+          edgeModel.moveEndPoint(textDistanceX, textDistanceY);
+        }
+
+        if (sourceMoveDistance || targetMoveDistance) {
+          edgeModel.moveText(textDistanceX, textDistanceY);
+        }
+      }
     }
     /**
      * 添加节点移动限制规则，在节点移动的时候触发。
@@ -33486,7 +33512,9 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
       var eventOptions = {
         data: nodeData,
         e: e,
-        position: position
+        position: position,
+        isSelected: false,
+        isMultiple: false
       };
       var isRightClick = e.button === 2; // 这里 IE 11不能正确显示
 
@@ -33495,10 +33523,15 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
       if (isRightClick) return;
       var editConfigModel = graphModel.editConfigModel; // 在multipleSelect tool禁用的情况下，允许取消选中节点
 
-      if (model.isSelected && !isDoubleClick && isMultipleSelect(e, editConfigModel)) {
+      var isMultiple = isMultipleSelect(e, editConfigModel);
+      eventOptions.isMultiple = isMultiple;
+
+      if (model.isSelected && !isDoubleClick && isMultiple) {
+        eventOptions.isSelected = false;
         model.setSelected(false);
       } else {
-        graphModel.selectNodeById(model.id, isMultipleSelect(e, editConfigModel));
+        graphModel.selectNodeById(model.id, isMultiple);
+        eventOptions.isSelected = true;
 
         _this.toFront();
       } // 不是双击的，默认都是单击
@@ -34867,9 +34900,9 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
         endX: x,
         endY: y,
         dragging: true
-      });
+      }); // 拖拽AdjustPoint时不修改edgeModel.isHitable，避免偶尔会出现边不能点击问题(https://github.com/didi/LogicFlow/issues/974)
+      // edgeModel.isHitable = false;
 
-      edgeModel.isHitable = false;
     });
 
     AdjustPoint_defineProperty(AdjustPoint_assertThisInitialized(_this), "onDragging", function (_ref) {
@@ -34970,8 +35003,9 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
         var _this$props3 = _this.props,
             graphModel = _this$props3.graphModel,
             edgeModel = _this$props3.edgeModel,
-            type = _this$props3.type;
-        edgeModel.isHitable = true;
+            type = _this$props3.type; // 拖拽AdjustPoint时不修改edgeModel.isHitable，避免偶尔会出现边不能点击问题(https://github.com/didi/LogicFlow/issues/974)
+        // edgeModel.isHitable = true;
+
         var _this$state2 = _this.state,
             endX = _this$state2.endX,
             endY = _this$state2.endY,
@@ -35279,6 +35313,8 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
 
     BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "clickTimer", void 0);
 
+    BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "textRef", Object(preact_module["f" /* createRef */])());
+
     BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "handleHover", function (hovered, ev) {
       var _this$props = _this.props,
           model = _this$props.model,
@@ -35296,11 +35332,16 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
       // ! hover多次触发, onMouseOver + onMouseEnter
       var isHovered = _this.props.model.isHovered;
       if (isHovered) return;
+      _this.textRef && _this.textRef.current.setHoverON();
 
       _this.handleHover(true, ev);
     });
 
     BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "setHoverOFF", function (ev) {
+      var isHovered = _this.props.model.isHovered;
+      if (!isHovered) return;
+      _this.textRef && _this.textRef.current.setHoverOFF();
+
       _this.handleHover(false, ev);
     });
 
@@ -35452,6 +35493,7 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
       }
 
       return Object(preact_module["g" /* h */])(LineText_LineText, {
+        ref: this.textRef,
         editable: editConfigModel.edgeTextEdit && model.text.editable,
         model: model,
         graphModel: graphModel,