@logicflow/core 1.2.0-alpha.7 → 1.2.0-alpha.8

package/dist/logic-flow.js

@@ -11337,7 +11337,7 @@ module.exports.f = function (C) {
 /* 161 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.2.0-alpha.6\"}");
+module.exports = JSON.parse("{\"a\":\"1.2.0-alpha.8\"}");
 
 /***/ }),
 /* 162 */
@@ -19782,9 +19782,10 @@ var SilentConfig = {
   nodeTextEdit: false,
   edgeTextEdit: false,
   nodeTextDraggable: false,
-  edgeTextDraggable: false
+  edgeTextDraggable: false,
+  autoExpand: false
 };
-var EditConfigModel_keys = ['isSilentMode', 'stopZoomGraph', 'stopScrollGraph', 'stopMoveGraph', 'adjustEdge', 'adjustEdgeMiddle', 'adjustEdgeStartAndEnd', 'adjustNodePosition', 'hideAnchors', 'hoverOutline', 'nodeSelectedOutline', 'edgeSelectedOutline', 'nodeTextEdit', 'edgeTextEdit', 'nodeTextDraggable', 'edgeTextDraggable', 'multipleSelectKey'];
+var EditConfigModel_keys = ['isSilentMode', 'stopZoomGraph', 'stopScrollGraph', 'stopMoveGraph', 'adjustEdge', 'adjustEdgeMiddle', 'adjustEdgeStartAndEnd', 'adjustNodePosition', 'hideAnchors', 'hoverOutline', 'nodeSelectedOutline', 'edgeSelectedOutline', 'nodeTextEdit', 'edgeTextEdit', 'nodeTextDraggable', 'edgeTextDraggable', 'multipleSelectKey', 'autoExpand'];
 /**
  * 页面编辑配置
  */
@@ -19826,6 +19827,8 @@ var EditConfigModel_EditConfigModel = /*#__PURE__*/function () {
 
     EditConfigModel_defineProperty(this, "edgeTextDraggable", false);
 
+    EditConfigModel_defineProperty(this, "autoExpand", false);
+
     EditConfigModel_defineProperty(this, "multipleSelectKey", '');
 
     EditConfigModel_defineProperty(this, "defaultConfig", {});
@@ -19847,6 +19850,7 @@ var EditConfigModel_EditConfigModel = /*#__PURE__*/function () {
       edgeTextEdit: mobx_esm["observable"],
       nodeTextDraggable: mobx_esm["observable"],
       edgeTextDraggable: mobx_esm["observable"],
+      autoExpand: mobx_esm["observable"],
       updateEditConfig: mobx_esm["action"]
     });
     lodash_es_assign(this, this.getConfigDetail(config));
@@ -19888,7 +19892,8 @@ var EditConfigModel_EditConfigModel = /*#__PURE__*/function () {
           nodeTextEdit: this.nodeTextEdit,
           edgeTextEdit: this.edgeTextEdit,
           nodeTextDraggable: this.nodeTextDraggable,
-          edgeTextDraggable: this.edgeTextDraggable
+          edgeTextDraggable: this.edgeTextDraggable,
+          autoExpand: this.autoExpand
         };
         lodash_es_assign(conf, silentConfig);
       } // 如果不传，默认undefined表示允许文本编辑
@@ -23509,9 +23514,7 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
     PolylineEdgeModel_defineProperty(PolylineEdgeModel_assertThisInitialized(_this), "dbClickPosition", void 0);
 
     Object(mobx_esm["makeObservable"])(PolylineEdgeModel_assertThisInitialized(_this), {
-      dbClickPosition: mobx_esm["observable"],
-      dragAppend: mobx_esm["action"],
-      dragAppendEnd: mobx_esm["action"]
+      dbClickPosition: mobx_esm["observable"]
     });
     return _this;
   }
@@ -23582,7 +23585,6 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
           anchor = item;
         }
       });
-      console.log(444, JSON.stringify(anchor));
       return anchor;
     }
     /* 获取拖拽过程中产生的交点 */
@@ -23865,8 +23867,13 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
     key: "dragAppendStart",
     value: function dragAppendStart() {
       // mobx observer 对象被iterator处理会有问题
-      this.draggingPointList = this.pointsList.map(function (i) {
-        return i;
+      this.draggingPointList = this.pointsList.map(function (_ref2) {
+        var x = _ref2.x,
+            y = _ref2.y;
+        return {
+          x: x,
+          y: y
+        };
       });
     }
   }, {
@@ -23881,42 +23888,43 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
           endIndex = appendInfo.endIndex,
           direction = appendInfo.direction;
       var pointsList = this.pointsList;
-      var draggingPointList = pointsList;
+      var pointsListNew = pointsList.map(function (_ref3) {
+        var x = _ref3.x,
+            y = _ref3.y;
+        return {
+          x: x,
+          y: y
+        };
+      });
 
       if (direction === SegmentDirection.HORIZONTAL) {
         // 水平，仅调整y坐标，拿到当前线段两个端点移动后的坐标
-        pointsList[startIndex] = {
+        pointsListNew[startIndex] = {
           x: start.x,
           y: start.y + dragInfo.y
         };
-        pointsList[endIndex] = {
+        pointsListNew[endIndex] = {
           x: end.x,
           y: end.y + dragInfo.y
         };
-        draggingPointList = this.pointsList.map(function (i) {
-          return i;
-        });
       } else if (direction === SegmentDirection.VERTICAL) {
         // 垂直，仅调整x坐标， 与水平调整同理
-        pointsList[startIndex] = {
+        pointsListNew[startIndex] = {
           x: start.x + dragInfo.x,
           y: start.y
         };
-        pointsList[endIndex] = {
+        pointsListNew[endIndex] = {
           x: end.x + dragInfo.x,
           y: end.y
         };
-        draggingPointList = this.pointsList.map(function (i) {
-          return i;
-        });
       }
 
-      this.updatePointsAfterDrag(draggingPointList);
-      this.draggingPointList = draggingPointList;
+      this.updatePointsAfterDrag(pointsListNew);
+      this.draggingPointList = pointsListNew;
       this.setText(Object.assign({}, this.text, this.textPosition));
       return {
-        start: Object.assign({}, pointsList[startIndex]),
-        end: Object.assign({}, pointsList[endIndex]),
+        start: Object.assign({}, pointsListNew[startIndex]),
+        end: Object.assign({}, pointsListNew[endIndex]),
         startIndex: startIndex,
         endIndex: endIndex,
         direction: direction
@@ -23932,27 +23940,33 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
           endIndex = appendInfo.endIndex,
           direction = appendInfo.direction;
       var pointsList = this.pointsList;
+      var pointsListNew = pointsList.map(function (_ref4) {
+        var x = _ref4.x,
+            y = _ref4.y;
+        return {
+          x: x,
+          y: y
+        };
+      });
 
       if (direction === SegmentDirection.HORIZONTAL) {
         // 水平，仅调整y坐标
         // step1: 拿到当前线段两个端点移动后的坐标
-        pointsList[startIndex] = {
+        pointsListNew[startIndex] = {
           x: start.x,
           y: start.y + dragInfo.y
         };
-        pointsList[endIndex] = {
+        pointsListNew[endIndex] = {
           x: end.x,
           y: end.y + dragInfo.y
         }; // step2: 计算拖拽后,两个端点与节点外框的交点
         // 定义一个拖住中节点list
 
-        var draggingPointList = this.pointsList.map(function (i) {
-          return i;
-        });
+        var draggingPointList = pointsListNew;
 
-        if (startIndex !== 0 && endIndex !== this.pointsList.length - 1) {
+        if (startIndex !== 0 && endIndex !== pointsListNew.length - 1) {
           // 2.1)如果线段没有连接起终点，过滤会穿插在图形内部的线段，取整个图形离线段最近的点
-          draggingPointList = this.removeCrossPoints(startIndex, endIndex, draggingPointList);
+          draggingPointList = this.removeCrossPoints(startIndex, endIndex, pointsListNew);
         }
 
         if (startIndex === 0) {
@@ -23970,7 +23984,7 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
           }
         }
 
-        if (endIndex === this.pointsList.length - 1) {
+        if (endIndex === pointsListNew.length - 1) {
           // 2.2)如果线段连接了终点, 判断起点是否在节点内部
           var endPosition = {
             x: end.x,
@@ -23992,20 +24006,17 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
         this.draggingPointList = draggingPointList;
       } else if (direction === SegmentDirection.VERTICAL) {
         // 垂直，仅调整x坐标， 与水平调整同理
-        pointsList[startIndex] = {
+        pointsListNew[startIndex] = {
           x: start.x + dragInfo.x,
           y: start.y
         };
-        pointsList[endIndex] = {
+        pointsListNew[endIndex] = {
           x: end.x + dragInfo.x,
           y: end.y
         };
+        var _draggingPointList = pointsListNew;
 
-        var _draggingPointList = this.pointsList.map(function (i) {
-          return i;
-        });
-
-        if (startIndex !== 0 && endIndex !== this.pointsList.length - 1) {
+        if (startIndex !== 0 && endIndex !== pointsListNew.length - 1) {
           _draggingPointList = this.removeCrossPoints(startIndex, endIndex, _draggingPointList);
         }
 
@@ -24024,7 +24035,7 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
           }
         }
 
-        if (endIndex === this.pointsList.length - 1) {
+        if (endIndex === pointsListNew.length - 1) {
           var _endPosition = {
             x: end.x + dragInfo.x,
             y: end.y
@@ -24045,8 +24056,8 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
 
       this.setText(Object.assign({}, this.text, this.textPosition));
       return {
-        start: Object.assign({}, pointsList[startIndex]),
-        end: Object.assign({}, pointsList[endIndex]),
+        start: Object.assign({}, pointsListNew[startIndex]),
+        end: Object.assign({}, pointsListNew[endIndex]),
         startIndex: startIndex,
         endIndex: endIndex,
         direction: direction
@@ -24056,18 +24067,17 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
     key: "dragAppendEnd",
     value: function dragAppendEnd() {
       if (this.draggingPointList) {
-        var pointsList = points2PointsList(this.points); // 更新pointsList，重新渲染appendWidth
-
-        this.pointsList = pointsList.map(function (i) {
-          return i;
-        }); // draggingPointList清空
+        var pointsList = points2PointsList(this.points); // draggingPointList清空
 
         this.draggingPointList = []; // 更新起终点
 
         var startPoint = pointsList[0];
-        this.startPoint = Object.assign({}, startPoint);
         var endPoint = pointsList[pointsList.length - 1];
-        this.endPoint = Object.assign({}, endPoint);
+        this.updateAttributes({
+          startPoint: lodash_es_cloneDeep(startPoint),
+          endPoint: lodash_es_cloneDeep(endPoint),
+          pointsList: lodash_es_cloneDeep(pointsList)
+        });
       }
 
       this.isDragging = false;
@@ -24082,9 +24092,11 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
     value: function updatePointsAfterDrag(pointsList) {
       // 找到准确的连接点后,更新points, 更新边，同时更新依赖points的箭头
       var list = this.updateCrossPoints(pointsList);
-      this.points = list.map(function (point) {
-        return "".concat(point.x, ",").concat(point.y);
-      }).join(' ');
+      this.updateAttributes({
+        points: list.map(function (point) {
+          return "".concat(point.x, ",").concat(point.y);
+        }).join(' ')
+      });
     } // 获取边调整的起点
 
   }, {
@@ -24102,11 +24114,11 @@ var PolylineEdgeModel_PolylineEdgeModel = /*#__PURE__*/function (_BaseEdgeModel)
 
   }, {
     key: "updateAfterAdjustStartAndEnd",
-    value: function updateAfterAdjustStartAndEnd(_ref2) {
-      var startPoint = _ref2.startPoint,
-          endPoint = _ref2.endPoint,
-          sourceNode = _ref2.sourceNode,
-          targetNode = _ref2.targetNode;
+    value: function updateAfterAdjustStartAndEnd(_ref5) {
+      var startPoint = _ref5.startPoint,
+          endPoint = _ref5.endPoint,
+          sourceNode = _ref5.sourceNode,
+          targetNode = _ref5.targetNode;
       var pointsList = getPolylinePoints({
         x: startPoint.x,
         y: startPoint.y
@@ -25620,6 +25632,10 @@ var GraphModel_GraphModel = /*#__PURE__*/function () {
       options.height = container.getBoundingClientRect().height;
     }
 
+    if (!options.width || !options.height) {
+      console.warn('画布初始化确实宽高');
+    }
+
     this.width = options.width;
     this.height = options.height;
     this.animation = animation_updateAnimation(animation);
@@ -32269,7 +32285,7 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
         cancelRaf(_this.t);
       }
 
-      if (nearBoundary.length > 0 && !editConfigModel.stopMoveGraph) {
+      if (nearBoundary.length > 0 && !editConfigModel.stopMoveGraph && editConfigModel.autoExpand) {
         _this.t = raf_createRaf(function () {
           var _nearBoundary = nearBoundary,
               _nearBoundary2 = BaseNode_slicedToArray(_nearBoundary, 2),