@logicflow/core 1.2.0 → 1.2.2

package/README.md

@@ -1,7 +1,7 @@
 <p align="center">
-  <a href="http://logic-flow.org" target="_blank">
+  <a href="https://docs.logic-flow.cn" target="_blank">
     <img
-      src="http://logic-flow.org/new-logo.png"
+      src="https://docs.logic-flow.cn/docs/_images/logo.png"
       alt="LogicFlow logo"
       width="250"
     />
@@ -104,13 +104,10 @@ lf.render(data);
 
 ## 文档
 
-[官方文档](http://logic-flow.org)
+[官方文档](https://docs.logic-flow.cn)
 
-- [快速上手](http://logic-flow.org/guide/start.html#安装)
-- [基础教程](http://logic-flow.org/guide/basic/logic-flow.html)
-- [进阶指南](http://logic-flow.org/guide/advance/theme.html)
-- [拓展](http://logic-flow.org/guide/extension/extension-components.html)
-- [示例](http://logic-flow.org/usage/bpmn.html)
+- [快速上手](https://docs.logic-flow.cn/docs/#/zh/guide/start)
+- [示例](https://docs.logic-flow.cn/examples/#/gallery)
 
 ## 核心能力
 

package/dist/logic-flow.js

@@ -28396,17 +28396,18 @@ var ToolOverlay_ToolOverlay = src_observer(ToolOverlay_class = /*#__PURE__*/func
   }
 
   ToolOverlay_createClass(ToolOverlay, [{
+    key: "componentDidMount",
+    value: // 在react严格模式下，useEffect会执行两次，但是在LogicFlow内部，则只会触发一次componentDidMount和componentDidUpdate。
+    // 其中第一次componentDidMount对应的graphModel为被丢弃的graphModel, 所以不应该生效。
+    // 在非react环境下，只会触发一次componentDidMount，不会触发componentDidUpdate。
+    // 所以这里采用componentDidUpdate和componentDidMount都去触发插件的render方法。
+    function componentDidMount() {
+      this.triggerToolRender();
+    }
+  }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
-      var _this$props = this.props,
-          tool = _this$props.tool,
-          graphModel = _this$props.graphModel;
-      var ToolOverlayElement = document.querySelector("#ToolOverlay_".concat(graphModel.flowId));
-      var lf = tool.getInstance();
-      lf.components.forEach(function (render) {
-        return render(lf, ToolOverlayElement);
-      });
-      lf.components = []; // 保证extension组件的render只执行一次
+      this.triggerToolRender();
     }
     /**
      * 外部传入的一般是HTMLElement
@@ -28415,9 +28416,9 @@ var ToolOverlay_ToolOverlay = src_observer(ToolOverlay_class = /*#__PURE__*/func
   }, {
     key: "getTools",
     value: function getTools() {
-      var _this$props2 = this.props,
-          tool = _this$props2.tool,
-          graphModel = _this$props2.graphModel;
+      var _this$props = this.props,
+          tool = _this$props.tool,
+          graphModel = _this$props.graphModel;
       var tools = tool.getTools();
       var components = tools.map(function (item) {
         return Object(preact_module["g" /* h */])(item, {
@@ -28428,6 +28429,19 @@ var ToolOverlay_ToolOverlay = src_observer(ToolOverlay_class = /*#__PURE__*/func
       tool.components = components;
       return components;
     }
+  }, {
+    key: "triggerToolRender",
+    value: function triggerToolRender() {
+      var _this$props2 = this.props,
+          tool = _this$props2.tool,
+          graphModel = _this$props2.graphModel;
+      var ToolOverlayElement = document.querySelector("#ToolOverlay_".concat(graphModel.flowId));
+      var lf = tool.getInstance();
+      lf.components.forEach(function (render) {
+        return render(lf, ToolOverlayElement);
+      });
+      lf.components = []; // 保证extension组件的render只执行一次
+    }
   }, {
     key: "render",
     value: function render() {
@@ -35022,7 +35036,7 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
         y: endY
       }, graphModel); // 如果一定的坐标能够找到目标节点，预结算当前节点与目标节点的路径进行展示
 
-      if (info && info.node && _this.isAllowAdjust(info)) {
+      if (info && info.node && _this.isAllowAdjust(info).pass) {
         var params;
         var startPoint = edgeModel.startPoint,
             endPoint = edgeModel.endPoint,
@@ -35107,51 +35121,67 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
         var needRecoveryEdge = false;
         var createEdgeInfo;
 
-        if (info && info.node && _this.isAllowAdjust(info)) {
-          var _edgeData$text;
-
-          var edgeData = edgeModel.getData();
-          createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, edgeData), {}, {
-            sourceAnchorId: '',
-            targetAnchorId: '',
-            text: (edgeData === null || edgeData === void 0 ? void 0 : (_edgeData$text = edgeData.text) === null || _edgeData$text === void 0 ? void 0 : _edgeData$text.value) || ''
-          }); // 根据调整点是边的起点或重点，计算创建边需要的参数
-
-          if (type === AdjustType.SOURCE) {
-            var edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(info.node.id).getData(), graphModel.getNodeModelById(edgeModel.targetNodeId).getData(), createEdgeInfo);
-            createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, edgeInfo), {}, {
-              sourceNodeId: info.node.id,
-              sourceAnchorId: info.anchor.id,
-              startPoint: {
-                x: info.anchor.x,
-                y: info.anchor.y
-              },
-              targetNodeId: edgeModel.targetNodeId,
-              endPoint: AdjustPoint_objectSpread({}, edgeModel.endPoint)
-            }); // 找到的是原有的源节点上的原锚点时，还原边
-
-            if (edgeModel.sourceNodeId === info.node.id && edgeModel.sourceAnchorId === info.anchor.id) {
-              needRecoveryEdge = true;
-            }
-          } else if (type === AdjustType.TARGET) {
-            var _edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(edgeModel.sourceNodeId).getData(), graphModel.getNodeModelById(info.node.id).getData(), createEdgeInfo);
-
-            createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, _edgeInfo), {}, {
-              sourceNodeId: edgeModel.sourceNodeId,
-              startPoint: AdjustPoint_objectSpread({}, edgeModel.startPoint),
-              targetNodeId: info.node.id,
-              targetAnchorId: info.anchor.id,
-              endPoint: {
-                x: info.anchor.x,
-                y: info.anchor.y
+        if (info && info.node) {
+          var _this$isAllowAdjust = _this.isAllowAdjust(info),
+              pass = _this$isAllowAdjust.pass,
+              msg = _this$isAllowAdjust.msg,
+              newTargetNode = _this$isAllowAdjust.newTargetNode;
+
+          if (pass) {
+            var _edgeData$text;
+
+            var edgeData = edgeModel.getData();
+            createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, edgeData), {}, {
+              sourceAnchorId: '',
+              targetAnchorId: '',
+              text: (edgeData === null || edgeData === void 0 ? void 0 : (_edgeData$text = edgeData.text) === null || _edgeData$text === void 0 ? void 0 : _edgeData$text.value) || ''
+            }); // 根据调整点是边的起点或重点，计算创建边需要的参数
+
+            if (type === AdjustType.SOURCE) {
+              var edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(info.node.id).getData(), graphModel.getNodeModelById(edgeModel.targetNodeId).getData(), createEdgeInfo);
+              createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, edgeInfo), {}, {
+                sourceNodeId: info.node.id,
+                sourceAnchorId: info.anchor.id,
+                startPoint: {
+                  x: info.anchor.x,
+                  y: info.anchor.y
+                },
+                targetNodeId: edgeModel.targetNodeId,
+                endPoint: AdjustPoint_objectSpread({}, edgeModel.endPoint)
+              }); // 找到的是原有的源节点上的原锚点时，还原边
+
+              if (edgeModel.sourceNodeId === info.node.id && edgeModel.sourceAnchorId === info.anchor.id) {
+                needRecoveryEdge = true;
               }
-            }); // 找到的是原有的目标节点上的原锚点时，还原边
+            } else if (type === AdjustType.TARGET) {
+              var _edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(edgeModel.sourceNodeId).getData(), graphModel.getNodeModelById(info.node.id).getData(), createEdgeInfo);
+
+              createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, _edgeInfo), {}, {
+                sourceNodeId: edgeModel.sourceNodeId,
+                startPoint: AdjustPoint_objectSpread({}, edgeModel.startPoint),
+                targetNodeId: info.node.id,
+                targetAnchorId: info.anchor.id,
+                endPoint: {
+                  x: info.anchor.x,
+                  y: info.anchor.y
+                }
+              }); // 找到的是原有的目标节点上的原锚点时，还原边
 
-            if (edgeModel.targetNodeId === info.node.id && edgeModel.targetAnchorId === info.anchor.id) {
-              needRecoveryEdge = true;
+              if (edgeModel.targetNodeId === info.node.id && edgeModel.targetAnchorId === info.anchor.id) {
+                needRecoveryEdge = true;
+              }
             }
+          } else {
+            // 如果没有通过校验，还原边并抛出CONNECTION_NOT_ALLOWED事件
+            needRecoveryEdge = true;
+            var nodeData = newTargetNode.getData();
+            graphModel.eventCenter.emit(EventType.CONNECTION_NOT_ALLOWED, {
+              data: nodeData,
+              msg: msg
+            });
           }
         } else {
+          // 如果没有找到目标节点，还原边
           needRecoveryEdge = true;
         }
 
@@ -35169,7 +35199,7 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
             }
           });
         } else {
-          // 如果没有找到目标节点，还原边
+          // 如果没有找到目标节点或者没有通过校验，还原边
           _this.recoveryEdge();
         }
 
@@ -35271,7 +35301,11 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
       this.preTargetNode = info.node; // #500 不允许锚点自己连自己, 在锚点一开始连接的时候, 不触发自己连接自己的校验。
 
       if (newTargetAnchor.id === newSourceAnchor.id) {
-        return false;
+        return {
+          pass: false,
+          msg: '',
+          newTargetNode: newTargetNode
+        };
       }
 
       var targetInfoId = "".concat(newSourceNode.id, "_").concat(newTargetNode.id, "_").concat(newSourceAnchor.id, "_").concat(newTargetAnchor.id); // 查看鼠标是否进入过target，若有检验结果，表示进入过, 就不重复计算了。
@@ -35284,10 +35318,12 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
       }
 
       var _this$sourceRuleResul = this.sourceRuleResults.get(targetInfoId),
-          isSourcePass = _this$sourceRuleResul.isAllPass;
+          isSourcePass = _this$sourceRuleResul.isAllPass,
+          sourceMsg = _this$sourceRuleResul.msg;
 
       var _this$targetRuleResul = this.targetRuleResults.get(targetInfoId),
-          isTargetPass = _this$targetRuleResul.isAllPass; // 实时提示出即将连接的节点是否允许连接
+          isTargetPass = _this$targetRuleResul.isAllPass,
+          targetMsg = _this$targetRuleResul.msg; // 实时提示出即将连接的节点是否允许连接
 
 
       var state = isSourcePass && isTargetPass ? ElementState.ALLOW_CONNECT : ElementState.NOT_ALLOW_CONNECT;
@@ -35298,7 +35334,11 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
         newTargetNode.setElementState(state);
       }
 
-      return isSourcePass && isTargetPass;
+      return {
+        pass: isSourcePass && isTargetPass,
+        msg: targetMsg || sourceMsg,
+        newTargetNode: newTargetNode
+      };
     }
   }, {
     key: "render",
@@ -35306,12 +35346,13 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
       var _this$props6 = this.props,
           x = _this$props6.x,
           y = _this$props6.y,
-          getAdjustPointShape = _this$props6.getAdjustPointShape;
+          getAdjustPointShape = _this$props6.getAdjustPointShape,
+          edgeModel = _this$props6.edgeModel;
       var dragging = this.state.dragging;
       return Object(preact_module["g" /* h */])("g", {
         pointerEvents: dragging ? 'none' : '',
         onMouseDown: this.handleMouseDown
-      }, getAdjustPointShape(x, y, dragging));
+      }, !dragging ? getAdjustPointShape(x, y, edgeModel) : '');
     }
   }]);
 
@@ -35393,17 +35434,6 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
 
     BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "textRef", Object(preact_module["f" /* createRef */])());
 
-    BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "getAdjustPointShape", function (x, y) {
-      var model = _this.props.model;
-      var style = model.getAdjustPointStyle();
-      return Object(preact_module["g" /* h */])(Circle, BaseEdge_extends({
-        className: "lf-edge-adjust-point"
-      }, style, {
-        x: x,
-        y: y
-      }));
-    });
-
     BaseEdge_defineProperty(BaseEdge_assertThisInitialized(_this), "handleHover", function (hovered, ev) {
       var _this$props = _this.props,
           model = _this$props.model,
@@ -35745,12 +35775,23 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
      */
 
   }, {
-    key: "getAdjustPoints",
-    value:
+    key: "getAdjustPointShape",
+    value: function getAdjustPointShape(x, y, model) {
+      var style = model.getAdjustPointStyle();
+      return Object(preact_module["g" /* h */])(Circle, BaseEdge_extends({
+        className: "lf-edge-adjust-point"
+      }, style, {
+        x: x,
+        y: y
+      }));
+    }
     /**
      * 不支持重写。请使用getAdjustPointShape
      */
-    function getAdjustPoints() {
+
+  }, {
+    key: "getAdjustPoints",
+    value: function getAdjustPoints() {
       var _this$props5 = this.props,
           model = _this$props5.model,
           graphModel = _this$props5.graphModel;
@@ -38081,15 +38122,15 @@ function initDefaultShortcut(lf, graph) {
   var keyboardOptions = keyboard.options.keyboard; // 复制
 
   keyboard.on(['cmd + c', 'ctrl + c'], function () {
-    if (!keyboardOptions.enabled) return;
-    if (graph.textEditElement) return;
+    if (!keyboardOptions.enabled) return true;
+    if (graph.textEditElement) return true;
     var guards = lf.options.guards;
     var elements = graph.getSelectElements(false);
     var enabledClone = guards && guards.beforeClone ? guards.beforeClone(elements) : true;
 
-    if (!enabledClone) {
+    if (!enabledClone || elements.nodes.length === 0 && elements.edges.length === 0) {
       selected = null;
-      return false;
+      return true;
     }
 
     selected = elements;
@@ -38103,13 +38144,13 @@ function initDefaultShortcut(lf, graph) {
   }); // 粘贴
 
   keyboard.on(['cmd + v', 'ctrl + v'], function () {
-    if (!keyboardOptions.enabled) return;
-    if (graph.textEditElement) return;
+    if (!keyboardOptions.enabled) return true;
+    if (graph.textEditElement) return true;
 
     if (selected && (selected.nodes || selected.edges)) {
       lf.clearSelectElements();
       var addElements = lf.addElements(selected);
-      if (!addElements) return;
+      if (!addElements) return true;
       addElements.nodes.forEach(function (node) {
         return lf.selectElementById(node.id, true);
       });
@@ -38128,22 +38169,22 @@ function initDefaultShortcut(lf, graph) {
   }); // undo
 
   keyboard.on(['cmd + z', 'ctrl + z'], function () {
-    if (!keyboardOptions.enabled) return;
-    if (graph.textEditElement) return;
+    if (!keyboardOptions.enabled) return true;
+    if (graph.textEditElement) return true;
     lf.undo();
     return false;
   }); // redo
 
   keyboard.on(['cmd + y', 'ctrl + y'], function () {
-    if (!keyboardOptions.enabled) return;
-    if (graph.textEditElement) return;
+    if (!keyboardOptions.enabled) return true;
+    if (graph.textEditElement) return true;
     lf.redo();
     return false;
   }); // delete
 
   keyboard.on(['backspace'], function () {
-    if (!keyboardOptions.enabled) return;
-    if (graph.textEditElement) return;
+    if (!keyboardOptions.enabled) return true;
+    if (graph.textEditElement) return true;
     var elements = graph.getSelectElements(true);
     lf.clearSelectElements();
     elements.edges.forEach(function (edge) {