@logicflow/extension 1.1.0-alpha.0 → 1.1.0-alpha.4

package/cjs/NodeResize/Control/Control.js

@@ -270,7 +270,8 @@ var Control = /** @class */ (function (_super) {
         _this.onDraging = function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY;
             var modelType = _this.nodeModel.modelType;
-            if (modelType === Util_1.ModelType.RECT_NODE) {
+            // html和矩形的计算方式是一样的，共用一个方法
+            if (modelType === Util_1.ModelType.RECT_NODE || modelType === Util_1.ModelType.HTML_NODE) {
                 _this.updateRect({ deltaX: deltaX, deltaY: deltaY });
             }
             else if (modelType === Util_1.ModelType.ELLIPSE_NODE) {

package/cjs/NodeResize/Control/Util.js

@@ -7,6 +7,7 @@ var ModelType;
     ModelType["CIRCLE_NODE"] = "circle-node";
     ModelType["POLYGON_NODE"] = "polygon-node";
     ModelType["RECT_NODE"] = "rect-node";
+    ModelType["HTML_NODE"] = "html-node";
     ModelType["TEXT_NODE"] = "text-node";
     ModelType["ELLIPSE_NODE"] = "ellipse-node";
     ModelType["DIAMOND_NODE"] = "diamond-node";

package/cjs/NodeResize/Node/EllipseResize.js

@@ -12,21 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@logicflow/core");
 var ControlGroup_1 = require("../Control/ControlGroup");
-var Ellipse_1 = require("../BasicShape/Ellipse");
 var EllipseResizeModel = /** @class */ (function (_super) {
     __extends(EllipseResizeModel, _super);
     function EllipseResizeModel(data, graphModel) {
@@ -68,11 +56,7 @@ var EllipseResizeView = /** @class */ (function (_super) {
     };
     // getResizeShape绘制图形，功能等同于基础椭圆的getShape功能，可以通过复写此方法，进行节点自定义
     EllipseResizeView.prototype.getResizeShape = function () {
-        var model = this.props.model;
-        var rx = model.rx, ry = model.ry, x = model.x, y = model.y;
-        var style = model.getNodeStyle();
-        return (core_1.h("g", null,
-            core_1.h(Ellipse_1.default, __assign({}, style, { rx: rx, ry: ry, x: x, y: y }))));
+        return _super.prototype.getShape.call(this);
     };
     EllipseResizeView.prototype.getShape = function () {
         var model = this.props.model;

package/cjs/NodeResize/Node/HtmlResize.js

@@ -0,0 +1,72 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var core_1 = require("@logicflow/core");
+var ControlGroup_1 = require("../Control/ControlGroup");
+var HtmlResizeModel = /** @class */ (function (_super) {
+    __extends(HtmlResizeModel, _super);
+    function HtmlResizeModel() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.minWidth = 30;
+        _this.minHeight = 30;
+        _this.maxWidth = 2000;
+        _this.maxHeight = 2000;
+        return _this;
+    }
+    HtmlResizeModel.prototype.getOutlineStyle = function () {
+        var style = _super.prototype.getOutlineStyle.call(this);
+        style.stroke = 'none';
+        if (style.hover) {
+            style.hover.stroke = 'none';
+        }
+        return style;
+    };
+    HtmlResizeModel.prototype.setAttributes = function () {
+        // @ts-ignore
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.width = nodeSize.width;
+            this.height = nodeSize.height;
+        }
+    };
+    return HtmlResizeModel;
+}(core_1.HtmlNodeModel));
+var HtmlResizeView = /** @class */ (function (_super) {
+    __extends(HtmlResizeView, _super);
+    function HtmlResizeView() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    HtmlResizeView.prototype.getControlGroup = function () {
+        var _a = this.props, model = _a.model, graphModel = _a.graphModel;
+        return (core_1.h(ControlGroup_1.default, { model: model, graphModel: graphModel }));
+    };
+    // getResizeShape绘制图形，功能等同于基础矩形的getShape功能，可以通过复写此方法，进行节点自定义
+    HtmlResizeView.prototype.getResizeShape = function () {
+        return _super.prototype.getShape.call(this);
+    };
+    HtmlResizeView.prototype.getShape = function () {
+        var isSelected = this.props.model.isSelected;
+        return (core_1.h("g", null,
+            this.getResizeShape(),
+            isSelected ? this.getControlGroup() : ''));
+    };
+    return HtmlResizeView;
+}(core_1.HtmlNode));
+var HtmlResize = {
+    type: 'html',
+    view: HtmlResizeView,
+    model: HtmlResizeModel,
+};
+exports.default = HtmlResize;

package/cjs/NodeResize/index.js

@@ -7,6 +7,7 @@ var EllipseResize_1 = require("./Node/EllipseResize");
 exports.EllipseResize = EllipseResize_1.default;
 var DiamondResize_1 = require("./Node/DiamondResize");
 exports.DiamondResize = DiamondResize_1.default;
+var HtmlResize_1 = require("./Node/HtmlResize");
 var NodeResize = {
     pluginName: 'nodeResize',
     // 拖动step
@@ -62,6 +63,11 @@ var NodeResize = {
             view: DiamondResize_1.default.view,
             model: DiamondResize_1.default.model,
         });
+        lf.register({
+            type: HtmlResize_1.default.type,
+            view: HtmlResize_1.default.view,
+            model: HtmlResize_1.default.model,
+        });
     },
 };
 exports.NodeResize = NodeResize;

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

@@ -33,7 +33,7 @@ var ContextMenu = /** @class */ (function () {
         this.__menuDOM.className = 'lf-inner-context';
         this.menuTypeMap.set(COMMON_TYPE_KEY, []);
         this.lf.setContextMenuByType = function (type, menus) {
-            _this.menuTypeMap.set(type, menus);
+            _this.setContextMenuByType(type, menus);
         };
         this.lf.setContextMenuItems = function (menus) {
             _this.setContextMenuItems(menus);
@@ -63,6 +63,9 @@ var ContextMenu = /** @class */ (function () {
             _this.hideContextMenu();
         });
     };
+    ContextMenu.prototype.setContextMenuByType = function (type, menus) {
+        this.menuTypeMap.set(type, menus);
+    };
     /**
      * 隐藏菜单
      */

package/cjs/components/menu/index.js

@@ -33,13 +33,13 @@ var Menu = /** @class */ (function () {
         this.lf = lf;
         this.menuTypeMap = new Map();
         this.init();
-        this.lf.extension.menu.setMenuConfig = function (config) {
+        this.lf.setMenuConfig = function (config) {
             _this.setMenuConfig(config);
         };
-        this.lf.extension.menu.addMenuConfig = function (config) {
+        this.lf.addMenuConfig = function (config) {
             _this.addMenuConfig(config);
         };
-        this.lf.extension.menu.setMenuByType = function (config) {
+        this.lf.setMenuByType = function (config) {
             _this.setMenuByType(config);
         };
     }

package/cjs/group-shrink/index.js

@@ -0,0 +1,213 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spread = (this && this.__spread) || function () {
+    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GroupShrink = void 0;
+var lodash_es_1 = require("lodash-es");
+var GroupShrink = /** @class */ (function () {
+    function GroupShrink(_a) {
+        var _this = this;
+        var lf = _a.lf;
+        var _b;
+        this.group = null; // group节点
+        this.lf = null; // lf 实例
+        this.shrinkWidth = 100; // 收缩后节点宽度
+        this.shrinkHeight = 60; // 收缩后节点高度
+        this.getGraphDataWithGroup = function () {
+            var _a = _this.lf.graphModel.modelToGraphData(), nodes = _a.nodes, edges = _a.edges;
+            var groupNodes = [];
+            var groupEdges = [];
+            var shrinkedGroupIds = [];
+            nodes.forEach(function (node) {
+                if (node.type === 'group' && node.properties.shrinkProperty && node.properties.shrinkProperty) {
+                    var _a = node.properties.shrinkProperty, shrinked = _a.shrinked, groupNode = _a.groupNode, innerNodes = _a.innerNodes, innerEdges = _a.innerEdges;
+                    if (shrinked) {
+                        // 是收缩状态下的分组节点，需要恢复原来的节点和边
+                        node = groupNode;
+                        groupNodes = __spread(groupNodes, innerNodes);
+                        groupEdges = __spread(groupEdges, innerEdges);
+                        shrinkedGroupIds.push(groupNode.id);
+                    }
+                }
+            });
+            // 移除与收缩分组节点相连的边
+            if (shrinkedGroupIds.length) {
+                lodash_es_1.remove(edges, function (edge) {
+                    var sourceNodeId = edge.sourceNodeId, targetNodeId = edge.targetNodeId;
+                    return shrinkedGroupIds.indexOf(sourceNodeId) > -1
+                        || shrinkedGroupIds.indexOf(targetNodeId) > -1;
+                });
+            }
+            return {
+                nodes: __spread(nodes, groupNodes),
+                edges: __spread(edges, groupEdges),
+            };
+        };
+        this.lf = lf;
+        this.lf.extension = __assign(__assign({}, ((_b = this.lf.extension) !== null && _b !== void 0 ? _b : {})), { groupShrink: this });
+        this.lf.getGraphData = this.getGraphDataWithGroup;
+    }
+    /**
+     * 收缩
+     */
+    GroupShrink.prototype.startShrink = function (group) {
+        var _this = this;
+        if (group.type !== 'group') {
+            throw new Error('Only groupNode can be shrinked!');
+        }
+        this.group = group;
+        var nodeModel = this.lf.getNodeModelById(group.id);
+        var shrinkConfig = nodeModel.getProperties().shrinkProperty;
+        if (shrinkConfig && shrinkConfig.shrinked) {
+            throw new Error('GroupNode which is shrinked cannot be shrinked again!');
+        }
+        var shrinkProperty = {
+            shrinked: true,
+            groupNode: __assign({}, this.group),
+            innerNodes: [],
+            innerEdges: [],
+        };
+        var newEdges = []; // 需要重新生成的边
+        var innerNodes = []; // 分组内节点
+        var innerEdges = []; // 分组内部边
+        var minX = null;
+        var minY = null;
+        // 处理分组内的节点和边
+        if (this.group && this.group.children && this.group.children.length) {
+            var edgesInfo = this.getGroupEdges();
+            newEdges = edgesInfo.newEdges;
+            innerEdges = edgesInfo.innerEdges;
+            var nodesInfo = this.getGroupNodes();
+            innerNodes = nodesInfo.innerNodes; // 分组内节点信息
+            minX = nodesInfo.minX; // 左上角节点的x
+            minY = nodesInfo.minY; // 左上角节点的y
+        }
+        shrinkProperty.innerNodes = innerNodes;
+        shrinkProperty.innerEdges = innerEdges;
+        this.lf.setProperties(this.group.id, { shrinkProperty: shrinkProperty }); // 分组节点收缩前状态、分组内节点、分组内边存入properties
+        // 收缩后的分组节点移动到分组内左上角的节点位置
+        nodeModel.x = minX || this.group.x;
+        nodeModel.y = minY || this.group.y;
+        // 收缩，调整节点大小
+        nodeModel.width = this.shrinkWidth;
+        nodeModel.height = this.shrinkHeight;
+        // 生成与分组节点相连的边
+        newEdges.forEach(function (edgeConfig) {
+            _this.lf.addEdge(edgeConfig);
+        });
+    };
+    /**
+     * 展开
+     */
+    GroupShrink.prototype.startExpand = function (group) {
+        var _this = this;
+        this.group = group;
+        var nodeModel = this.lf.getNodeModelById(group.id);
+        var _a = nodeModel.getProperties().shrinkProperty, shrinkProperty = _a === void 0 ? {} : _a;
+        var shrinked = shrinkProperty.shrinked, groupNode = shrinkProperty.groupNode, innerNodes = shrinkProperty.innerNodes, innerEdges = shrinkProperty.innerEdges;
+        if (!shrinked) {
+            throw new Error('GroupNode which is not shrinked cannot be expanded');
+        }
+        // 重新渲染分组节点
+        this.lf.deleteNode(group.id);
+        this.lf.addNode(groupNode);
+        // 恢复分组内的节点
+        innerNodes.forEach(function (item) {
+            _this.lf.addNode(item);
+        });
+        // 恢复分组内的节点上所有边
+        innerEdges.forEach(function (item) {
+            _this.lf.addEdge(item);
+        });
+        // 修改properties
+        this.lf.setProperties(group.id, { shrinkProperty: { shrinked: false } });
+    };
+    /**
+     * 获取分组内的节点上的所有边,以及计算新的分组节点需要连接的边，之后删除原来的边
+     */
+    GroupShrink.prototype.getGroupEdges = function () {
+        var _this = this;
+        var edges = this.lf.graphModel.modelToGraphData().edges;
+        var children = this.group.children;
+        var innerEdges = [];
+        var newEdges = [];
+        edges.forEach(function (item) {
+            var startInGroup = children.indexOf(item.sourceNodeId) > -1;
+            var endInGroup = children.indexOf(item.targetNodeId) > -1;
+            if (startInGroup || endInGroup) {
+                innerEdges.push(item);
+                if (startInGroup && !endInGroup) {
+                    // 从分组内向外的边
+                    newEdges.push({
+                        sourceNodeId: _this.group.id,
+                        targetNodeId: item.targetNodeId,
+                    });
+                }
+                if (!startInGroup && endInGroup) {
+                    // 从外部指向分组内的
+                    newEdges.push({
+                        sourceNodeId: item.sourceNodeId,
+                        targetNodeId: _this.group.id,
+                    });
+                }
+                _this.lf.deleteEdge(item.id);
+            }
+        });
+        return { innerEdges: innerEdges, newEdges: newEdges };
+    };
+    /**
+     * 获取分组内的节点和左上角节点,获取到有效信息后，删除节点
+     */
+    GroupShrink.prototype.getGroupNodes = function () {
+        var _this = this;
+        var innerNodes = [];
+        var nodes = this.lf.graphModel.modelToGraphData().nodes;
+        var children = this.group.children;
+        var minX = null;
+        var minY = null;
+        // 遍历所有节点，在分组内的， 暂存&删除
+        nodes.forEach(function (item) {
+            if (children.indexOf(item.id) > -1) {
+                innerNodes.push(item);
+                if ((!minX || item.x < minX) && (!minY || item.y < minY)) {
+                    minX = item.x;
+                    minY = item.y;
+                }
+                _this.lf.deleteNode(item.id);
+            }
+        });
+        return { innerNodes: innerNodes, minX: minX, minY: minY };
+    };
+    GroupShrink.pluginName = 'group-shrink';
+    return GroupShrink;
+}());
+exports.GroupShrink = GroupShrink;

package/cjs/index.js

@@ -29,3 +29,4 @@ __exportStar(require("./tools/flow-path"), exports);
 __exportStar(require("./tools/auto-layout"), exports);
 __exportStar(require("./bpmn-adapter/xml2json"), exports);
 __exportStar(require("./bpmn-adapter/json2xml"), exports);
+__exportStar(require("./group-shrink"), exports);

package/cjs/materials/group/GroupNode.js

@@ -12,6 +12,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -34,27 +45,118 @@ var __spread = (this && this.__spread) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@logicflow/core");
+var NodeResize_1 = require("../../NodeResize");
+var defaultWidth = 500;
+var defaultHeight = 300;
 var GroupNodeModel = /** @class */ (function (_super) {
     __extends(GroupNodeModel, _super);
     function GroupNodeModel() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.isGroup = true;
-        _this.children = new Set();
-        _this.isRestrict = true; // 其子节点是否被禁止通过拖拽移出分组。 默认false，允许拖拽移除分组。
+        // isFolded: boolean;
+        _this.foldedWidth = 100;
+        _this.foldedHeight = 40;
+        _this.unfoldedWidth = defaultWidth;
+        _this.unfoldedHight = defaultHeight;
         return _this;
     }
-    GroupNodeModel.prototype.setAttributes = function () {
-        this.width = 500;
-        this.height = 200;
-        this.strokeWidth = 1;
-        this.zIndex = 0;
+    GroupNodeModel.prototype.initNodeData = function (data) {
+        _super.prototype.initNodeData.call(this, data);
+        var children = [];
+        if (Array.isArray(data.children)) {
+            children = data.children;
+        }
+        // 初始化组的子节点
+        this.children = new Set(children);
+        this.width = defaultWidth;
+        this.height = defaultHeight;
+        // todo: 参考bpmn.js, 分组和未加入分组的节点重合时，未加入分组的节点在分组之下。方便标识。
+        this.zIndex = -1;
         this.radius = 0;
+        this.text.editable = false;
+        this.text.draggable = false;
+        this.isRestrict = false;
+        this.resizable = false;
+        this.autoToFront = false;
+        this.isFolded = false;
+        this.properties.isFolded = false;
+    };
+    GroupNodeModel.prototype.foldGroup = function (isFolded) {
+        var _this = this;
+        this.setProperty('isFolded', isFolded);
+        if (isFolded) {
+            this.x = this.x - this.width / 2 + this.foldedWidth / 2;
+            this.y = this.y - this.height / 2 + this.foldedHeight / 2;
+            this.unfoldedWidth = this.width;
+            this.unfoldedHight = this.height;
+            this.width = this.foldedWidth;
+            this.height = this.foldedHeight;
+        }
+        else {
+            this.width = this.unfoldedWidth;
+            this.height = this.unfoldedHight;
+            this.x = this.x + this.width / 2 - this.foldedWidth / 2;
+            this.y = this.y + this.height / 2 - this.foldedHeight / 2;
+        }
+        // 移动分组上的连线
+        var inCommingEdges = this.graphModel.getNodeIncomingEdge(this.id);
+        var outgoingEdges = this.graphModel.getNodeOutgoingEdge(this.id);
+        inCommingEdges.concat(outgoingEdges).forEach(function (edgeModel) {
+            _this.graphModel.deleteEdgeById(edgeModel.id);
+            if (!edgeModel.isFoldedEdge) {
+                var isCommingEdge = edgeModel.targetNodeId === _this.id;
+                var data = edgeModel.getData();
+                if (isCommingEdge) {
+                    data.endPoint = undefined;
+                }
+                else {
+                    data.startPoint = undefined;
+                }
+                data.pointsList = undefined;
+                _this.graphModel.addEdge(data);
+            }
+        });
+        this.children.forEach(function (elementId) {
+            var nodeModel = _this.graphModel.getElement(elementId);
+            nodeModel.visible = !isFolded;
+            _this.foldEdge(elementId, isFolded);
+        });
     };
     /**
-     * 设置是否允许子节点被拖动移除分组
+     * 折叠分组的时候，处理分组内部子节点上的连线
+     * 1. 为了保证校验规则不被打乱，所以只隐藏子节点上面的连线。
+     * 2. 重新创建一个属性一样的边。
+     * 3. 这个边拥有virtual=true的属性，表示不支持直接修改此边内容。
      */
-    GroupNodeModel.prototype.setIsRestrict = function (isRestrict) {
-        this.isRestrict = isRestrict;
+    GroupNodeModel.prototype.foldEdge = function (nodeId, isFolded) {
+        var _this = this;
+        var inCommingEdges = this.graphModel.getNodeIncomingEdge(nodeId);
+        var outgoingEdges = this.graphModel.getNodeOutgoingEdge(nodeId);
+        inCommingEdges.concat(outgoingEdges).forEach(function (edgeModel, index) {
+            var _a;
+            edgeModel.visible = !isFolded;
+            var isCommingEdge = edgeModel.targetNodeId === nodeId;
+            if (isFolded) {
+                var data = edgeModel.getData();
+                data.id = data.id + "__" + index;
+                if (isCommingEdge) {
+                    data.endPoint = undefined;
+                    data.targetNodeId = _this.id;
+                }
+                else {
+                    data.startPoint = undefined;
+                    data.sourceNodeId = _this.id;
+                }
+                data.text = (_a = data.text) === null || _a === void 0 ? void 0 : _a.value;
+                data.pointsList = undefined;
+                var model = _this.graphModel.addEdge(data);
+                model.virtual = true;
+                // 强制不保存group连线数据
+                model.getData = function () { return null; };
+                model.text.editable = false;
+                model.isFoldedEdge = true;
+            }
+        });
     };
     GroupNodeModel.prototype.isInRange = function (_a) {
         var x1 = _a.x1, y1 = _a.y1, x2 = _a.x2, y2 = _a.y2;
@@ -63,39 +165,100 @@ var GroupNodeModel = /** @class */ (function (_super) {
             && y1 >= (this.y - this.height / 2)
             && y2 <= (this.y + this.height / 2);
     };
-    // todo: 更好的方式定义分组的样式
     GroupNodeModel.prototype.setAllowAppendChild = function (isAllow) {
-        if (isAllow) {
-            this.stroke = 'red';
-        }
-        else {
-            this.stroke = 'rgb(24, 125, 255)';
-        }
+        this.setProperty('groupAddable', isAllow);
     };
+    /**
+     * 添加分组子节点
+     * @param id 节点id
+     */
     GroupNodeModel.prototype.addChild = function (id) {
         this.children.add(id);
     };
+    /**
+     * 删除分组子节点
+     * @param id 节点id
+     */
     GroupNodeModel.prototype.removeChild = function (id) {
         this.children.delete(id);
     };
+    GroupNodeModel.prototype.getAddableOutlineStyle = function () {
+        return {
+            stroke: '#FEB663',
+            strokeWidth: 2,
+            strokeDasharray: '4 4',
+            fill: 'transparent',
+        };
+    };
     GroupNodeModel.prototype.getData = function () {
         var data = _super.prototype.getData.call(this);
         data.children = __spread(this.children);
+        var properties = data.properties;
+        delete properties.groupAddable;
+        delete properties.isFolded;
         return data;
     };
     return GroupNodeModel;
-}(core_1.RectNodeModel));
+}(NodeResize_1.RectResize.model));
 var GroupNode = /** @class */ (function (_super) {
     __extends(GroupNode, _super);
     function GroupNode() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    /**
-     * 重新toFront，阻止其置顶
-     */
-    GroupNode.prototype.toFront = function () { };
+    GroupNode.prototype.getControlGroup = function () {
+        return this.props.model.resizable ? _super.prototype.getControlGroup.call(this) : null;
+    };
+    GroupNode.prototype.getAddedableShape = function () {
+        var _a = this.props.model, width = _a.width, height = _a.height, x = _a.x, y = _a.y, radius = _a.radius, properties = _a.properties;
+        if (!properties.groupAddable)
+            return null;
+        var strokeWidth = this.props.model.getNodeStyle().strokeWidth;
+        var style = this.props.model.getAddableOutlineStyle();
+        var newWidth = width + strokeWidth + 8;
+        var newHeight = height + strokeWidth + 8;
+        return core_1.h('rect', __assign(__assign({}, style), { width: newWidth, height: newHeight, x: x - newWidth / 2, y: y - newHeight / 2, rx: radius, ry: radius }));
+    };
+    GroupNode.prototype.getFoldIcon = function () {
+        var model = this.props.model;
+        var foldX = model.x - model.width / 2 + 5;
+        var foldY = model.y - model.height / 2 + 5;
+        var iconIcon = core_1.h('path', {
+            fill: 'none',
+            stroke: '#818281',
+            strokeWidth: 2,
+            'pointer-events': 'none',
+            d: model.properties.isFolded
+                ? "M " + (foldX + 3) + "," + (foldY + 6) + " " + (foldX + 11) + "," + (foldY + 6) + " M" + (foldX + 7) + "," + (foldY + 2) + " " + (foldX + 7) + "," + (foldY + 10)
+                : "M " + (foldX + 3) + "," + (foldY + 6) + " " + (foldX + 11) + "," + (foldY + 6) + " ",
+        });
+        return core_1.h('g', {}, [
+            core_1.h('rect', {
+                height: 12,
+                width: 14,
+                rx: 2,
+                ry: 2,
+                strokeWidth: 1,
+                fill: '#F4F5F6',
+                stroke: '#CECECE',
+                cursor: 'pointer',
+                x: model.x - model.width / 2 + 5,
+                y: model.y - model.height / 2 + 5,
+                onClick: function () {
+                    model.foldGroup(!model.properties.isFolded);
+                },
+            }),
+            iconIcon,
+        ]);
+    };
+    GroupNode.prototype.getResizeShape = function () {
+        return core_1.h('g', {}, [
+            this.getAddedableShape(),
+            _super.prototype.getResizeShape.call(this),
+            this.getFoldIcon(),
+        ]);
+    };
     return GroupNode;
-}(core_1.RectNode));
+}(NodeResize_1.RectResize.view));
 exports.default = {
     type: 'group',
     view: GroupNode,