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

package/es/dynamic-group/index.d.ts

@@ -36,7 +36,7 @@ export declare class DynamicGroup {
     /** 拖拽节点进入分组时的感应外框样式 */
     sensorOutline?: SensorOutlineOptions;
     topGroupZIndex: number;
-    activeGroup?: DynamicGroupNodeModel;
+    activeGroups: Set<DynamicGroupNodeModel>;
     nodeGroupMap: Map<string, string>;
     /** 折叠态虚拟边 id → 所属分组与真实边 id */
     collapsedVirtualEdges: Map<string, {
@@ -98,6 +98,7 @@ export declare class DynamicGroup {
     removeNodeFromGroup: ({ data: node, model, }: CallbackArgs<'node:delete'>) => void;
     onSelectionDrag: () => void;
     onNodeDrag: ({ data: node }: CallbackArgs<'node:drag'>) => void;
+    private getTargetGroupForNode;
     setActiveGroup: (node: LogicFlow.NodeData) => void;
     /**
      * 1. 分组节点默认在普通节点下面

package/es/dynamic-group/index.js

@@ -75,6 +75,8 @@ var DynamicGroup = /** @class */ (function () {
          */
         this.cascadeDeleteChildren = true;
         this.topGroupZIndex = DEFAULT_BOTTOM_Z_INDEX;
+        // 激活态的 group 节点（支持多组同时高亮）
+        this.activeGroups = new Set();
         // 存储节点与 group 的映射关系
         this.nodeGroupMap = new Map();
         /** 折叠态虚拟边 id → 所属分组与真实边 id */
@@ -275,32 +277,85 @@ var DynamicGroup = /** @class */ (function () {
             }
         };
         this.onSelectionDrag = function () {
+            var e_2, _a, e_3, _b;
             var selectedNodes = _this.lf.graphModel.getSelectElements().nodes;
+            // 每个节点独立找目标组，合并为 Set，消除迭代顺序的影响
+            var next = new Set();
             selectedNodes.forEach(function (node) {
-                _this.setActiveGroup(node);
+                var targetGroup = _this.getTargetGroupForNode(node);
+                if (targetGroup)
+                    next.add(targetGroup);
             });
+            try {
+                // diff 更新：只操作有变化的组，避免无谓的视觉抖动
+                for (var _c = __values(_this.activeGroups), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var group = _d.value;
+                    if (!next.has(group))
+                        group.setAllowAppendChild(false);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            try {
+                for (var next_1 = __values(next), next_1_1 = next_1.next(); !next_1_1.done; next_1_1 = next_1.next()) {
+                    var group = next_1_1.value;
+                    if (!_this.activeGroups.has(group))
+                        group.setAllowAppendChild(true);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (next_1_1 && !next_1_1.done && (_b = next_1.return)) _b.call(next_1);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            _this.activeGroups = next;
         };
         this.onNodeDrag = function (_a) {
             var node = _a.data;
             _this.setActiveGroup(node);
         };
         this.setActiveGroup = function (node) {
-            var nodeModel = _this.lf.getNodeModelById(node.id);
-            var bounds = nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.getBounds();
-            if (nodeModel && bounds) {
-                var targetGroup = _this.getGroupByBounds(bounds, node);
-                if (_this.activeGroup) {
-                    _this.activeGroup.setAllowAppendChild(false);
+            var e_4, _a, e_5, _b;
+            var targetGroup = _this.getTargetGroupForNode(node);
+            var next = new Set();
+            if (targetGroup)
+                next.add(targetGroup);
+            try {
+                for (var _c = __values(_this.activeGroups), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var group = _d.value;
+                    if (!next.has(group))
+                        group.setAllowAppendChild(false);
                 }
-                if (!targetGroup || (nodeModel.isGroup && targetGroup.id === node.id)) {
-                    return;
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                var isAllowAppendIn = targetGroup.isAllowAppendIn(node);
-                if (!isAllowAppendIn)
-                    return;
-                _this.activeGroup = targetGroup;
-                _this.activeGroup.setAllowAppendChild(true);
+                finally { if (e_4) throw e_4.error; }
             }
+            try {
+                for (var next_2 = __values(next), next_2_1 = next_2.next(); !next_2_1.done; next_2_1 = next_2.next()) {
+                    var group = next_2_1.value;
+                    if (!_this.activeGroups.has(group))
+                        group.setAllowAppendChild(true);
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (next_2_1 && !next_2_1.done && (_b = next_2.return)) _b.call(next_2);
+                }
+                finally { if (e_5) throw e_5.error; }
+            }
+            _this.activeGroups = next;
         };
         /**
          * 1. 分组节点默认在普通节点下面
@@ -417,7 +472,7 @@ var DynamicGroup = /** @class */ (function () {
             _this.nodeGroupMap.clear();
             _this.collapsedVirtualEdges.clear();
             _this.collapsedRealEdgeToGroup.clear();
-            _this.activeGroup = undefined;
+            _this.activeGroups.clear();
             _this.topGroupZIndex = DEFAULT_BOTTOM_Z_INDEX;
             forEach(data.nodes, function (node) {
                 if (node.children) {
@@ -569,10 +624,35 @@ var DynamicGroup = /** @class */ (function () {
         this.topGroupZIndex = max;
     };
     DynamicGroup.prototype.clearDragTargetHighlight = function () {
-        if (this.activeGroup) {
-            this.activeGroup.setAllowAppendChild(false);
-            this.activeGroup = undefined;
+        var e_6, _a;
+        try {
+            for (var _b = __values(this.activeGroups), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var group = _c.value;
+                group.setAllowAppendChild(false);
+            }
         }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_6) throw e_6.error; }
+        }
+        this.activeGroups.clear();
+    };
+    DynamicGroup.prototype.getTargetGroupForNode = 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 targetGroup = this.getGroupByBounds(bounds, node);
+        if (!targetGroup)
+            return undefined;
+        if (nodeModel.isGroup && targetGroup.id === node.id)
+            return undefined;
+        if (!targetGroup.isAllowAppendIn(node))
+            return undefined;
+        return targetGroup;
     };
     DynamicGroup.prototype.removeChildrenInGroupNodeData = function (nodeData) {
         var _a;

package/lib/dynamic-group/index.d.ts

@@ -36,7 +36,7 @@ export declare class DynamicGroup {
     /** 拖拽节点进入分组时的感应外框样式 */
     sensorOutline?: SensorOutlineOptions;
     topGroupZIndex: number;
-    activeGroup?: DynamicGroupNodeModel;
+    activeGroups: Set<DynamicGroupNodeModel>;
     nodeGroupMap: Map<string, string>;
     /** 折叠态虚拟边 id → 所属分组与真实边 id */
     collapsedVirtualEdges: Map<string, {
@@ -98,6 +98,7 @@ export declare class DynamicGroup {
     removeNodeFromGroup: ({ data: node, model, }: CallbackArgs<'node:delete'>) => void;
     onSelectionDrag: () => void;
     onNodeDrag: ({ data: node }: CallbackArgs<'node:drag'>) => void;
+    private getTargetGroupForNode;
     setActiveGroup: (node: LogicFlow.NodeData) => void;
     /**
      * 1. 分组节点默认在普通节点下面

package/lib/dynamic-group/index.js

@@ -92,6 +92,8 @@ var DynamicGroup = /** @class */ (function () {
          */
         this.cascadeDeleteChildren = true;
         this.topGroupZIndex = DEFAULT_BOTTOM_Z_INDEX;
+        // 激活态的 group 节点（支持多组同时高亮）
+        this.activeGroups = new Set();
         // 存储节点与 group 的映射关系
         this.nodeGroupMap = new Map();
         /** 折叠态虚拟边 id → 所属分组与真实边 id */
@@ -292,32 +294,85 @@ var DynamicGroup = /** @class */ (function () {
             }
         };
         this.onSelectionDrag = function () {
+            var e_2, _a, e_3, _b;
             var selectedNodes = _this.lf.graphModel.getSelectElements().nodes;
+            // 每个节点独立找目标组，合并为 Set，消除迭代顺序的影响
+            var next = new Set();
             selectedNodes.forEach(function (node) {
-                _this.setActiveGroup(node);
+                var targetGroup = _this.getTargetGroupForNode(node);
+                if (targetGroup)
+                    next.add(targetGroup);
             });
+            try {
+                // diff 更新：只操作有变化的组，避免无谓的视觉抖动
+                for (var _c = __values(_this.activeGroups), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var group = _d.value;
+                    if (!next.has(group))
+                        group.setAllowAppendChild(false);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            try {
+                for (var next_1 = __values(next), next_1_1 = next_1.next(); !next_1_1.done; next_1_1 = next_1.next()) {
+                    var group = next_1_1.value;
+                    if (!_this.activeGroups.has(group))
+                        group.setAllowAppendChild(true);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (next_1_1 && !next_1_1.done && (_b = next_1.return)) _b.call(next_1);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            _this.activeGroups = next;
         };
         this.onNodeDrag = function (_a) {
             var node = _a.data;
             _this.setActiveGroup(node);
         };
         this.setActiveGroup = function (node) {
-            var nodeModel = _this.lf.getNodeModelById(node.id);
-            var bounds = nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.getBounds();
-            if (nodeModel && bounds) {
-                var targetGroup = _this.getGroupByBounds(bounds, node);
-                if (_this.activeGroup) {
-                    _this.activeGroup.setAllowAppendChild(false);
+            var e_4, _a, e_5, _b;
+            var targetGroup = _this.getTargetGroupForNode(node);
+            var next = new Set();
+            if (targetGroup)
+                next.add(targetGroup);
+            try {
+                for (var _c = __values(_this.activeGroups), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var group = _d.value;
+                    if (!next.has(group))
+                        group.setAllowAppendChild(false);
                 }
-                if (!targetGroup || (nodeModel.isGroup && targetGroup.id === node.id)) {
-                    return;
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                var isAllowAppendIn = targetGroup.isAllowAppendIn(node);
-                if (!isAllowAppendIn)
-                    return;
-                _this.activeGroup = targetGroup;
-                _this.activeGroup.setAllowAppendChild(true);
+                finally { if (e_4) throw e_4.error; }
             }
+            try {
+                for (var next_2 = __values(next), next_2_1 = next_2.next(); !next_2_1.done; next_2_1 = next_2.next()) {
+                    var group = next_2_1.value;
+                    if (!_this.activeGroups.has(group))
+                        group.setAllowAppendChild(true);
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (next_2_1 && !next_2_1.done && (_b = next_2.return)) _b.call(next_2);
+                }
+                finally { if (e_5) throw e_5.error; }
+            }
+            _this.activeGroups = next;
         };
         /**
          * 1. 分组节点默认在普通节点下面
@@ -434,7 +489,7 @@ var DynamicGroup = /** @class */ (function () {
             _this.nodeGroupMap.clear();
             _this.collapsedVirtualEdges.clear();
             _this.collapsedRealEdgeToGroup.clear();
-            _this.activeGroup = undefined;
+            _this.activeGroups.clear();
             _this.topGroupZIndex = DEFAULT_BOTTOM_Z_INDEX;
             (0, lodash_es_1.forEach)(data.nodes, function (node) {
                 if (node.children) {
@@ -586,10 +641,35 @@ var DynamicGroup = /** @class */ (function () {
         this.topGroupZIndex = max;
     };
     DynamicGroup.prototype.clearDragTargetHighlight = function () {
-        if (this.activeGroup) {
-            this.activeGroup.setAllowAppendChild(false);
-            this.activeGroup = undefined;
+        var e_6, _a;
+        try {
+            for (var _b = __values(this.activeGroups), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var group = _c.value;
+                group.setAllowAppendChild(false);
+            }
         }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_6) throw e_6.error; }
+        }
+        this.activeGroups.clear();
+    };
+    DynamicGroup.prototype.getTargetGroupForNode = 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 targetGroup = this.getGroupByBounds(bounds, node);
+        if (!targetGroup)
+            return undefined;
+        if (nodeModel.isGroup && targetGroup.id === node.id)
+            return undefined;
+        if (!targetGroup.isAllowAppendIn(node))
+            return undefined;
+        return targetGroup;
     };
     DynamicGroup.prototype.removeChildrenInGroupNodeData = function (nodeData) {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/extension",
-  "version": "2.3.0-alpha.0",
+  "version": "2.3.0-alpha.1",
   "description": "LogicFlow Extensions",
   "main": "lib/index.js",
   "module": "es/index.js",