@logicflow/extension 2.0.0 → 2.0.2

package/lib/bpmn/flow/SequenceFlow.js

@@ -45,4 +45,3 @@ exports.SequenceFlow = {
     model: SequenceFlowModel,
 };
 exports.default = exports.SequenceFlow;
-//# sourceMappingURL=SequenceFlow.js.map

package/lib/bpmn/flow/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./SequenceFlow"), exports);
-//# sourceMappingURL=index.js.map

package/lib/bpmn/gateways/ExclusiveGateway.js

@@ -84,4 +84,3 @@ exports.ExclusiveGateway = {
     model: ExclusiveGatewayModel,
 };
 exports.default = exports.ExclusiveGateway;
-//# sourceMappingURL=ExclusiveGateway.js.map

package/lib/bpmn/gateways/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ExclusiveGateway"), exports);
-//# sourceMappingURL=index.js.map

package/lib/bpmn/getBpmnId.js

@@ -28,4 +28,3 @@ function getBpmnId() {
     return ids.next();
 }
 exports.getBpmnId = getBpmnId;
-//# sourceMappingURL=getBpmnId.js.map

package/lib/bpmn/index.js

@@ -35,4 +35,3 @@ var BpmnElement = {
     },
 };
 exports.BpmnElement = BpmnElement;
-//# sourceMappingURL=index.js.map

package/lib/bpmn/tasks/ServiceTask.js

@@ -80,4 +80,3 @@ exports.ServiceTask = {
     model: ServiceTaskModel,
 };
 exports.default = exports.ServiceTask;
-//# sourceMappingURL=ServiceTask.js.map

package/lib/bpmn/tasks/UserTask.js

@@ -81,4 +81,3 @@ exports.UserTask = {
     model: UserTaskModel,
 };
 exports.default = exports.UserTask;
-//# sourceMappingURL=UserTask.js.map

package/lib/bpmn/tasks/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ServiceTask"), exports);
 __exportStar(require("./UserTask"), exports);
-//# sourceMappingURL=index.js.map

package/lib/bpmn-adapter/bpmnIds.js

@@ -29,4 +29,3 @@ function getBpmnId() {
     return ids.next();
 }
 exports.getBpmnId = getBpmnId;
-//# sourceMappingURL=bpmnIds.js.map

package/lib/bpmn-adapter/index.js

@@ -425,7 +425,7 @@ function getLfEdges(value, bpmnEdges) {
 }
 function getEdgeConfig(edgeValue, processValue) {
     var text;
-    var textVal = processValue['-name'];
+    var textVal = "".concat(processValue['-name']);
     if (textVal) {
         var textBounds = edgeValue['bpmndi:BPMNLabel']['dc:Bounds'];
         // 如果边文本换行，则其偏移量应该是最长一行的位置
@@ -573,4 +573,3 @@ var BpmnXmlAdapter = /** @class */ (function (_super) {
 }(BpmnAdapter));
 exports.BpmnXmlAdapter = BpmnXmlAdapter;
 exports.default = BpmnAdapter;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-adapter/json2xml.js

@@ -91,4 +91,3 @@ function lfJson2Xml(o) {
     return xmlStr;
 }
 exports.lfJson2Xml = lfJson2Xml;
-//# sourceMappingURL=json2xml.js.map

package/lib/bpmn-adapter/xml2json.js

@@ -550,4 +550,3 @@ var lfXml2Json = function (xmlData) {
     return new XML.ObjTree().parseXML(xmlData);
 };
 exports.lfXml2Json = lfXml2Json;
-//# sourceMappingURL=xml2json.js.map

package/lib/bpmn-elements/index.js

@@ -116,4 +116,3 @@ __exportStar(require("./presets/Flow/sequenceFlow"), exports);
 __exportStar(require("./presets/Task/task"), exports);
 __exportStar(require("./presets/Task/subProcess"), exports);
 __exportStar(require("./presets/Gateway/gateway"), exports);
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements/presets/Event/EndEventFactory.js

@@ -139,4 +139,3 @@ function EndEventFactory(lf) {
     };
 }
 exports.EndEventFactory = EndEventFactory;
-//# sourceMappingURL=EndEventFactory.js.map

package/lib/bpmn-elements/presets/Event/IntermediateCatchEvent.js

@@ -125,4 +125,3 @@ function IntermediateCatchEventFactory(lf) {
     };
 }
 exports.IntermediateCatchEventFactory = IntermediateCatchEventFactory;
-//# sourceMappingURL=IntermediateCatchEvent.js.map

package/lib/bpmn-elements/presets/Event/IntermediateThrowEvent.js

@@ -125,4 +125,3 @@ function IntermediateThrowEventFactory(lf) {
     };
 }
 exports.IntermediateThrowEventFactory = IntermediateThrowEventFactory;
-//# sourceMappingURL=IntermediateThrowEvent.js.map

package/lib/bpmn-elements/presets/Event/StartEventFactory.js

@@ -138,4 +138,3 @@ function StartEventFactory(lf) {
     };
 }
 exports.StartEventFactory = StartEventFactory;
-//# sourceMappingURL=StartEventFactory.js.map

package/lib/bpmn-elements/presets/Event/boundaryEventFactory.js

@@ -132,4 +132,3 @@ function BoundaryEventFactory(lf) {
     };
 }
 exports.BoundaryEventFactory = BoundaryEventFactory;
-//# sourceMappingURL=boundaryEventFactory.js.map

package/lib/bpmn-elements/presets/Event/index.js

@@ -14,4 +14,3 @@ function registerEventNodes(lf) {
     lf.register((0, boundaryEventFactory_1.BoundaryEventFactory)(lf));
 }
 exports.registerEventNodes = registerEventNodes;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements/presets/Flow/index.js

@@ -7,4 +7,3 @@ function registerFlows(lf) {
     lf.register(exports.SequenceFlow);
 }
 exports.registerFlows = registerFlows;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements/presets/Flow/manhattan.js

@@ -638,4 +638,3 @@ offset) {
     }
 }
 exports.ManhattanLayout = ManhattanLayout;
-//# sourceMappingURL=manhattan.js.map

package/lib/bpmn-elements/presets/Flow/sequenceFlow.js

@@ -75,4 +75,3 @@ function sequenceFlowFactory(props) {
     };
 }
 exports.sequenceFlowFactory = sequenceFlowFactory;
-//# sourceMappingURL=sequenceFlow.js.map

package/lib/bpmn-elements/presets/Gateway/gateway.js

@@ -105,4 +105,3 @@ function GatewayNodeFactory(type, icon, props) {
     };
 }
 exports.GatewayNodeFactory = GatewayNodeFactory;
-//# sourceMappingURL=gateway.js.map

package/lib/bpmn-elements/presets/Gateway/index.js

@@ -12,4 +12,3 @@ function registerGatewayNodes(lf) {
     lf.register(ParallelGateway);
 }
 exports.registerGatewayNodes = registerGatewayNodes;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements/presets/Pool/Lane.js

@@ -216,4 +216,3 @@ var LaneNode = {
     model: LaneModel,
 };
 exports.default = LaneNode;
-//# sourceMappingURL=Lane.js.map

package/lib/bpmn-elements/presets/Pool/Pool.js

@@ -298,4 +298,3 @@ var PoolNode = {
     model: HorizontalLaneModel,
 };
 exports.default = PoolNode;
-//# sourceMappingURL=Pool.js.map

package/lib/bpmn-elements/presets/Pool/index.js

@@ -92,4 +92,3 @@ var registerPoolNodes = function (lf) {
     poolEvent(lf);
 };
 exports.registerPoolNodes = registerPoolNodes;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements/presets/Task/index.js

@@ -140,4 +140,3 @@ function registerTaskNodes(lf) {
     boundaryEvent(lf);
 }
 exports.registerTaskNodes = registerTaskNodes;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements/presets/Task/subProcess.js

@@ -193,4 +193,3 @@ function SubProcessFactory() {
     };
 }
 exports.SubProcessFactory = SubProcessFactory;
-//# sourceMappingURL=subProcess.js.map

package/lib/bpmn-elements/presets/Task/task.js

@@ -194,4 +194,3 @@ function TaskNodeFactory(type, icon, props) {
     };
 }
 exports.TaskNodeFactory = TaskNodeFactory;
-//# sourceMappingURL=task.js.map

package/lib/bpmn-elements/presets/icons.js

@@ -114,4 +114,3 @@ exports.style = {
 exports.parallelMarker = 'm44,60 m 3,2 l 0,10 m 3,-10 l 0,10 m 3,-10 l 0,10';
 exports.sequentialMarker = 'm47,61 m 0,3 l 10,0 m -10,3 l 10,0 m -10,3 l 10,0';
 exports.loopMarker = 'm 50,73 c 3.526979,0 6.386161,-2.829858 6.386161,-6.320661 0,-3.490806 -2.859182,-6.320661 -6.386161,-6.320661 -3.526978,0 -6.38616,2.829855 -6.38616,6.320661 0,1.745402 0.714797,3.325567 1.870463,4.469381 0.577834,0.571908 1.265885,1.034728 2.029916,1.35457 l -0.718163,-3.909793 m 0.718163,3.909793 -3.885211,0.802902';
-//# sourceMappingURL=icons.js.map

package/lib/bpmn-elements/utils.js

@@ -43,4 +43,3 @@ function genBpmnId() {
     return ids.next();
 }
 exports.genBpmnId = genBpmnId;
-//# sourceMappingURL=utils.js.map

package/lib/bpmn-elements-adapter/constant.js

@@ -67,4 +67,3 @@ exports.theme = {
         },
     },
 };
-//# sourceMappingURL=constant.js.map

package/lib/bpmn-elements-adapter/index.js

@@ -886,7 +886,7 @@ function getLfEdges(value, bpmnEdges) {
 }
 function getEdgeConfig(edgeValue, processValue) {
     var text;
-    var textVal = processValue['-name'];
+    var textVal = "".concat(processValue['-name']);
     if (textVal) {
         var textBounds = edgeValue['bpmndi:BPMNLabel']['dc:Bounds'];
         // 如果边文本换行，则其偏移量应该是最长一行的位置
@@ -1079,4 +1079,3 @@ var BPMNAdapter = /** @class */ (function (_super) {
 }(BPMNBaseAdapter));
 exports.BPMNAdapter = BPMNAdapter;
 exports.default = BPMNAdapter;
-//# sourceMappingURL=index.js.map

package/lib/bpmn-elements-adapter/json2xml.js

@@ -89,4 +89,3 @@ function lfJson2Xml(obj) {
     return xmlStr;
 }
 exports.lfJson2Xml = lfJson2Xml;
-//# sourceMappingURL=json2xml.js.map

package/lib/bpmn-elements-adapter/xml2json.js

@@ -553,4 +553,3 @@ which I will do instead of keeping this documentation like it is.
 */
 var lfXml2Json = function (xmlData) { return new XML.ObjTree().parseXML(xmlData); };
 exports.lfXml2Json = lfXml2Json;
-//# sourceMappingURL=xml2json.js.map

package/lib/components/context-menu/index.js

@@ -237,4 +237,3 @@ var ContextMenu = /** @class */ (function () {
 }());
 exports.ContextMenu = ContextMenu;
 exports.default = ContextMenu;
-//# sourceMappingURL=index.js.map

package/lib/components/control/index.js

@@ -149,4 +149,3 @@ var Control = /** @class */ (function () {
 }());
 exports.Control = Control;
 exports.default = Control;
-//# sourceMappingURL=index.js.map

package/lib/components/dnd-panel/index.js

@@ -110,4 +110,3 @@ var DndPanel = /** @class */ (function () {
 }());
 exports.DndPanel = DndPanel;
 exports.default = DndPanel;
-//# sourceMappingURL=index.js.map

package/lib/components/highlight/index.js

@@ -49,6 +49,8 @@ var getNodePath = function (node, lf) {
     var incomingPaths = [];
     var outgoingPaths = [];
     var getIncomingPaths = function (curNode, path, prevNode) {
+        if (!curNode)
+            return;
         if (prevNode) {
             // * 上个节点和当前节点中间边
             path.unshift.apply(path, __spreadArray([], __read(lf
@@ -76,6 +78,8 @@ var getNodePath = function (node, lf) {
     };
     // * 同上逻辑
     var getOutgoingPaths = function (curNode, path, prevNode) {
+        if (!curNode)
+            return;
         if (prevNode) {
             path.push.apply(path, __spreadArray([], __read(lf
                 .getEdgeModels({
@@ -216,4 +220,3 @@ var Highlight = /** @class */ (function () {
 }());
 exports.Highlight = Highlight;
 exports.default = Highlight;
-//# sourceMappingURL=index.js.map

package/lib/components/menu/index.d.ts

@@ -31,7 +31,10 @@ declare class Menu {
     /**
      * 设置指定类型元素的菜单
      */
-    private setMenuByType;
+    setMenuByType({ type, menu }: {
+        type: string;
+        menu: MenuItem[];
+    }): void;
     /**
      * 获取 Menu DOM
      * @param list 菜单项

package/lib/components/menu/index.js

@@ -317,12 +317,13 @@ var Menu = /** @class */ (function () {
     /**
      * 设置指定类型元素的菜单
      */
-    Menu.prototype.setMenuByType = function (config) {
-        var _a;
-        if (!config.type || !config.menu) {
+    Menu.prototype.setMenuByType = function (_a) {
+        var _b;
+        var type = _a.type, menu = _a.menu;
+        if (!type || !menu) {
             return;
         }
-        (_a = this.menuTypeMap) === null || _a === void 0 ? void 0 : _a.set(config.type, config.menu);
+        (_b = this.menuTypeMap) === null || _b === void 0 ? void 0 : _b.set(type, menu);
     };
     /**
      * 获取 Menu DOM
@@ -413,4 +414,3 @@ var Menu = /** @class */ (function () {
 }());
 exports.Menu = Menu;
 exports.default = Menu;
-//# sourceMappingURL=index.js.map

package/lib/components/mini-map/index.js

@@ -516,4 +516,3 @@ var MiniMap = /** @class */ (function () {
 }());
 exports.MiniMap = MiniMap;
 exports.default = MiniMap;
-//# sourceMappingURL=index.js.map

package/lib/components/selection-select/index.js

@@ -60,9 +60,13 @@ var SelectionSelect = /** @class */ (function () {
                     return;
                 }
                 var elements = _this.lf.graphModel.getAreaElement(lt, rb, _this.isWholeEdge, _this.isWholeNode, true);
-                var dynamicGroup_1 = _this.lf.graphModel.dynamicGroup;
+                var _d = _this.lf.graphModel, dynamicGroup_1 = _d.dynamicGroup, group_1 = _d.group;
                 elements.forEach(function (element) {
-                    // 如果节点属于分组，则不不选中节点
+                    // 如果节点属于分组，则不选中节点，此处兼容旧版 Group 插件
+                    if (!group_1 || !group_1.getNodeGroup(element.id)) {
+                        _this.lf.selectElementById(element.id, true);
+                    }
+                    // 如果节点属于动态分组，则不不选中节点
                     if (!dynamicGroup_1 || !dynamicGroup_1.getGroupByNodeId(element.id)) {
                         _this.lf.selectElementById(element.id, true);
                     }
@@ -169,4 +173,3 @@ var SelectionSelect = /** @class */ (function () {
 }());
 exports.SelectionSelect = SelectionSelect;
 exports.default = SelectionSelect;
-//# sourceMappingURL=index.js.map

package/lib/dynamic-group/index.js

@@ -240,7 +240,6 @@ var DynamicGroup = /** @class */ (function () {
         };
         lf.register(exports.dynamicGroup);
         this.lf = lf;
-        console.log('options', options);
         (0, lodash_es_1.assign)(this, options);
         // 初始化插件，从监听事件开始及设置规则开始
         this.init();
@@ -472,8 +471,8 @@ var DynamicGroup = /** @class */ (function () {
             var groupModel = _this.lf.getNodeModelById(groupId);
             if (groupModel && groupModel.isRestrict) {
                 // 如果移动的节点存在与分组中，且这个分组禁止子节点移出去
-                var bounds = model.getBounds();
-                return (0, utils_1.isAllowMoveTo)(bounds, groupModel);
+                var groupBounds = groupModel.getBounds();
+                return (0, utils_1.isAllowMoveTo)(groupBounds, model, deltaX, deltaY);
             }
             return true;
         });
@@ -491,7 +490,6 @@ var DynamicGroup = /** @class */ (function () {
             var data = _a.data;
             return console.log('group:add-node', data);
         });
-        // lf.eventCenter.on('node:resize', this.onGroupResize)
         // https://github.com/didi/LogicFlow/issues/1346
         // 重写 addElements() 方法，在 addElements() 原有基础上增加对 group 内部所有 nodes 和 edges 的复制功能
         // 使用场景：addElements api 项目内部目前只在快捷键粘贴时使用（此处解决的也应该是粘贴场景的问题）
@@ -550,4 +548,3 @@ var DynamicGroup = /** @class */ (function () {
 }());
 exports.DynamicGroup = DynamicGroup;
 exports.default = DynamicGroup;
-//# sourceMappingURL=index.js.map

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

@@ -53,7 +53,7 @@ export declare class DynamicGroupNodeModel extends RectNodeModel<IGroupNodePrope
     isCollapsed: boolean;
     groupAddable: boolean;
     transformWidthContainer: boolean;
-    childrenLastCollapseStateDict: Record<string, boolean>;
+    childrenLastCollapseStateDict: Map<string, boolean>;
     constructor(data: NodeConfig<IGroupNodeProperties>, graphModel: GraphModel);
     initNodeData(data: LogicFlow.NodeConfig<IGroupNodeProperties>): void;
     setAttributes(): void;

package/lib/dynamic-group/model.js

@@ -82,7 +82,8 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
         _this.groupAddable = false;
         // 缩放或旋转容器时，是否缩放或旋转组内节点
         _this.transformWidthContainer = true;
-        _this.childrenLastCollapseStateDict = {};
+        _this.childrenLastCollapseStateDict = new Map();
+        _this.childrenLastCollapseStateDict = new Map();
         _this.initNodeData(data);
         _this.setAttributes();
         return _this;
@@ -90,7 +91,7 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
     DynamicGroupNodeModel.prototype.initNodeData = function (data) {
         var _a;
         _super.prototype.initNodeData.call(this, data);
-        var _b = (_a = data.properties) !== null && _a !== void 0 ? _a : {}, children = _b.children, width = _b.width, height = _b.height, collapsedWidth = _b.collapsedWidth, collapsedHeight = _b.collapsedHeight, collapsible = _b.collapsible, isCollapsed = _b.isCollapsed, zIndex = _b.zIndex, isRestrict = _b.isRestrict, autoToFront = _b.autoToFront;
+        var _b = (_a = data.properties) !== null && _a !== void 0 ? _a : {}, children = _b.children, width = _b.width, height = _b.height, collapsedWidth = _b.collapsedWidth, collapsedHeight = _b.collapsedHeight, collapsible = _b.collapsible, isCollapsed = _b.isCollapsed, zIndex = _b.zIndex, isRestrict = _b.isRestrict, autoResize = _b.autoResize, autoToFront = _b.autoToFront;
         this.children = children ? new Set(children) : new Set();
         this.zIndex = zIndex !== null && zIndex !== void 0 ? zIndex : DEFAULT_BOTTOM_Z_INDEX;
         this.isCollapsed = isCollapsed !== null && isCollapsed !== void 0 ? isCollapsed : false;
@@ -104,6 +105,7 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
         this.collapsedWidth = collapsedWidth !== null && collapsedWidth !== void 0 ? collapsedWidth : DEFAULT_GROUP_COLLAPSE_WIDTH;
         this.collapsedHeight = collapsedHeight !== null && collapsedHeight !== void 0 ? collapsedHeight : DEFAULT_GROUP_COLLAPSE_HEIGHT;
         this.isRestrict = isRestrict !== null && isRestrict !== void 0 ? isRestrict : false;
+        this.autoResize = autoResize !== null && autoResize !== void 0 ? autoResize : false;
         this.collapsible = collapsible !== null && collapsible !== void 0 ? collapsible : true;
         this.autoToFront = autoToFront !== null && autoToFront !== void 0 ? autoToFront : false;
         // 禁用掉 Group 节点的文本编辑能力
@@ -168,11 +170,12 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
         }
         // step 2
         var allRelatedEdges = __spreadArray(__spreadArray([], __read(this.incoming.edges), false), __read(this.outgoing.edges), false);
-        console.log('this -->>', this);
-        console.log('this.children -->>', this.children);
         var childrenArr = Array.from(this.children);
         (0, lodash_es_1.forEach)(childrenArr, function (elementId) {
-            var model = _this.graphModel.getElement(elementId);
+            var _a, _b;
+            // FIX: 当使用 graphModel.getElement 获取元素时，会因为
+            // const model = this.graphModel.getElement(elementId)
+            var model = _this.graphModel.elementsModelMap.get(elementId);
             if (model) {
                 // TODO: ??? 普通节点有这个属性吗？确认这个代码的意义
                 var collapseStatus = model.isCollapsed;
@@ -189,7 +192,7 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
                     }
                     if (!collapse) {
                         // 当 parent 准备展开时，children 的值应该恢复到折叠前的状态
-                        var lastCollapseStatus = _this.childrenLastCollapseStateDict[elementId];
+                        var lastCollapseStatus = (_a = _this.childrenLastCollapseStateDict) === null || _a === void 0 ? void 0 : _a.get(elementId);
                         if (lastCollapseStatus !== undefined &&
                             lastCollapseStatus !== model.isCollapsed) {
                             // https://github.com/didi/LogicFlow/issues/1145
@@ -199,7 +202,7 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
                         }
                     }
                 }
-                _this.childrenLastCollapseStateDict[elementId] = !!collapseStatus;
+                (_b = _this.childrenLastCollapseStateDict) === null || _b === void 0 ? void 0 : _b.set(elementId, !!collapseStatus);
                 model.visible = !collapse;
                 // 判断，如果是节点时，才去读取节点的 incoming 和 outgoing
                 if (model.BaseType === core_1.ElementType.NODE) {
@@ -275,12 +278,12 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
                 graphModel.deleteEdgeById(edge.id);
             }
             // 考虑目标节点也属于分组的情况
-            var targetNodeGroup = graphModel.group.getGroupByNodeId(targetNodeId);
+            var targetNodeGroup = graphModel.dynamicGroup.getGroupByNodeId(targetNodeId);
             if (!targetNodeGroup) {
                 targetNodeGroup = graphModel.getNodeModelById(targetNodeId);
             }
             // 考虑源节点也属于分组的情况
-            var sourceNodeGroup = graphModel.group.getGroupByNodeId(sourceNodeId);
+            var sourceNodeGroup = graphModel.dynamicGroup.getGroupByNodeId(sourceNodeId);
             if (!sourceNodeGroup) {
                 sourceNodeGroup = graphModel.getNodeModelById(sourceNodeId);
             }
@@ -413,4 +416,3 @@ var DynamicGroupNodeModel = /** @class */ (function (_super) {
 }(core_1.RectNodeModel));
 exports.DynamicGroupNodeModel = DynamicGroupNodeModel;
 exports.default = DynamicGroupNodeModel;
-//# sourceMappingURL=model.js.map

package/lib/dynamic-group/node.js

@@ -30,6 +30,7 @@ exports.DynamicGroupNode = void 0;
 var core_1 = require("@logicflow/core");
 var lodash_es_1 = require("lodash-es");
 var resize_1 = require("@logicflow/core/es/util/resize");
+var utils_1 = require("../tools/label/utils");
 var DynamicGroupNode = /** @class */ (function (_super) {
     __extends(DynamicGroupNode, _super);
     function DynamicGroupNode() {
@@ -39,13 +40,30 @@ var DynamicGroupNode = /** @class */ (function (_super) {
         _super.prototype.componentDidMount.call(this);
         var _a = this.props, curGroup = _a.model, graphModel = _a.graphModel;
         var eventCenter = graphModel.eventCenter;
+        var childrenPositionMap = new Map();
         // 在 group 旋转时，对组内的所有子节点也进行对应的旋转计算
         eventCenter.on('node:rotate', function (_a) {
             var model = _a.model;
+            // DONE: 目前操作是对分组内节点以节点中心旋转节点本身，而按照正常逻辑，应该是以分组中心，旋转节点（跟 Label 旋转操作逻辑一致）
             if (model.id === curGroup.id) {
+                var center_1 = { x: curGroup.x, y: curGroup.y };
                 (0, lodash_es_1.forEach)(Array.from(curGroup.children), function (childId) {
                     var child = graphModel.getNodeModelById(childId);
                     if (child) {
+                        var point = { x: child.x, y: child.y };
+                        if (childrenPositionMap.has(child.id)) {
+                            point = childrenPositionMap.get(child.id);
+                        }
+                        else {
+                            childrenPositionMap.set(child.id, point);
+                        }
+                        // 弧度转角度
+                        var theta = model.rotate * (180 / Math.PI);
+                        if (theta < 0)
+                            theta += 360;
+                        var radian = theta * (Math.PI / 180);
+                        var newPoint = (0, utils_1.rotatePointAroundCenter)(point, center_1, radian);
+                        child.moveTo(newPoint.x, newPoint.y);
                         child.rotate = model.rotate;
                     }
                 });
@@ -54,6 +72,7 @@ var DynamicGroupNode = /** @class */ (function (_super) {
         // 在 group 缩放时，对组内的所有子节点也进行对应的缩放计算
         eventCenter.on('node:resize', function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY, index = _a.index, model = _a.model;
+            // TODO: 目前 Resize 的比例值有问题，导致缩放时，节点会变形，需要修复
             if (model.id === curGroup.id) {
                 (0, lodash_es_1.forEach)(Array.from(curGroup.children), function (childId) {
                     var child = graphModel.getNodeModelById(childId);
@@ -143,4 +162,3 @@ var DynamicGroupNode = /** @class */ (function (_super) {
 }(core_1.RectNode));
 exports.DynamicGroupNode = DynamicGroupNode;
 exports.default = DynamicGroupNode;
-//# sourceMappingURL=node.js.map

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

@@ -8,10 +8,12 @@ import BoxBoundsPoint = Model.BoxBoundsPoint;
 export declare function isBoundsInGroup(bounds: BoxBoundsPoint, group: BaseNodeModel): boolean;
 /**
  * 判断 bounds 是否可以移动到下一个范围
- * @param bounds
- * @param group
+ * @param groupBounds
+ * @param node
+ * @param deltaX
+ * @param deltaY
  */
-export declare function isAllowMoveTo(bounds: BoxBoundsPoint, group: BaseNodeModel): {
+export declare function isAllowMoveTo(groupBounds: BoxBoundsPoint, node: BaseNodeModel, deltaX: number, deltaY: number): {
     x: boolean;
     y: boolean;
 };

package/lib/dynamic-group/utils.js

@@ -17,16 +17,22 @@ function isBoundsInGroup(bounds, group) {
 exports.isBoundsInGroup = isBoundsInGroup;
 /**
  * 判断 bounds 是否可以移动到下一个范围
- * @param bounds
- * @param group
+ * @param groupBounds
+ * @param node
+ * @param deltaX
+ * @param deltaY
  */
-function isAllowMoveTo(bounds, group) {
-    var minX = bounds.minX, minY = bounds.minY, maxX = bounds.maxX, maxY = bounds.maxY;
-    var x = group.x, y = group.y, width = group.width, height = group.height;
+function isAllowMoveTo(groupBounds, node, deltaX, deltaY) {
+    var minX = groupBounds.minX, minY = groupBounds.minY, maxX = groupBounds.maxX, maxY = groupBounds.maxY;
+    var x = node.x, y = node.y, width = node.width, height = node.height;
+    // DONE: 计算节点坐标 (x, y) 可移动的范围，并判断 x + deltaX, y + deltaY 是否在范围内
+    var allowMoveMinX = minX + width / 2;
+    var allowMoveMinY = minY + height / 2;
+    var allowMoveMaxX = maxX - width / 2;
+    var allowMoveMaxY = maxY - height / 2;
     return {
-        x: minX >= x - width / 2 && maxX <= x + width / 2,
-        y: minY >= y - height / 2 && maxY <= y + height / 2,
+        x: x + deltaX >= allowMoveMinX && x + deltaX <= allowMoveMaxX,
+        y: y + deltaY >= allowMoveMinY && y + deltaY <= allowMoveMaxY,
     };
 }
 exports.isAllowMoveTo = isAllowMoveTo;
-//# sourceMappingURL=utils.js.map