@logicflow/extension 1.1.0-alpha.3 → 1.1.0-alpha.7

package/es/NodeResize/Node/EllipseResize.d.ts

@@ -6,6 +6,17 @@ declare class EllipseResizeModel extends EllipseNodeModel {
     maxHeight: number;
     constructor(data: any, graphModel: any);
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
+    getResizeOutlineStyle(): {
+        stroke: string;
+        strokeWidth: number;
+        strokeDasharray: string;
+    };
+    getControlPointStyle(): {
+        width: number;
+        height: number;
+        fill: string;
+        stroke: string;
+    };
     setAttributes(): void;
 }
 declare class EllipseResizeView extends EllipseNode {

package/es/NodeResize/Node/EllipseResize.js

@@ -33,6 +33,21 @@ var EllipseResizeModel = /** @class */ (function (_super) {
         }
         return style;
     };
+    EllipseResizeModel.prototype.getResizeOutlineStyle = function () {
+        return {
+            stroke: '#000000',
+            strokeWidth: 1,
+            strokeDasharray: '3,3',
+        };
+    };
+    EllipseResizeModel.prototype.getControlPointStyle = function () {
+        return {
+            width: 7,
+            height: 7,
+            fill: '#FFFFFF',
+            stroke: '#000000',
+        };
+    };
     EllipseResizeModel.prototype.setAttributes = function () {
         // @ts-ignore
         var nodeSize = this.properties.nodeSize;

package/es/NodeResize/Node/HtmlResize.d.ts

@@ -5,6 +5,17 @@ declare class HtmlResizeModel extends HtmlNodeModel {
     maxWidth: number;
     maxHeight: number;
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
+    getResizeOutlineStyle(): {
+        stroke: string;
+        strokeWidth: number;
+        strokeDasharray: string;
+    };
+    getControlPointStyle(): {
+        width: number;
+        height: number;
+        fill: string;
+        stroke: string;
+    };
     setAttributes(): void;
 }
 declare class HtmlResizeView extends HtmlNode {

package/es/NodeResize/Node/HtmlResize.js

@@ -31,6 +31,21 @@ var HtmlResizeModel = /** @class */ (function (_super) {
         }
         return style;
     };
+    HtmlResizeModel.prototype.getResizeOutlineStyle = function () {
+        return {
+            stroke: '#000000',
+            strokeWidth: 1,
+            strokeDasharray: '3,3',
+        };
+    };
+    HtmlResizeModel.prototype.getControlPointStyle = function () {
+        return {
+            width: 7,
+            height: 7,
+            fill: '#FFFFFF',
+            stroke: '#000000',
+        };
+    };
     HtmlResizeModel.prototype.setAttributes = function () {
         // @ts-ignore
         var nodeSize = this.properties.nodeSize;

package/es/NodeResize/Node/RectResize.d.ts

@@ -5,7 +5,20 @@ declare class RectResizeModel extends RectNodeModel {
     maxWidth: number;
     maxHeight: number;
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
+    getResizeOutlineStyle(): {
+        fill: string;
+        stroke: string;
+        strokeWidth: number;
+        strokeDasharray: string;
+    };
+    getControlPointStyle(): {
+        width: number;
+        height: number;
+        fill: string;
+        stroke: string;
+    };
     setAttributes(): void;
+    resize(deltaX: any, deltaY: any): void;
 }
 declare class RectResizeView extends RectNode {
     getControlGroup(): h.JSX.Element;

package/es/NodeResize/Node/RectResize.js

@@ -31,6 +31,22 @@ var RectResizeModel = /** @class */ (function (_super) {
         }
         return style;
     };
+    RectResizeModel.prototype.getResizeOutlineStyle = function () {
+        return {
+            fill: 'none',
+            stroke: '#000000',
+            strokeWidth: 1,
+            strokeDasharray: '3,3',
+        };
+    };
+    RectResizeModel.prototype.getControlPointStyle = function () {
+        return {
+            width: 7,
+            height: 7,
+            fill: '#FFFFFF',
+            stroke: '#000000',
+        };
+    };
     RectResizeModel.prototype.setAttributes = function () {
         // @ts-ignore
         var nodeSize = this.properties.nodeSize;
@@ -39,6 +55,9 @@ var RectResizeModel = /** @class */ (function (_super) {
             this.height = nodeSize.height;
         }
     };
+    RectResizeModel.prototype.resize = function (deltaX, deltaY) {
+        console.log(deltaX, deltaY);
+    };
     return RectResizeModel;
 }(RectNodeModel));
 var RectResizeView = /** @class */ (function (_super) {

package/es/NodeResize/index.d.ts

@@ -1,37 +1,11 @@
 import RectResize from './Node/RectResize';
 import EllipseResize from './Node/EllipseResize';
 import DiamondResize from './Node/DiamondResize';
+import HtmlResize from './Node/HtmlResize';
 declare const NodeResize: {
     pluginName: string;
     step: number;
-    style: {
-        outline: {
-            stroke: string;
-            strokeWidth: number;
-            strokeDasharray: string;
-        };
-        controlPoint: {
-            width: number;
-            height: number;
-            fill: string;
-            stroke: string;
-        };
-    };
-    sizeRange: {
-        ellipse: {
-            minRx: number;
-            minRy: number;
-            maxRx: number;
-            maxRy: number;
-        };
-        diamond: {
-            minRx: number;
-            minRy: number;
-            maxRx: number;
-            maxRy: number;
-        };
-    };
     install(lf: any): void;
 };
 export default NodeResize;
-export { NodeResize, RectResize, EllipseResize, DiamondResize, };
+export { NodeResize, RectResize, EllipseResize, DiamondResize, HtmlResize, };

package/es/NodeResize/index.js

@@ -6,41 +6,6 @@ var NodeResize = {
     pluginName: 'nodeResize',
     // 拖动step
     step: 0,
-    // 边框和contol拖动点样式的设置
-    style: {
-        outline: {
-            stroke: '#000000',
-            strokeWidth: 1,
-            strokeDasharray: '3,3',
-        },
-        controlPoint: {
-            width: 7,
-            height: 7,
-            fill: '#FFFFFF',
-            stroke: '#000000',
-        },
-    },
-    // 缩放范围
-    sizeRange: {
-        // rect: {
-        //   minWidth: 30,
-        //   minHeight: 30,
-        //   maxWidth: 300,
-        //   maxHeight: 300,
-        // },
-        ellipse: {
-            minRx: 15,
-            minRy: 15,
-            maxRx: 150,
-            maxRy: 150,
-        },
-        diamond: {
-            minRx: 15,
-            minRy: 15,
-            maxRx: 150,
-            maxRy: 150,
-        },
-    },
     install: function (lf) {
         lf.register({
             type: RectResize.type,
@@ -65,4 +30,4 @@ var NodeResize = {
     },
 };
 export default NodeResize;
-export { NodeResize, RectResize, EllipseResize, DiamondResize, };
+export { NodeResize, RectResize, EllipseResize, DiamondResize, HtmlResize, };

package/es/materials/group/GroupNode.d.ts

@@ -5,7 +5,27 @@ declare class GroupNodeModel extends RectResize.model {
     children: Set<string>;
     isRestrict: boolean;
     resizable: boolean;
+    foldable: boolean;
+    foldedWidth: number;
+    foldedHeight: number;
+    isFolded: boolean;
+    unfoldedWidth: number;
+    unfoldedHight: number;
     initNodeData(data: any): void;
+    getResizeOutlineStyle(): {
+        fill: string;
+        stroke: string;
+        strokeWidth: number;
+        strokeDasharray: string;
+    };
+    foldGroup(isFolded: any): void;
+    /**
+     * 折叠分组的时候，处理分组内部子节点上的连线
+     * 1. 为了保证校验规则不被打乱，所以只隐藏子节点上面的连线。
+     * 2. 重新创建一个属性一样的边。
+     * 3. 这个边拥有virtual=true的属性，表示不支持直接修改此边内容。
+     */
+    private foldEdge;
     isInRange({ x1, y1, x2, y2 }: {
         x1: any;
         y1: any;
@@ -32,12 +52,9 @@ declare class GroupNodeModel extends RectResize.model {
     getData(): import("@logicflow/core").NodeData;
 }
 declare class GroupNode extends RectResize.view {
-    /**
-     * 重新toFront，阻止其置顶
-     */
-    toFront(): void;
     getControlGroup(): h.JSX.Element;
     getAddedableShape(): import("preact").VNode<any>;
+    getFoldIcon(): import("preact").VNode<any>;
     getResizeShape(): import("preact").VNode<any>;
 }
 declare const _default: {

package/es/materials/group/GroupNode.js

@@ -44,11 +44,15 @@ var __spread = (this && this.__spread) || function () {
 };
 import { h } from '@logicflow/core';
 import { RectResize } from '../../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.unfoldedWidth = defaultWidth;
+        _this.unfoldedHight = defaultHeight;
         return _this;
     }
     GroupNodeModel.prototype.initNodeData = function (data) {
@@ -59,8 +63,10 @@ var GroupNodeModel = /** @class */ (function (_super) {
         }
         // 初始化组的子节点
         this.children = new Set(children);
-        this.width = 500;
-        this.height = 200;
+        this.width = defaultWidth;
+        this.height = defaultHeight;
+        this.foldedWidth = 80;
+        this.foldedHeight = 60;
         // todo: 参考bpmn.js, 分组和未加入分组的节点重合时，未加入分组的节点在分组之下。方便标识。
         this.zIndex = -1;
         this.radius = 0;
@@ -68,6 +74,97 @@ var GroupNodeModel = /** @class */ (function (_super) {
         this.text.draggable = false;
         this.isRestrict = false;
         this.resizable = false;
+        this.autoToFront = false;
+        this.foldable = false;
+        this.properties.isFolded = false;
+        this.isFolded = this.properties.isFolded;
+    };
+    GroupNodeModel.prototype.getResizeOutlineStyle = function () {
+        var style = _super.prototype.getResizeOutlineStyle.call(this);
+        style.stroke = 'none';
+        return style;
+    };
+    GroupNodeModel.prototype.foldGroup = function (isFolded) {
+        var _this = this;
+        this.setProperty('isFolded', isFolded);
+        this.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.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;
+            if (isFolded
+                && (!_this.children.has(edgeModel.targetNodeId)
+                    || !_this.children.has(edgeModel.sourceNodeId))) {
+                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;
@@ -106,6 +203,7 @@ var GroupNodeModel = /** @class */ (function (_super) {
         data.children = __spread(this.children);
         var properties = data.properties;
         delete properties.groupAddable;
+        delete properties.isFolded;
         return data;
     };
     return GroupNodeModel;
@@ -115,12 +213,9 @@ var GroupNode = /** @class */ (function (_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;
+        var _a = this.props.model, resizable = _a.resizable, properties = _a.properties;
+        return resizable && !properties.isFolded ? _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;
@@ -132,10 +227,45 @@ var GroupNode = /** @class */ (function (_super) {
         var newHeight = height + strokeWidth + 8;
         return 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;
+        if (!model.foldable)
+            return null;
+        var iconIcon = 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 h('g', {}, [
+            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 h('g', {}, [
             this.getAddedableShape(),
             _super.prototype.getResizeShape.call(this),
+            this.getFoldIcon(),
         ]);
     };
     return GroupNode;

package/es/materials/group/index.js

@@ -94,7 +94,7 @@ var Group = /** @class */ (function () {
         });
         lf.on('node:add', this.appendNodeToGrop);
         lf.on('node:drop', this.appendNodeToGrop);
-        lf.on('node:dnd-move', this.setActiveGroup);
+        lf.on('node:dnd-drag', this.setActiveGroup);
         lf.on('node:drag', this.setActiveGroup);
         lf.on('graph:rendered', this.graphRendered);
     }

package/es/tools/snapshot/index.js

@@ -6,21 +6,25 @@ var Snapshot = {
     install: function (lf) {
         var _this = this;
         this.lf = lf;
-        this.offsetX = Number.MAX_SAFE_INTEGER;
-        this.offsetY = Number.MAX_SAFE_INTEGER;
         /* 下载快照 */
         lf.getSnapshot = function (fileName, backgroundColor) {
+            _this.offsetX = Number.MAX_SAFE_INTEGER;
+            _this.offsetY = Number.MAX_SAFE_INTEGER;
             _this.fileName = fileName || "logic-flow." + Date.now() + ".png";
             var svgRootElement = _this.getSvgRootElement(lf);
             _this.downloadSvg(svgRootElement, _this.fileName, backgroundColor);
         };
         /* 获取Blob对象，用户图片上传 */
         lf.getSnapshotBlob = function (backgroundColor) {
+            _this.offsetX = Number.MAX_SAFE_INTEGER;
+            _this.offsetY = Number.MAX_SAFE_INTEGER;
             var svgRootElement = _this.getSvgRootElement(lf);
             return _this.getBlob(svgRootElement, backgroundColor);
         };
         /* 获取Base64对象，用户图片上传 */
         lf.getSnapshotBase64 = function (backgroundColor) {
+            _this.offsetX = Number.MAX_SAFE_INTEGER;
+            _this.offsetY = Number.MAX_SAFE_INTEGER;
             var svgRootElement = _this.getSvgRootElement(lf);
             return _this.getBase64(svgRootElement, backgroundColor);
         };
@@ -172,6 +176,7 @@ var Snapshot = {
         canvas.width = bboxWidth * dpr + 80;
         canvas.height = bboxHeight * dpr + 80;
         var ctx = canvas.getContext('2d');
+        ctx.clearRect(0, 0, canvas.width, canvas.height);
         ctx.scale(dpr, dpr);
         // 如果有背景色，设置流程图导出的背景色
         if (backgroundColor) {