@logicflow/core 1.1.26 → 1.1.27

package/dist/logic-flow.js

@@ -23276,7 +23276,8 @@ var node_getCrossPointWithPolyone = function getCrossPointWithPolyone(point, dir
 }; // 规范节点初始化数据
 
 var node_pickNodeConfig = function pickNodeConfig(data) {
-  var nodeData = lodash_es_pick(data, ['id', 'type', 'x', 'y', 'text', 'properties']);
+  var nodeData = lodash_es_pick(data, ['id', 'type', 'x', 'y', 'text', 'properties', 'virtual' // 区域节点是否为dnd添加的虚拟节点
+  ]);
   return nodeData;
 };
 /**
@@ -27110,9 +27111,10 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
 
       if (!Model) {
         throw new Error("\u627E\u4E0D\u5230".concat(nodeOriginData.type, "\u5BF9\u5E94\u7684\u8282\u70B9\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u5DF2\u6CE8\u518C\u6B64\u7C7B\u578B\u8282\u70B9\u3002"));
-      } // TODO 元素的 model 不应该直接可以操作 graphModel 的属性，但可以调方法
-
+      }
 
+      nodeOriginData.x = snapToGrid(nodeOriginData.x, this.gridSize);
+      nodeOriginData.y = snapToGrid(nodeOriginData.y, this.gridSize);
       var nodeModel = new Model(nodeOriginData, this);
       this.nodes.push(nodeModel);
       var nodeData = nodeModel.getData();
@@ -33382,7 +33384,7 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
 
       var time = new Date().getTime() - _this.startTime;
 
-      if (time > 200) return; // 事件大于200ms，认为是拖拽。
+      if (time > 200) return; // 事件大于200ms，认为是拖拽, 不触发click事件。
 
       var _this$props3 = _this.props,
           model = _this$props3.model,
@@ -33448,9 +33450,6 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
       var _this$props5 = _this.props,
           model = _this$props5.model,
           graphModel = _this$props5.graphModel;
-
-      _this.toFront();
-
       _this.startTime = new Date().getTime();
       var editConfigModel = graphModel.editConfigModel;
 
@@ -33664,7 +33663,7 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
         nodeShape = Object(preact_module["g" /* h */])("g", {
           className: this.getStateClassName(),
           onMouseDown: this.handleMouseDown,
-          onMouseUp: this.handleClick,
+          onClick: this.handleClick,
           onMouseEnter: this.setHoverON,
           onMouseOver: this.setHoverON,
           onMouseLeave: this.setHoverOFF,
@@ -35357,72 +35356,70 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
   }, {
     key: "getArrow",
     value: function getArrow() {
-      return Object(preact_module["g" /* h */])("g", null, Object(preact_module["g" /* h */])("defs", null, this.getStartArrow(), this.getEndArrow()));
-    }
-  }, {
-    key: "getStartArrow",
-    value: function getStartArrow() {
-      var _this$props6 = this.props,
-          model = _this$props6.model,
-          graphModel = _this$props6.graphModel;
-      var id = model.id;
-      var arrow = graphModel.theme.arrow;
-      var offset = arrow.offset,
-          verticalLength = arrow.verticalLength;
+      var id = this.props.model.id;
 
       var _this$getArrowStyle = this.getArrowStyle(),
-          stroke = _this$getArrowStyle.stroke,
-          strokeWidth = _this$getArrowStyle.strokeWidth;
+          _this$getArrowStyle$r = _this$getArrowStyle.refY,
+          refY = _this$getArrowStyle$r === void 0 ? 0 : _this$getArrowStyle$r,
+          _this$getArrowStyle$r2 = _this$getArrowStyle.refX,
+          refX = _this$getArrowStyle$r2 === void 0 ? 2 : _this$getArrowStyle$r2;
 
-      return Object(preact_module["g" /* h */])("marker", {
+      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: "-1",
+        refX: refX,
+        refY: refY,
         overflow: "visible",
         orient: "auto",
         markerUnits: "userSpaceOnUse"
-      }, Object(preact_module["g" /* h */])("path", {
+      }, this.getStartArrow()), Object(preact_module["g" /* h */])("marker", {
+        id: "marker-end-".concat(id),
+        refX: refX,
+        refY: refY,
+        overflow: "visible",
+        orient: "auto",
+        markerUnits: "userSpaceOnUse"
+      }, this.getEndArrow())));
+    }
+  }, {
+    key: "getStartArrow",
+    value: function getStartArrow() {
+      var _this$getArrowStyle2 = this.getArrowStyle(),
+          stroke = _this$getArrowStyle2.stroke,
+          strokeWidth = _this$getArrowStyle2.strokeWidth,
+          offset = _this$getArrowStyle2.offset,
+          verticalLength = _this$getArrowStyle2.verticalLength;
+
+      return Object(preact_module["g" /* h */])("path", {
         stroke: stroke,
         fill: stroke,
         strokeWidth: strokeWidth,
         d: "M 0 0 L ".concat(offset, " -").concat(verticalLength, " L ").concat(offset, " ").concat(verticalLength, " Z")
-      }));
+      });
     }
   }, {
     key: "getEndArrow",
     value: function getEndArrow() {
-      var _this$props7 = this.props,
-          model = _this$props7.model,
-          graphModel = _this$props7.graphModel;
-      var id = model.id;
-      var arrow = graphModel.theme.arrow;
-      var offset = arrow.offset,
-          verticalLength = arrow.verticalLength;
-
-      var _this$getArrowStyle2 = this.getArrowStyle(),
-          stroke = _this$getArrowStyle2.stroke,
-          strokeWidth = _this$getArrowStyle2.strokeWidth;
+      var _this$getArrowStyle3 = this.getArrowStyle(),
+          stroke = _this$getArrowStyle3.stroke,
+          strokeWidth = _this$getArrowStyle3.strokeWidth,
+          offset = _this$getArrowStyle3.offset,
+          verticalLength = _this$getArrowStyle3.verticalLength;
 
-      return Object(preact_module["g" /* h */])("marker", {
-        id: "marker-end-".concat(id),
-        refX: "-1",
-        overflow: "visible",
-        orient: "auto",
-        markerUnits: "userSpaceOnUse"
-      }, Object(preact_module["g" /* h */])("path", {
+      return Object(preact_module["g" /* h */])("path", {
         stroke: stroke,
         fill: stroke,
         strokeWidth: strokeWidth,
         transform: "rotate(180)",
         d: "M 0 0 L ".concat(offset, " -").concat(verticalLength, " L ").concat(offset, " ").concat(verticalLength, " Z")
-      }));
+      });
     } // 起点终点，可以修改起点/终点为其他节点
 
   }, {
     key: "getAdjustPoints",
     value: function getAdjustPoints() {
-      var _this$props8 = this.props,
-          model = _this$props8.model,
-          graphModel = _this$props8.graphModel;
+      var _this$props6 = this.props,
+          model = _this$props6.model,
+          graphModel = _this$props6.graphModel;
       var start = model.getAdjustStart();
       var end = model.getAdjustEnd();
       return Object(preact_module["g" /* h */])("g", null, Object(preact_module["g" /* h */])(AdjustPoint_AdjustPoint, BaseEdge_extends({
@@ -35455,9 +35452,9 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
   }, {
     key: "toFront",
     value: function toFront() {
-      var _this$props9 = this.props,
-          graphModel = _this$props9.graphModel,
-          model = _this$props9.model;
+      var _this$props7 = this.props,
+          graphModel = _this$props7.graphModel,
+          model = _this$props7.model;
       var overlapMode = graphModel.overlapMode;
 
       if (overlapMode !== OverlapMode.INCREASE) {
@@ -35467,11 +35464,11 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props10 = this.props,
-          _this$props10$model = _this$props10.model,
-          isSelected = _this$props10$model.isSelected,
-          isHitable = _this$props10$model.isHitable,
-          graphModel = _this$props10.graphModel;
+      var _this$props8 = this.props,
+          _this$props8$model = _this$props8.model,
+          isSelected = _this$props8$model.isSelected,
+          isHitable = _this$props8$model.isHitable,
+          graphModel = _this$props8.graphModel;
       var isDraging = this.getIsDraging();
       var adjustEdgeStartAndEnd = graphModel.editConfigModel.adjustEdgeStartAndEnd,
           animation = graphModel.animation; // performance 只允许出现一条edge有动画
@@ -37030,7 +37027,7 @@ var TextEditTool_TextEdit = src_observer(TextEditTool_class = (_temp = _class2 =
     });
 
     TextEditTool_defineProperty(TextEditTool_assertThisInitialized(_this), "keyupHandler", function (ev) {
-      var textEditElement = _this.props.graphModel.textEditElement;
+      var textEditElement = _this.props.graphModel.textEditElement; // 按下alt+enter表示输入完成
 
       if (ev.key === 'Enter' && ev.altKey) {
         textEditElement.setElementState(0);
@@ -37133,6 +37130,7 @@ var TextEditTool_TextEdit = src_observer(TextEditTool_class = (_temp = _class2 =
         key: textEditElement.id,
         onKeyUp: this.keyupHandler,
         onKeyDown: this.keydownHandler,
+        onKeyPress: this.keydownHandler,
         onInput: this.inputHandler
       }, (_textEditElement$text = textEditElement.text) === null || _textEditElement$text === void 0 ? void 0 : _textEditElement$text.value) : null;
     }