@logicflow/core 1.1.22 → 1.1.25

package/dist/logic-flow.js

@@ -23478,6 +23478,8 @@ var BaseEdgeModel_BaseEdgeModel = (BaseEdgeModel_class = /*#__PURE__*/function (
 
     BaseEdgeModel_initializerDefineProperty(this, "visible", BaseEdgeModel_descriptor14, this);
 
+    BaseEdgeModel_defineProperty(this, "virtual", false);
+
     BaseEdgeModel_initializerDefineProperty(this, "isAnimation", BaseEdgeModel_descriptor15, this);
 
     BaseEdgeModel_defineProperty(this, "graphModel", void 0);
@@ -26521,6 +26523,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
      * @param rightBottomPoint 表示区域右下角的点
      * @param wholeEdge 是否要整个边都在区域内部
      * @param wholeNode 是否要整个节点都在区域内部
+     * @param ignoreHideElement 是否忽略隐藏的节点
      */
 
   }, {
@@ -26528,6 +26531,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
     value: function getAreaElement(leftTopPoint, rightBottomPoint) {
       var wholeEdge = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var wholeNode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+      var ignoreHideElement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
       var areaElements = [];
       var elements = [];
       this.nodes.forEach(function (node) {
@@ -26540,7 +26544,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
       for (var i = 0; i < elements.length; i++) {
         var currentItem = elements[i];
 
-        if (this.isElementInArea(currentItem, leftTopPoint, rightBottomPoint, wholeEdge, wholeNode)) {
+        if ((!ignoreHideElement || currentItem.visible) && this.isElementInArea(currentItem, leftTopPoint, rightBottomPoint, wholeEdge, wholeNode)) {
           areaElements.push(currentItem);
         }
       }
@@ -26732,12 +26736,12 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
       var edges = [];
       this.edges.forEach(function (edge) {
         var data = edge.getData();
-        if (data) edges.push(data);
+        if (data && !edge.virtual) edges.push(data);
       });
       var nodes = [];
       this.nodes.forEach(function (node) {
         var data = node.getData();
-        if (data) nodes.push(data);
+        if (data && !node.virtual) nodes.push(data);
       });
       return {
         nodes: nodes,
@@ -27123,9 +27127,15 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
       }
 
       var nodeModel = node.model;
-      var r = nodeModel.move(deltaX, deltaY, isignoreRule); // 2) 移动边
 
-      r && this.moveEdge(nodeId, deltaX, deltaY);
+      var _nodeModel$getMoveDis = nodeModel.getMoveDistance(deltaX, deltaY, isignoreRule);
+
+      var _nodeModel$getMoveDis2 = GraphModel_slicedToArray(_nodeModel$getMoveDis, 2);
+
+      deltaX = _nodeModel$getMoveDis2[0];
+      deltaY = _nodeModel$getMoveDis2[1];
+      // 2) 移动边
+      this.moveEdge(nodeId, deltaX, deltaY);
     }
     /**
      * 移动节点-绝对位置
@@ -30107,6 +30117,8 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
 
     BaseNodeModel_initializerDefineProperty(this, "visible", BaseNodeModel_descriptor14, this);
 
+    BaseNodeModel_defineProperty(this, "virtual", false);
+
     BaseNodeModel_defineProperty(this, "graphModel", void 0);
 
     BaseNodeModel_initializerDefineProperty(this, "zIndex", BaseNodeModel_descriptor15, this);
@@ -30590,11 +30602,11 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
   }, {
     key: "move",
     value: function move(deltaX, deltaY) {
-      var isignoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var isAllowMoveX = false;
       var isAllowMoveY = false;
 
-      if (isignoreRule) {
+      if (isIgnoreRule) {
         isAllowMoveX = true;
         isAllowMoveY = true;
       } else {
@@ -30623,13 +30635,53 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
 
       return isAllowMoveX || isAllowMoveY;
     }
+  }, {
+    key: "getMoveDistance",
+    value: function getMoveDistance(deltaX, deltaY) {
+      var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var isAllowMoveX = false;
+      var isAllowMoveY = false;
+      var moveX = 0;
+      var moveY = 0;
+
+      if (isIgnoreRule) {
+        isAllowMoveX = true;
+        isAllowMoveY = true;
+      } else {
+        var r = this.isAllowMoveNode(deltaX, deltaY);
+
+        if (typeof r === 'boolean') {
+          isAllowMoveX = r;
+          isAllowMoveY = r;
+        } else {
+          isAllowMoveX = r.x;
+          isAllowMoveY = r.y;
+        }
+      }
+
+      if (isAllowMoveX && deltaX) {
+        var targetX = this.x + deltaX;
+        this.x = targetX;
+        this.text && this.moveText(deltaX, 0);
+        moveX = deltaX;
+      }
+
+      if (isAllowMoveY && deltaY) {
+        var targetY = this.y + deltaY;
+        this.y = targetY;
+        this.text && this.moveText(0, deltaY);
+        moveY = deltaY;
+      }
+
+      return [moveX, moveY];
+    }
   }, {
     key: "moveTo",
     value: function moveTo(x, y) {
-      var isignoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var deltaX = x - this.x;
       var deltaY = y - this.y;
-      if (!isignoreRule && !this.isAllowMoveNode(deltaX, deltaY)) return false;
+      if (!isIgnoreRule && !this.isAllowMoveNode(deltaX, deltaY)) return false;
 
       if (this.text) {
         this.text && this.moveText(deltaX, deltaY);
@@ -30860,7 +30912,7 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
   initializer: function initializer() {
     return {};
   }
-}), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "incoming", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "incoming"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "outgoing", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "outgoing"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "move", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "move"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveTo", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveTo"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setSelected", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setSelected"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHovered", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHovered"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHitable", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHitable"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setElementState", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setElementState"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperty", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperty"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperties", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperties"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyle", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyle"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setZIndex", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setZIndex"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateAttributes", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateAttributes"), BaseNodeModel_class.prototype)), BaseNodeModel_class);
+}), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "incoming", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "incoming"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "outgoing", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "outgoing"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "move", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "move"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "getMoveDistance", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "getMoveDistance"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveTo", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveTo"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setSelected", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setSelected"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHovered", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHovered"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHitable", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHitable"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setElementState", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setElementState"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperty", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperty"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperties", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperties"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyle", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyle"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setZIndex", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setZIndex"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateAttributes", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateAttributes"), BaseNodeModel_class.prototype)), BaseNodeModel_class);
 
 // CONCATENATED MODULE: ./src/model/node/CircleNodeModel.ts
 function CircleNodeModel_typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { CircleNodeModel_typeof = function _typeof(obj) { return typeof obj; }; } else { CircleNodeModel_typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return CircleNodeModel_typeof(obj); }
@@ -32480,7 +32532,7 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
 
     Anchor_defineProperty(Anchor_assertThisInitialized(_this), "onDragEnd", function (event) {
       if (_this.t) {
-        clearInterval(_this.t);
+        cancelRaf(_this.t);
       }
 
       _this.checkEnd(event);
@@ -38624,7 +38676,8 @@ var LogicFlow_LogicFlow = /*#__PURE__*/function () {
     value: function getAreaElement(leftTopPoint, rightBottomPoint) {
       var wholeEdge = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var wholeNode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-      return this.graphModel.getAreaElement(leftTopPoint, rightBottomPoint, wholeEdge, wholeNode).map(function (element) {
+      var ignoreHideElement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+      return this.graphModel.getAreaElement(leftTopPoint, rightBottomPoint, wholeEdge, wholeNode, ignoreHideElement).map(function (element) {
         return element.getData();
       });
     }