@logicflow/extension 1.2.0-alpha.4 → 1.2.0-alpha.5

package/cjs/NodeResize/Control/Control.js

@@ -37,9 +37,11 @@ var Control = /** @class */ (function (_super) {
         _this.updatePosition = function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY;
             var _b = _this.nodeModel, x = _b.x, y = _b.y;
-            _this.nodeModel.x = x + deltaX / 2;
-            _this.nodeModel.y = y + deltaY / 2;
             _this.nodeModel.moveText(deltaX / 2, deltaY / 2);
+            _this.nodeModel.updateAttributes({
+                x: x + deltaX / 2,
+                y: y + deltaY / 2,
+            });
         };
         // 计算control拖动后，节点的宽高
         _this.getResize = function (_a) {
@@ -93,14 +95,16 @@ var Control = /** @class */ (function (_super) {
             }
             _this.updatePosition({ deltaX: deltaX, deltaY: deltaY });
             // 更新宽高
-            _this.nodeModel.width = size.width;
-            _this.nodeModel.height = size.height;
             _this.nodeModel.setProperties({
                 nodeSize: {
                     width: size.width,
                     height: size.height,
                 },
             });
+            _this.nodeModel.updateAttributes({
+                width: size.width,
+                height: size.height,
+            });
             var edges = _this.getNodeEdges(id);
             var beforeNode = {
                 x: x,

package/cjs/NodeResize/Node/DiamondResize.js

@@ -29,14 +29,8 @@ var ControlGroup_1 = require("../Control/ControlGroup");
 var Polygon_1 = require("../BasicShape/Polygon");
 var DiamondResizeModel = /** @class */ (function (_super) {
     __extends(DiamondResizeModel, _super);
-    function DiamondResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.rx = nodeSize.rx;
-            _this.ry = nodeSize.ry;
-        }
-        return _this;
+    function DiamondResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     DiamondResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -46,6 +40,14 @@ var DiamondResizeModel = /** @class */ (function (_super) {
         this.maxHeight = 2000;
         this.gridSize = 1;
     };
+    DiamondResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.rx = nodeSize.rx;
+            this.ry = nodeSize.ry;
+        }
+    };
     DiamondResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

package/cjs/NodeResize/Node/EllipseResize.js

@@ -17,14 +17,8 @@ var core_1 = require("@logicflow/core");
 var ControlGroup_1 = require("../Control/ControlGroup");
 var EllipseResizeModel = /** @class */ (function (_super) {
     __extends(EllipseResizeModel, _super);
-    function EllipseResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.rx = nodeSize.rx;
-            _this.ry = nodeSize.ry;
-        }
-        return _this;
+    function EllipseResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     EllipseResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -33,6 +27,14 @@ var EllipseResizeModel = /** @class */ (function (_super) {
         this.maxWidth = 2000;
         this.maxHeight = 2000;
     };
+    EllipseResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.rx = nodeSize.rx;
+            this.ry = nodeSize.ry;
+        }
+    };
     EllipseResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

package/cjs/NodeResize/Node/HtmlResize.js

@@ -17,14 +17,8 @@ var core_1 = require("@logicflow/core");
 var ControlGroup_1 = require("../Control/ControlGroup");
 var HtmlResizeModel = /** @class */ (function (_super) {
     __extends(HtmlResizeModel, _super);
-    function HtmlResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.width = nodeSize.width;
-            _this.height = nodeSize.height;
-        }
-        return _this;
+    function HtmlResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     HtmlResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -33,6 +27,14 @@ var HtmlResizeModel = /** @class */ (function (_super) {
         this.maxWidth = 2000;
         this.maxHeight = 2000;
     };
+    HtmlResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.width = nodeSize.width;
+            this.height = nodeSize.height;
+        }
+    };
     HtmlResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

package/cjs/NodeResize/Node/RectResize.js

@@ -17,14 +17,8 @@ var core_1 = require("@logicflow/core");
 var ControlGroup_1 = require("../Control/ControlGroup");
 var RectResizeModel = /** @class */ (function (_super) {
     __extends(RectResizeModel, _super);
-    function RectResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.width = nodeSize.width;
-            _this.height = nodeSize.height;
-        }
-        return _this;
+    function RectResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     RectResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -33,6 +27,14 @@ var RectResizeModel = /** @class */ (function (_super) {
         this.maxWidth = 2000;
         this.maxHeight = 2000;
     };
+    RectResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.width = nodeSize.width;
+            this.height = nodeSize.height;
+        }
+    };
     RectResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

package/cjs/bpmn-adapter/index.js

@@ -179,7 +179,7 @@ function convertLf2ProcessData(bpmnProcessData, data) {
         return edgeConfig;
     });
     // @see https://github.com/didi/LogicFlow/issues/325
-    // 需要保证incomming在outgoing之前
+    // 需要保证incoming在outgoing之前
     data.edges.forEach(function (edge) {
         var sourceNode = nodeMap.get(edge.sourceNodeId);
         if (!sourceNode['bpmn:outgoing']) {

package/es/NodeResize/Control/Control.js

@@ -35,9 +35,11 @@ var Control = /** @class */ (function (_super) {
         _this.updatePosition = function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY;
             var _b = _this.nodeModel, x = _b.x, y = _b.y;
-            _this.nodeModel.x = x + deltaX / 2;
-            _this.nodeModel.y = y + deltaY / 2;
             _this.nodeModel.moveText(deltaX / 2, deltaY / 2);
+            _this.nodeModel.updateAttributes({
+                x: x + deltaX / 2,
+                y: y + deltaY / 2,
+            });
         };
         // 计算control拖动后，节点的宽高
         _this.getResize = function (_a) {
@@ -91,14 +93,16 @@ var Control = /** @class */ (function (_super) {
             }
             _this.updatePosition({ deltaX: deltaX, deltaY: deltaY });
             // 更新宽高
-            _this.nodeModel.width = size.width;
-            _this.nodeModel.height = size.height;
             _this.nodeModel.setProperties({
                 nodeSize: {
                     width: size.width,
                     height: size.height,
                 },
             });
+            _this.nodeModel.updateAttributes({
+                width: size.width,
+                height: size.height,
+            });
             var edges = _this.getNodeEdges(id);
             var beforeNode = {
                 x: x,

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

@@ -1,7 +1,7 @@
 import { h, DiamondNode, DiamondNodeModel } from '@logicflow/core';
 declare class DiamondResizeModel extends DiamondNodeModel {
-    constructor(data: any, graphModel: any);
     initNodeData(data: any): void;
+    init(): void;
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
     getResizeOutlineStyle(): {
         stroke: string;

package/es/NodeResize/Node/DiamondResize.js

@@ -27,14 +27,8 @@ import ControlGroup from '../Control/ControlGroup';
 import Polygon from '../BasicShape/Polygon';
 var DiamondResizeModel = /** @class */ (function (_super) {
     __extends(DiamondResizeModel, _super);
-    function DiamondResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.rx = nodeSize.rx;
-            _this.ry = nodeSize.ry;
-        }
-        return _this;
+    function DiamondResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     DiamondResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -44,6 +38,14 @@ var DiamondResizeModel = /** @class */ (function (_super) {
         this.maxHeight = 2000;
         this.gridSize = 1;
     };
+    DiamondResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.rx = nodeSize.rx;
+            this.ry = nodeSize.ry;
+        }
+    };
     DiamondResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

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

@@ -1,7 +1,7 @@
 import { h, EllipseNode, EllipseNodeModel } from '@logicflow/core';
 declare class EllipseResizeModel extends EllipseNodeModel {
-    constructor(data: any, graphModel: any);
     initNodeData(data: any): void;
+    init(): void;
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
     getResizeOutlineStyle(): {
         stroke: string;

package/es/NodeResize/Node/EllipseResize.js

@@ -15,14 +15,8 @@ import { h, EllipseNode, EllipseNodeModel } from '@logicflow/core';
 import ControlGroup from '../Control/ControlGroup';
 var EllipseResizeModel = /** @class */ (function (_super) {
     __extends(EllipseResizeModel, _super);
-    function EllipseResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.rx = nodeSize.rx;
-            _this.ry = nodeSize.ry;
-        }
-        return _this;
+    function EllipseResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     EllipseResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -31,6 +25,14 @@ var EllipseResizeModel = /** @class */ (function (_super) {
         this.maxWidth = 2000;
         this.maxHeight = 2000;
     };
+    EllipseResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.rx = nodeSize.rx;
+            this.ry = nodeSize.ry;
+        }
+    };
     EllipseResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

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

@@ -1,7 +1,7 @@
 import { h, HtmlNode, HtmlNodeModel } from '@logicflow/core';
 declare class HtmlResizeModel extends HtmlNodeModel {
-    constructor(data: any, graphModel: any);
     initNodeData(data: any): void;
+    init(): void;
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
     getResizeOutlineStyle(): {
         stroke: string;

package/es/NodeResize/Node/HtmlResize.js

@@ -15,14 +15,8 @@ import { h, HtmlNode, HtmlNodeModel } from '@logicflow/core';
 import ControlGroup from '../Control/ControlGroup';
 var HtmlResizeModel = /** @class */ (function (_super) {
     __extends(HtmlResizeModel, _super);
-    function HtmlResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.width = nodeSize.width;
-            _this.height = nodeSize.height;
-        }
-        return _this;
+    function HtmlResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     HtmlResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -31,6 +25,14 @@ var HtmlResizeModel = /** @class */ (function (_super) {
         this.maxWidth = 2000;
         this.maxHeight = 2000;
     };
+    HtmlResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.width = nodeSize.width;
+            this.height = nodeSize.height;
+        }
+    };
     HtmlResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

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

@@ -1,7 +1,7 @@
 import { h, RectNode, RectNodeModel } from '@logicflow/core';
 declare class RectResizeModel extends RectNodeModel {
-    constructor(data: any, graphModel: any);
     initNodeData(data: any): void;
+    init(): void;
     getOutlineStyle(): import("@logicflow/core/types/constant/DefaultTheme").OutlineTheme;
     getResizeOutlineStyle(): {
         fill: string;

package/es/NodeResize/Node/RectResize.js

@@ -15,14 +15,8 @@ import { h, RectNode, RectNodeModel } from '@logicflow/core';
 import ControlGroup from '../Control/ControlGroup';
 var RectResizeModel = /** @class */ (function (_super) {
     __extends(RectResizeModel, _super);
-    function RectResizeModel(data, graphModel) {
-        var _this = _super.call(this, data, graphModel) || this;
-        var nodeSize = _this.properties.nodeSize;
-        if (nodeSize) {
-            _this.width = nodeSize.width;
-            _this.height = nodeSize.height;
-        }
-        return _this;
+    function RectResizeModel() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     RectResizeModel.prototype.initNodeData = function (data) {
         _super.prototype.initNodeData.call(this, data);
@@ -31,6 +25,14 @@ var RectResizeModel = /** @class */ (function (_super) {
         this.maxWidth = 2000;
         this.maxHeight = 2000;
     };
+    RectResizeModel.prototype.init = function () {
+        _super.prototype.init.call(this);
+        var nodeSize = this.properties.nodeSize;
+        if (nodeSize) {
+            this.width = nodeSize.width;
+            this.height = nodeSize.height;
+        }
+    };
     RectResizeModel.prototype.getOutlineStyle = function () {
         var style = _super.prototype.getOutlineStyle.call(this);
         style.stroke = 'none';

package/es/bpmn-adapter/index.js

@@ -176,7 +176,7 @@ function convertLf2ProcessData(bpmnProcessData, data) {
         return edgeConfig;
     });
     // @see https://github.com/didi/LogicFlow/issues/325
-    // 需要保证incomming在outgoing之前
+    // 需要保证incoming在outgoing之前
     data.edges.forEach(function (edge) {
         var sourceNode = nodeMap.get(edge.sourceNodeId);
         if (!sourceNode['bpmn:outgoing']) {