@logicflow/extension 1.1.0-alpha.2 → 1.1.0-alpha.6

package/es/NodeResize/Control/Control.js

@@ -26,7 +26,6 @@ import { h, Component } from 'preact';
 import { LogicFlowUtil } from '@logicflow/core';
 import Rect from '../BasicShape/Rect';
 import { getDiamondReizeEdgePoint, getEllipseReizeEdgePoint, getRectReizeEdgePoint, ModelType } from './Util';
-import NodeResize from '../index';
 var createDrag = LogicFlowUtil.createDrag;
 var Control = /** @class */ (function (_super) {
     __extends(Control, _super);
@@ -211,11 +210,11 @@ var Control = /** @class */ (function (_super) {
                 pct: 1 / 2,
             });
             // 限制放大缩小的最大最小范围
-            var _c = NodeResize.sizeRange.ellipse, minRx = _c.minRx, minRy = _c.minRy, maxRx = _c.maxRx, maxRy = _c.maxRy;
-            if (size.width < minRx
-                || size.width > maxRx
-                || size.height < minRy
-                || size.height > maxRy) {
+            var _c = _this.nodeModel, minWidth = _c.minWidth, minHeight = _c.minHeight, maxWidth = _c.maxWidth, maxHeight = _c.maxHeight;
+            if (size.width < (minWidth / 2)
+                || size.width > (maxWidth / 2)
+                || size.height < (minHeight / 2)
+                || size.height > (maxHeight / 2)) {
                 return;
             }
             // 更新中心点位置，更新文案位置
@@ -271,6 +270,7 @@ var Control = /** @class */ (function (_super) {
             // html和矩形的计算方式是一样的，共用一个方法
             if (modelType === ModelType.RECT_NODE || modelType === ModelType.HTML_NODE) {
                 _this.updateRect({ deltaX: deltaX, deltaY: deltaY });
+                // this.nodeModel.resize(deltaX, deltaY);
             }
             else if (modelType === ModelType.ELLIPSE_NODE) {
                 _this.updateEllipse({ deltaX: deltaX, deltaY: deltaY });
@@ -313,10 +313,10 @@ var Control = /** @class */ (function (_super) {
         return { sourceEdges: sourceEdges, targetEdges: targetEdges };
     };
     Control.prototype.render = function () {
-        var _a = this.props, x = _a.x, y = _a.y, style = _a.style, index = _a.index;
-        var _b = NodeResize.style.controlPoint, width = _b.width, height = _b.height, fill = _b.fill, stroke = _b.stroke;
+        var _a = this.props, x = _a.x, y = _a.y, index = _a.index, model = _a.model;
+        var style = model.getControlPointStyle();
         return (h("g", { className: "lf-resize-control-" + index },
-            h(Rect, __assign({ className: "lf-node-control" }, { x: x, y: y }, style, { width: width, height: height, fill: fill, stroke: stroke, onMouseDown: this.dragHandler }))));
+            h(Rect, __assign({ className: "lf-node-control" }, { x: x, y: y }, style, { onMouseDown: this.dragHandler }))));
     };
     return Control;
 }(Component));

package/es/NodeResize/Control/ControlGroup.js

@@ -25,7 +25,6 @@ var __assign = (this && this.__assign) || function () {
 import { h, Component } from 'preact';
 import Control from './Control';
 import Rect from '../BasicShape/Rect';
-import NodeResize from '../index';
 var ControlGroup = /** @class */ (function (_super) {
     __extends(ControlGroup, _super);
     function ControlGroup() {
@@ -44,18 +43,22 @@ var ControlGroup = /** @class */ (function (_super) {
         };
         var minX = box.minX, minY = box.minY, maxX = box.maxX, maxY = box.maxY;
         var controlList = [
+            // 左上角
             {
                 x: minX,
                 y: minY,
             },
+            // 右上角
             {
                 x: maxX,
                 y: minY,
             },
+            // 右下角
             {
                 x: maxX,
                 y: maxY,
             },
+            // 左下角
             {
                 x: minX,
                 y: maxY,
@@ -65,9 +68,10 @@ var ControlGroup = /** @class */ (function (_super) {
     };
     // 一般节点被选中了会有outline, 先不用这个
     ControlGroup.prototype.getGroupSolid = function () {
-        var _a = this.props.model, x = _a.x, y = _a.y, width = _a.width, height = _a.height;
-        var _b = NodeResize.style.outline, stroke = _b.stroke, strokeWidth = _b.strokeWidth, strokeDasharray = _b.strokeDasharray;
-        return (h(Rect, { fill: "none", x: x, y: y, width: width, height: height, stroke: stroke, strokeWidth: strokeWidth, strokeDasharray: strokeDasharray }));
+        var model = this.props.model;
+        var x = model.x, y = model.y, width = model.width, height = model.height;
+        var style = model.getResizeOutlineStyle();
+        return (h(Rect, __assign({ fill: "none" }, style, { x: x, y: y, width: width, height: height })));
     };
     ControlGroup.prototype.render = function () {
         return (h("g", { className: "lf-resize-control" },

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

@@ -1,6 +1,21 @@
 import { h, DiamondNode, DiamondNodeModel } from '@logicflow/core';
 declare class DiamondResizeModel extends DiamondNodeModel {
+    minWidth: number;
+    minHeight: number;
+    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 DiamondResizeView extends DiamondNode {

package/es/NodeResize/Node/DiamondResize.js

@@ -28,7 +28,12 @@ import Polygon from '../BasicShape/Polygon';
 var DiamondResizeModel = /** @class */ (function (_super) {
     __extends(DiamondResizeModel, _super);
     function DiamondResizeModel() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.minWidth = 30;
+        _this.minHeight = 30;
+        _this.maxWidth = 2000;
+        _this.maxHeight = 2000;
+        return _this;
     }
     DiamondResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
@@ -38,6 +43,21 @@ var DiamondResizeModel = /** @class */ (function (_super) {
         }
         return style;
     };
+    DiamondResizeModel.prototype.getResizeOutlineStyle = function () {
+        return {
+            stroke: '#000000',
+            strokeWidth: 1,
+            strokeDasharray: '3,3',
+        };
+    };
+    DiamondResizeModel.prototype.getControlPointStyle = function () {
+        return {
+            width: 7,
+            height: 7,
+            fill: '#FFFFFF',
+            stroke: '#000000',
+        };
+    };
     DiamondResizeModel.prototype.setAttributes = function () {
         // @ts-ignore
         var nodeSize = this.properties.nodeSize;

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

@@ -1,13 +1,30 @@
-import { RectNode, RectNodeModel } from '@logicflow/core';
-declare class GroupNodeModel extends RectNodeModel {
+import { h } from '@logicflow/core';
+import { RectResize } from '../../NodeResize';
+declare class GroupNodeModel extends RectResize.model {
     readonly isGroup = true;
-    children: Set<unknown>;
+    children: Set<string>;
     isRestrict: boolean;
-    setAttributes(): void;
+    resizable: boolean;
+    foldable: boolean;
+    foldedWidth: number;
+    foldedHeight: number;
+    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的属性，表示不支持直接修改此边内容。
      */
-    setIsRestrict(isRestrict: any): void;
+    private foldEdge;
     isInRange({ x1, y1, x2, y2 }: {
         x1: any;
         y1: any;
@@ -15,15 +32,29 @@ declare class GroupNodeModel extends RectNodeModel {
         y2: any;
     }): boolean;
     setAllowAppendChild(isAllow: any): void;
+    /**
+     * 添加分组子节点
+     * @param id 节点id
+     */
     addChild(id: any): void;
+    /**
+     * 删除分组子节点
+     * @param id 节点id
+     */
     removeChild(id: any): void;
+    getAddableOutlineStyle(): {
+        stroke: string;
+        strokeWidth: number;
+        strokeDasharray: string;
+        fill: string;
+    };
     getData(): import("@logicflow/core").NodeData;
 }
-declare class GroupNode extends RectNode {
-    /**
-     * 重新toFront，阻止其置顶
-     */
-    toFront(): void;
+declare class GroupNode extends RectResize.view {
+    getControlGroup(): h.JSX.Element;
+    getAddedableShape(): import("preact").VNode<any>;
+    getFoldIcon(): import("preact").VNode<any>;
+    getResizeShape(): import("preact").VNode<any>;
 }
 declare const _default: {
     type: string;