@logicflow/extension 2.3.0-alpha.1 → 2.3.1-alpha.0

package/lib/materials/curved-edge/index.js

@@ -44,6 +44,13 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurvedEdgePath = exports.CurvedEdgeModel = exports.CurvedEdge = void 0;
 var core_1 = require("@logicflow/core");
+// SVG 路径点只能是严格的 [x, y]；多余坐标也视为格式错误，不能静默忽略。
+var isFinitePointTuple = function (point) {
+    return Array.isArray(point) &&
+        point.length === 2 &&
+        Number.isFinite(point[0]) &&
+        Number.isFinite(point[1]);
+};
 // 方向组合到圆弧象限的映射。
 // key 由进入方向(dir1)和离开方向(dir2)拼接，例如 'tr' 表示从上(t)到右(r)的拐角。
 // 通过该映射确定在拐点处应该绘制的圆弧象限，用于计算中间控制点。
@@ -183,13 +190,21 @@ function getPartialPath(prevPoint, cornerPoint, nextPoint, cornerRadius) {
     return path;
 }
 function getCurvedEdgePath(points, radius) {
+    // 这是可独立调用的导出函数，不能依赖 View 一定提前完成校验。
+    if (points.length === 0 || !points.every(isFinitePointTuple)) {
+        return '';
+    }
+    // i 始终指向下一个尚未写入路径的点：首点只生成 M，单点路径到此结束；
+    // 两点生成直线，三个及以上的点才为中间拐点计算圆角。
     var i = 0;
-    var d = '';
+    var d = "M".concat(points[i][0], " ").concat(points[i++][1]);
+    if (points.length === 1) {
+        return d;
+    }
     if (points.length === 2) {
-        d += "M".concat(points[i][0], " ").concat(points[i++][1], " L ").concat(points[i][0], " ").concat(points[i][1]);
+        d += " L ".concat(points[i][0], " ").concat(points[i][1]);
     }
     else {
-        d += "M".concat(points[i][0], " ").concat(points[i++][1]);
         for (; i + 1 < points.length;) {
             var prev = points[i - 1];
             var cur = points[i];

package/lib/pool/index.d.ts

@@ -25,7 +25,7 @@ export declare const LaneNode: {
 export declare class PoolElements {
     static pluginName: string;
     private lf;
-    activeGroup?: LaneModel;
+    private activeGroups;
     nodeLaneMap: Map<string, string>;
     constructor({ lf, options }: LogicFlow.IExtensionProps);
     /**
@@ -51,7 +51,11 @@ export declare class PoolElements {
     removeNodeFromGroup: ({ data: node, model, }: CallbackArgs<'node:delete'>) => void;
     onSelectionDrag: () => void;
     onNodeDrag: ({ data: node }: CallbackArgs<'node:drag'>) => void;
+    private getTargetLaneForNode;
     setActiveGroup: (node: LogicFlow.NodeData) => void;
+    clearDragTargetHighlight(): void;
+    onNodeDrop: () => void;
+    onNodeMouseUp: () => void;
     /**
      * @param node
      * @param isMultiple

package/lib/pool/index.js

@@ -60,6 +60,8 @@ var PoolElements = /** @class */ (function () {
     function PoolElements(_a) {
         var lf = _a.lf, options = _a.options;
         var _this = this;
+        // 激活态的泳道节点（支持多泳道同时高亮）
+        this.activeGroups = new Set();
         // 存储节点与 group 的映射关系
         this.nodeLaneMap = new Map();
         /**
@@ -150,32 +152,46 @@ var PoolElements = /** @class */ (function () {
         };
         this.onSelectionDrag = function () {
             var selectedNodes = _this.lf.graphModel.getSelectElements().nodes;
+            var next = new Set();
             selectedNodes.forEach(function (node) {
-                _this.setActiveGroup(node);
+                var targetLane = _this.getTargetLaneForNode(node);
+                if (targetLane)
+                    next.add(targetLane);
             });
+            _this.activeGroups.forEach(function (lane) {
+                if (!next.has(lane))
+                    lane.setAllowAppendChild(false);
+            });
+            next.forEach(function (lane) {
+                if (!_this.activeGroups.has(lane))
+                    lane.setAllowAppendChild(true);
+            });
+            _this.activeGroups = next;
         };
         this.onNodeDrag = function (_a) {
             var node = _a.data;
             _this.setActiveGroup(node);
         };
         this.setActiveGroup = function (node) {
-            var _a;
-            var nodeModel = _this.lf.getNodeModelById(node.id);
-            var bounds = nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.getBounds();
-            if (nodeModel && bounds) {
-                var targetGroup = _this.getLaneByBounds(bounds, node);
-                if (_this.activeGroup) {
-                    _this.activeGroup.setAllowAppendChild(false);
-                }
-                if (!targetGroup || (nodeModel.isGroup && targetGroup.id === node.id)) {
-                    return;
-                }
-                var isAllowAppendIn = targetGroup.isAllowAppendIn(node);
-                if (!isAllowAppendIn)
-                    return;
-                _this.activeGroup = targetGroup;
-                (_a = _this.activeGroup) === null || _a === void 0 ? void 0 : _a.setAllowAppendChild(true);
-            }
+            var targetLane = _this.getTargetLaneForNode(node);
+            var next = new Set();
+            if (targetLane)
+                next.add(targetLane);
+            _this.activeGroups.forEach(function (lane) {
+                if (!next.has(lane))
+                    lane.setAllowAppendChild(false);
+            });
+            next.forEach(function (lane) {
+                if (!_this.activeGroups.has(lane))
+                    lane.setAllowAppendChild(true);
+            });
+            _this.activeGroups = next;
+        };
+        this.onNodeDrop = function () {
+            _this.clearDragTargetHighlight();
+        };
+        this.onNodeMouseUp = function () {
+            _this.clearDragTargetHighlight();
         };
         /**
          * @param node
@@ -256,6 +272,7 @@ var PoolElements = /** @class */ (function () {
             groupModel.width = newGroupWidth;
             groupModel.height = newGroupHeight;
             groupModel.updateExpandedSize(newGroupWidth, newGroupHeight);
+            groupModel.setTextPosition();
         };
         this.onGraphRendered = function (_a) {
             var data = _a.data;
@@ -311,6 +328,26 @@ var PoolElements = /** @class */ (function () {
             return topZIndexLane;
         }
     };
+    PoolElements.prototype.getTargetLaneForNode = function (node) {
+        var nodeModel = this.lf.getNodeModelById(node.id);
+        var bounds = nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.getBounds();
+        if (!nodeModel || !bounds)
+            return undefined;
+        var targetLane = this.getLaneByBounds(bounds, node);
+        if (!targetLane)
+            return undefined;
+        if (nodeModel.isGroup && targetLane.id === node.id)
+            return undefined;
+        if (!targetLane.isAllowAppendIn(node))
+            return undefined;
+        return targetLane;
+    };
+    PoolElements.prototype.clearDragTargetHighlight = function () {
+        this.activeGroups.forEach(function (lane) {
+            lane.setAllowAppendChild(false);
+        });
+        this.activeGroups.clear();
+    };
     PoolElements.prototype.removeChildrenInGroupNodeData = function (nodeData) {
         var _a;
         var newNodeData = (0, lodash_es_1.cloneDeep)(nodeData);
@@ -450,6 +487,8 @@ var PoolElements = /** @class */ (function () {
         lf.on(core_1.EventType.NODE_DELETE, this.removeNodeFromGroup);
         lf.on(events_1.NODE_DRAG_EVENTS, this.onNodeDrag);
         lf.on(core_1.EventType.SELECTION_DRAG, this.onSelectionDrag);
+        lf.on(core_1.EventType.NODE_DROP, this.onNodeDrop);
+        lf.on(core_1.EventType.NODE_MOUSEUP, this.onNodeMouseUp);
         lf.on(core_1.EventType.NODE_CLICK, this.onNodeSelect);
         lf.on(core_1.EventType.NODE_MOUSEMOVE, this.onNodeMove);
         lf.on(core_1.EventType.GRAPH_RENDERED, this.onGraphRendered);
@@ -499,6 +538,8 @@ var PoolElements = /** @class */ (function () {
         this.lf.off(core_1.EventType.NODE_DELETE, this.removeNodeFromGroup);
         this.lf.off(events_1.NODE_DRAG_EVENTS, this.onNodeDrag);
         this.lf.off(core_1.EventType.SELECTION_DRAG, this.onSelectionDrag);
+        this.lf.off(core_1.EventType.NODE_DROP, this.onNodeDrop);
+        this.lf.off(core_1.EventType.NODE_MOUSEUP, this.onNodeMouseUp);
         this.lf.off(core_1.EventType.NODE_CLICK, this.onNodeSelect);
         this.lf.off(core_1.EventType.NODE_MOUSEMOVE, this.onNodeMove);
         this.lf.off(core_1.EventType.GRAPH_RENDERED, this.onGraphRendered);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/extension",
-  "version": "2.3.0-alpha.1",
+  "version": "2.3.1-alpha.0",
   "description": "LogicFlow Extensions",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -20,7 +20,7 @@
   "author": "Logicflow-Team",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@logicflow/core": "2.2.3-alpha.0"
+    "@logicflow/core": "^2.2.5-alpha.0"
   },
   "dependencies": {
     "@antv/hierarchy": "^0.6.11",
@@ -37,7 +37,7 @@
     "postcss-url": "^10.1.3",
     "postcss-import": "^16.1.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "@logicflow/core": "2.2.3-alpha.0"
+    "@logicflow/core": "2.2.5-alpha.0"
   },
   "files": [
     "dist",