@logicflow/extension 1.0.0-alpha.3 → 1.0.0-alpha.6

package/cjs/materials/group/index.js

@@ -32,13 +32,13 @@ var Group = /** @class */ (function () {
             // 如果这个节点之前已经在group中了，则将其从之前的group中移除
             var preGroupId = _this.nodeGroupMap.get(data.id);
             if (preGroupId) {
-                var preGroup = _this.lf.getNodeModel(preGroupId);
+                var preGroup = _this.lf.getNodeModelById(preGroupId);
                 preGroup.removeChild(data.id);
                 _this.nodeGroupMap.delete(data.id);
                 preGroup.setAllowAppendChild(false);
             }
             // 然后再判断这个节点是否在某个group中，如果在，则将其添加到对应的group中
-            var bounds = _this.lf.getNodeModel(data.id).getBounds();
+            var bounds = _this.lf.getNodeModelById(data.id).getBounds();
             var group = _this.getGroup(bounds);
             if (group && data.id !== group.id) {
                 group.addChild(data.id);
@@ -52,7 +52,7 @@ var Group = /** @class */ (function () {
                 _this.activeGroup.setAllowAppendChild(false);
                 _this.activeGroup = undefined;
             }
-            var bounds = _this.lf.getNodeModel(data.id).getBounds();
+            var bounds = _this.lf.getNodeModelById(data.id).getBounds();
             _this.activeGroup = _this.getGroup(bounds);
             if (_this.activeGroup && _this.activeGroup.id !== data.id) {
                 _this.activeGroup.setAllowAppendChild(true);
@@ -65,7 +65,7 @@ var Group = /** @class */ (function () {
                 lf.graphModel.moveNodes(__spread(model.children), deltaX, deltaY, true);
                 return true;
             }
-            var groupModel = lf.getNodeModel(_this.nodeGroupMap.get(model.id));
+            var groupModel = lf.getNodeModelById(_this.nodeGroupMap.get(model.id));
             if (groupModel && groupModel.isRestrict) { // 如果移动的节点存在分组中，且这个分组禁止子节点移出去。
                 var _a = model.getBounds(), x1 = _a.x1, y1 = _a.y1, x2 = _a.x2, y2 = _a.y2;
                 var r = groupModel.isInRange({

package/cjs/tools/auto-layout/index.js

@@ -37,7 +37,7 @@ var AutoLayout = /** @class */ (function () {
             return _this.layout(data, path);
         };
     }
-    // 1) 将所有节点和连线的坐标删除。节点上的文本改成偏移量。
+    // 1) 将所有节点和边的坐标删除。节点上的文本改成偏移量。
     // 2) 找到长度最长的路径，作为基准路径。
     // 3) 依次计算
     // 拿到最长的路径。
@@ -97,9 +97,9 @@ var AutoLayout = /** @class */ (function () {
                     _this.setNodePosition(nextInfo.nodeId, nodeMap, newGraphData, xLevel + 1, nextYLevel + 1);
                 }
                 else {
-                    // todo: 如果下一个节点是已经定位的，则需要考虑连线的规避
+                    // todo: 如果下一个节点是已经定位的，则需要考虑边的规避
                 }
-                // 设置连接到下一个节点的连线
+                // 设置连接到下一个节点的边
                 // 1) 起始位置为source节点的下方，结束位置为target节点左边。
                 // 2) 计算折线
                 newGraphData.edges.push(__assign({ id: nextInfo.edgeId, type: nextInfo.edgeType, sourceNodeId: nodeId, targetNodeId: nextInfo.nodeId, properties: nextInfo.properties, text: nextInfo.text }, _this.getEdgeDataPoints(nodeId, nextInfo.nodeId)));
@@ -108,8 +108,8 @@ var AutoLayout = /** @class */ (function () {
         return nodeData;
     };
     /**
-     * 1. 处理连线上的文本
-     * 2. 主干节点之间直接的连线
+     * 1. 处理边上的文本
+     * 2. 主干节点之间直接的边
      * 3. 一个节点被多个连接作为目标节点，合理分配锚点位置。
      */
     AutoLayout.prototype.getEdgeDataPoints = function (sourceNodeId, targetNodeId) {
@@ -148,7 +148,7 @@ var AutoLayout = /** @class */ (function () {
         };
     };
     /**
-     * 获取连线的连接节点相对位置。
+     * 获取边的连接节点相对位置。
      * source一定在target左边。
      * 1. 如果source和target在同一x, y坐标内容。
      * 2. 如果source在target左上方。
@@ -170,10 +170,10 @@ var AutoLayout = /** @class */ (function () {
         return postionType;
     };
     /**
-     * 获取连线节点图形的宽高。
+     * 获取边节点图形的宽高。
      */
     AutoLayout.prototype.getShape = function (nodeId) {
-        var nodeModel = this.lf.getNodeModel(nodeId);
+        var nodeModel = this.lf.getNodeModelById(nodeId);
         return {
             height: nodeModel.height,
             width: nodeModel.width,

package/cjs/tools/snapshot/index.js

@@ -125,7 +125,7 @@ var Snapshot = {
         if (childLength) {
             for (var i = 0; i < childLength; i++) {
                 var lfLayer = graph.childNodes[i];
-                // 只保留包含节点和连线的基础图层进行下载，其他图层删除
+                // 只保留包含节点和边的基础图层进行下载，其他图层删除
                 var layerClassList = lfLayer.classList && Array.from(lfLayer.classList);
                 if (layerClassList && layerClassList.indexOf('lf-base') < 0) {
                     graph.removeChild(graph.childNodes[i]);
@@ -154,8 +154,8 @@ var Snapshot = {
         var base = document.getElementsByClassName('lf-base')[0];
         var bbox = base.getBoundingClientRect();
         var graphModel = this.lf.graphModel;
-        var transformMatrix = graphModel.transformMatrix;
-        var SCALE_X = transformMatrix.SCALE_X, SCALE_Y = transformMatrix.SCALE_Y;
+        var transformModel = graphModel.transformModel;
+        var SCALE_X = transformModel.SCALE_X, SCALE_Y = transformModel.SCALE_Y;
         var bboxWidth = Math.ceil(bbox.width / SCALE_X);
         var bboxHeight = Math.ceil(bbox.height / SCALE_Y);
         // width,height 值加40，保证图形不会紧贴着下载图片的右边和下边

package/es/NodeResize/Control/Control.d.ts

@@ -4,11 +4,9 @@ interface IProps {
     index: number;
     x: number;
     y: number;
-    nodeModel: BaseNodeModel;
+    model: BaseNodeModel;
     graphModel: GraphModel;
     style?: CSSStyleDeclaration;
-    hoverStyle?: CSSStyleDeclaration;
-    edgeStyle?: CSSStyleDeclaration;
 }
 declare class Control extends Component<IProps> {
     dragHandler: Function;

package/es/NodeResize/Control/Control.js

@@ -118,7 +118,7 @@ var Control = /** @class */ (function (_super) {
                 beforeNode: beforeNode,
                 afterNode: afterNode,
             };
-            // 更新连线
+            // 更新边
             var afterPoint;
             edges.sourceEdges.forEach(function (item) {
                 params.point = item.startPoint;
@@ -181,7 +181,7 @@ var Control = /** @class */ (function (_super) {
                 beforeNode: beforeNode,
                 afterNode: afterNode,
             };
-            // 更新连线
+            // 更新边
             var afterPoint;
             edges.sourceEdges.forEach(function (item) {
                 params.point = item.startPoint;
@@ -243,7 +243,7 @@ var Control = /** @class */ (function (_super) {
                 beforeNode: beforeNode,
                 afterNode: afterNode,
             };
-            // 更新连线
+            // 更新边
             var afterPoint;
             var edges = _this.getNodeEdges(id);
             edges.sourceEdges.forEach(function (item) {
@@ -279,7 +279,7 @@ var Control = /** @class */ (function (_super) {
             }
         };
         _this.index = props.index;
-        _this.nodeModel = props.nodeModel;
+        _this.nodeModel = props.model;
         _this.graphModel = props.graphModel;
         var gridSize = _this.graphModel.gridSize;
         // 为保证对齐线功能正常使用，step默认是网格grid的两倍，

package/es/NodeResize/Control/ControlGroup.d.ts

@@ -1,15 +1,8 @@
 import { h, Component } from 'preact';
 import { BaseNodeModel, GraphModel } from '@logicflow/core';
 interface IProps {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-    nodeModel: BaseNodeModel;
+    model: BaseNodeModel;
     graphModel: GraphModel;
-    style?: CSSStyleDeclaration;
-    hoverStyle?: CSSStyleDeclaration;
-    edgeStyle?: CSSStyleDeclaration;
 }
 declare class ControlGroup extends Component<IProps> {
     constructor();

package/es/NodeResize/Control/ControlGroup.js

@@ -34,7 +34,8 @@ var ControlGroup = /** @class */ (function (_super) {
         return _this;
     }
     ControlGroup.prototype.getResizeControl = function () {
-        var _a = this.props, x = _a.x, y = _a.y, width = _a.width, height = _a.height, nodeModel = _a.nodeModel, graphModel = _a.graphModel;
+        var _a = this.props, model = _a.model, graphModel = _a.graphModel;
+        var x = model.x, y = model.y, width = model.width, height = model.height;
         var box = {
             minX: x - width / 2,
             minY: y - height / 2,
@@ -60,11 +61,11 @@ var ControlGroup = /** @class */ (function (_super) {
                 y: maxY,
             },
         ];
-        return controlList.map(function (control, index) { return (h(Control, __assign({ index: index }, control, { nodeModel: nodeModel, graphModel: graphModel }))); });
+        return controlList.map(function (control, index) { return (h(Control, __assign({ index: index }, control, { model: model, graphModel: graphModel }))); });
     };
     // 一般节点被选中了会有outline, 先不用这个
     ControlGroup.prototype.getGroupSolid = function () {
-        var _a = this.props, x = _a.x, y = _a.y, width = _a.width, height = _a.height;
+        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 }));
     };

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

@@ -3,8 +3,8 @@ declare class DiamondResizeModel extends DiamondNodeModel {
     setAttributes(): void;
 }
 declare class DiamondResizeView extends DiamondNode {
-    getControlGroup(attributes: any): h.JSX.Element;
-    getResizeShape(arrt: any): h.JSX.Element;
+    getControlGroup(): h.JSX.Element;
+    getResizeShape(): h.JSX.Element;
     getShape(): h.JSX.Element;
 }
 declare const EllipseResize: {

package/es/NodeResize/Node/DiamondResize.js

@@ -46,21 +46,23 @@ var DiamondResizeView = /** @class */ (function (_super) {
     function DiamondResizeView() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DiamondResizeView.prototype.getControlGroup = function (attributes) {
+    DiamondResizeView.prototype.getControlGroup = function () {
         var _a = this.props, model = _a.model, graphModel = _a.graphModel;
-        return (h(ControlGroup, __assign({}, attributes, { nodeModel: model, graphModel: graphModel })));
+        return (h(ControlGroup, { model: model, graphModel: graphModel }));
     };
     // getResizeShape绘制图形，功能等同于基础菱形的getShape功能，可以通过复写此方法，进行节点自定义
-    DiamondResizeView.prototype.getResizeShape = function (arrt) {
-        return h("g", null,
-            h(Polygon, __assign({}, arrt)));
+    DiamondResizeView.prototype.getResizeShape = function () {
+        var model = this.props.model;
+        var points = model.points;
+        var style = model.getNodeStyle();
+        return (h("g", null,
+            h(Polygon, __assign({}, style, { points: points }))));
     };
     DiamondResizeView.prototype.getShape = function () {
-        var attributes = _super.prototype.getAttributes.call(this);
         var isSelected = this.props.model.isSelected;
         return (h("g", null,
-            this.getResizeShape(attributes),
-            isSelected ? this.getControlGroup(attributes) : ''));
+            this.getResizeShape(),
+            isSelected ? this.getControlGroup() : ''));
     };
     return DiamondResizeView;
 }(DiamondNode));

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

@@ -7,8 +7,8 @@ declare class EllipseResizeModel extends EllipseNodeModel {
     setAttributes(): void;
 }
 declare class EllipseResizeView extends EllipseNode {
-    getControlGroup(attributes: any): h.JSX.Element;
-    getResizeShape(arrt: any): h.JSX.Element;
+    getControlGroup(): h.JSX.Element;
+    getResizeShape(): h.JSX.Element;
     getShape(): h.JSX.Element;
 }
 declare const EllipseResize: {

package/es/NodeResize/Node/EllipseResize.js

@@ -51,21 +51,23 @@ var EllipseResizeView = /** @class */ (function (_super) {
     function EllipseResizeView() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    EllipseResizeView.prototype.getControlGroup = function (attributes) {
+    EllipseResizeView.prototype.getControlGroup = function () {
         var _a = this.props, model = _a.model, graphModel = _a.graphModel;
-        return (h(ControlGroup, __assign({}, attributes, { nodeModel: model, graphModel: graphModel })));
+        return (h(ControlGroup, { model: model, graphModel: graphModel }));
     };
     // getResizeShape绘制图形，功能等同于基础椭圆的getShape功能，可以通过复写此方法，进行节点自定义
-    EllipseResizeView.prototype.getResizeShape = function (arrt) {
-        return h("g", null,
-            h(Ellipse, __assign({}, arrt)));
+    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 (h("g", null,
+            h(Ellipse, __assign({}, style, { rx: rx, ry: ry, x: x, y: y }))));
     };
     EllipseResizeView.prototype.getShape = function () {
-        var attributes = _super.prototype.getAttributes.call(this);
-        var isSelected = this.props.model.isSelected;
+        var model = this.props.model;
         return (h("g", null,
-            this.getResizeShape(attributes),
-            isSelected ? this.getControlGroup(attributes) : ''));
+            this.getResizeShape(),
+            model.isSelected ? this.getControlGroup() : ''));
     };
     return EllipseResizeView;
 }(EllipseNode));

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

@@ -7,7 +7,7 @@ declare class RectResizeModel extends RectNodeModel {
     setAttributes(): void;
 }
 declare class RectResizeView extends RectNode {
-    getControlGroup(attributes: any): h.JSX.Element;
+    getControlGroup(): h.JSX.Element;
     getResizeShape(): h.JSX.Element;
     getShape(): h.JSX.Element;
 }

package/es/NodeResize/Node/RectResize.js

@@ -11,17 +11,6 @@ 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);
-};
 import { h, RectNode, RectNodeModel } from '@logicflow/core';
 import ControlGroup from '../Control/ControlGroup';
 var RectResizeModel = /** @class */ (function (_super) {
@@ -50,20 +39,19 @@ var RectResizeView = /** @class */ (function (_super) {
     function RectResizeView() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    RectResizeView.prototype.getControlGroup = function (attributes) {
+    RectResizeView.prototype.getControlGroup = function () {
         var _a = this.props, model = _a.model, graphModel = _a.graphModel;
-        return (h(ControlGroup, __assign({}, attributes, { nodeModel: model, graphModel: graphModel })));
+        return (h(ControlGroup, { model: model, graphModel: graphModel }));
     };
     // getResizeShape绘制图形，功能等同于基础矩形的getShape功能，可以通过复写此方法，进行节点自定义
     RectResizeView.prototype.getResizeShape = function () {
         return _super.prototype.getShape.call(this);
     };
     RectResizeView.prototype.getShape = function () {
-        var attributes = _super.prototype.getAttributes.call(this);
         var isSelected = this.props.model.isSelected;
         return (h("g", null,
             this.getResizeShape(),
-            isSelected ? this.getControlGroup(attributes) : ''));
+            isSelected ? this.getControlGroup() : ''));
     };
     return RectResizeView;
 }(RectNode));

package/es/bpmn/events/EndEvent.d.ts

@@ -2,6 +2,7 @@ import { CircleNode, CircleNodeModel } from '@logicflow/core';
 declare class EndEventModel extends CircleNodeModel {
     static extendKey: string;
     constructor(data: any, graphModel: any);
+    setAttributes(): void;
     getConnectedSourceRules(): import("@logicflow/core").ConnectRule[];
 }
 declare class EndEventView extends CircleNode {

package/es/bpmn/events/EndEvent.js

@@ -11,6 +11,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);
+};
 import { CircleNode, CircleNodeModel, h } from '@logicflow/core';
 import { getBpmnId } from '../getBpmnId';
 var EndEventModel = /** @class */ (function (_super) {
@@ -33,10 +44,13 @@ var EndEventModel = /** @class */ (function (_super) {
         _this = _super.call(this, data, graphModel) || this;
         return _this;
     }
+    EndEventModel.prototype.setAttributes = function () {
+        this.r = 18;
+    };
     EndEventModel.prototype.getConnectedSourceRules = function () {
         var rules = _super.prototype.getConnectedSourceRules.call(this);
         var notAsSource = {
-            message: '结束节点不能作为连线的起点',
+            message: '结束节点不能作为边的起点',
             validate: function () { return false; },
         };
         rules.push(notAsSource);
@@ -56,16 +70,11 @@ var EndEventView = /** @class */ (function (_super) {
         };
     };
     EndEventView.prototype.getShape = function () {
-        var _a = this.getAttributes(), x = _a.x, y = _a.y, fill = _a.fill, stroke = _a.stroke, strokeWidth = _a.strokeWidth, r = _a.r;
+        var model = this.props.model;
+        var style = model.getNodeStyle();
+        var x = model.x, y = model.y, r = model.r;
         var outCircle = _super.prototype.getShape.call(this);
-        return h('g', {}, outCircle, h('circle', {
-            cx: x,
-            cy: y,
-            fill: fill,
-            stroke: stroke,
-            strokeWidth: strokeWidth,
-            r: r - 5,
-        }));
+        return h('g', {}, outCircle, h('circle', __assign(__assign({}, style), { cx: x, cy: y, r: r - 5 })));
     };
     EndEventView.extendKey = 'EndEventView';
     return EndEventView;

package/es/bpmn/events/StartEvent.d.ts

@@ -2,35 +2,11 @@ import { CircleNode, CircleNodeModel } from '@logicflow/core';
 declare class StartEventModel extends CircleNodeModel {
     static extendKey: string;
     constructor(data: any, graphModel: any);
+    setAttributes(): void;
     getConnectedTargetRules(): import("@logicflow/core").ConnectRule[];
 }
 declare class StartEventView extends CircleNode {
     static extendKey: string;
-    getAttributes(): {
-        r: number;
-        width: number;
-        height: number;
-        fill: string;
-        fillOpacity?: number;
-        strokeWidth?: number;
-        stroke: string;
-        strokeOpacity?: number;
-        opacity?: number;
-        outlineColor?: string;
-        id: string;
-        properties: Record<string, any>;
-        type: string;
-        x: number;
-        y: number;
-        isSelected: boolean;
-        isHovered: boolean;
-        text: {
-            [key: string]: any;
-            x: number;
-            y: number;
-            value: string;
-        };
-    };
 }
 declare const StartEvent: {
     type: string;

package/es/bpmn/events/StartEvent.js

@@ -11,17 +11,6 @@ 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);
-};
 import { CircleNode, CircleNodeModel } from '@logicflow/core';
 import { getBpmnId } from '../getBpmnId';
 var StartEventModel = /** @class */ (function (_super) {
@@ -46,10 +35,13 @@ var StartEventModel = /** @class */ (function (_super) {
         _this = _super.call(this, data, graphModel) || this;
         return _this;
     }
+    StartEventModel.prototype.setAttributes = function () {
+        this.r = 18;
+    };
     StartEventModel.prototype.getConnectedTargetRules = function () {
         var rules = _super.prototype.getConnectedTargetRules.call(this);
         var notAsTarget = {
-            message: '起始节点不能作为连线的终点',
+            message: '起始节点不能作为边的终点',
             validate: function () { return false; },
         };
         rules.push(notAsTarget);
@@ -63,10 +55,6 @@ var StartEventView = /** @class */ (function (_super) {
     function StartEventView() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    StartEventView.prototype.getAttributes = function () {
-        var attr = _super.prototype.getAttributes.call(this);
-        return __assign({}, attr);
-    };
     StartEventView.extendKey = 'StartEventNode';
     return StartEventView;
 }(CircleNode));

package/es/bpmn/gateways/ExclusiveGateway.js

@@ -11,6 +11,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);
+};
 import { h, PolygonNode, PolygonNodeModel } from '@logicflow/core';
 import { getBpmnId } from '../getBpmnId';
 var ExclusiveGatewayModel = /** @class */ (function (_super) {
@@ -48,23 +59,14 @@ var ExclusiveGatewayView = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     ExclusiveGatewayView.prototype.getShape = function () {
-        var attributes = _super.prototype.getAttributes.call(this);
-        var x = attributes.x, y = attributes.y, fill = attributes.fill, stroke = attributes.stroke, strokeWidth = attributes.strokeWidth, width = attributes.width, height = attributes.height, points = attributes.points;
+        var model = this.props.model;
+        var x = model.x, y = model.y, width = model.width, height = model.height, points = model.points;
+        var style = model.getNodeStyle();
         return h('g', {
             transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
-        }, h('polygon', {
-            fill: fill,
-            x: x,
+        }, h('polygon', __assign(__assign({}, style), { x: x,
             y: y,
-            stroke: stroke,
-            strokeWidth: strokeWidth,
-            points: points,
-        }), h('path', {
-            fill: fill,
-            stroke: stroke,
-            strokeWidth: strokeWidth,
-            d: 'm 16,15 7.42857142857143,9.714285714285715 -7.42857142857143,9.714285714285715 3.428571428571429,0 5.714285714285715,-7.464228571428572 5.714285714285715,7.464228571428572 3.428571428571429,0 -7.42857142857143,-9.714285714285715 7.42857142857143,-9.714285714285715 -3.428571428571429,0 -5.714285714285715,7.464228571428572 -5.714285714285715,-7.464228571428572 -3.428571428571429,0 z',
-        }));
+            points: points })), h('path', __assign({ d: 'm 16,15 7.42857142857143,9.714285714285715 -7.42857142857143,9.714285714285715 3.428571428571429,0 5.714285714285715,-7.464228571428572 5.714285714285715,7.464228571428572 3.428571428571429,0 -7.42857142857143,-9.714285714285715 7.42857142857143,-9.714285714285715 -3.428571428571429,0 -5.714285714285715,7.464228571428572 -5.714285714285715,-7.464228571428572 -3.428571428571429,0 z' }, style)));
     };
     ExclusiveGatewayView.extendKey = 'ExclusiveGatewayNode';
     return ExclusiveGatewayView;

package/es/bpmn/index.js

@@ -16,7 +16,7 @@ var BpmnElement = /** @class */ (function () {
         lf.register(ExclusiveGateway);
         lf.register(UserTask);
         lf.register(ServiceTask);
-        // 支持自定义bpmn元素的连线
+        // 支持自定义bpmn元素的边
         if (!lf.options.customBpmnEdge) {
             lf.register(SequenceFlow);
             lf.setDefaultEdgeType('bpmn:sequenceFlow');

package/es/bpmn/tasks/ServiceTask.js

@@ -11,6 +11,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);
+};
 import { h, RectNodeModel, RectNode } from '@logicflow/core';
 import { getBpmnId } from '../getBpmnId';
 var ServiceTaskModel = /** @class */ (function (_super) {
@@ -32,8 +43,9 @@ var ServiceTaskView = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     ServiceTaskView.prototype.getLabelShape = function () {
-        var attributes = _super.prototype.getAttributes.call(this);
-        var x = attributes.x, y = attributes.y, width = attributes.width, height = attributes.height, stroke = attributes.stroke;
+        var model = this.props.model;
+        var x = model.x, y = model.y, width = model.width, height = model.height;
+        var style = model.getNodeStyle();
         return h('svg', {
             x: x - width / 2 + 5,
             y: y - height / 2 + 5,
@@ -41,26 +53,17 @@ var ServiceTaskView = /** @class */ (function (_super) {
             height: 30,
             viewBox: '0 0 1274 1024',
         }, h('path', {
-            fill: stroke,
+            fill: style.stroke,
             d: 'M882.527918 434.149934c-2.234901-5.303796-7.311523-8.853645-13.059434-9.138124l-61.390185-3.009544c-6.635117-20.973684-15.521508-41.175795-26.513864-60.282968l42.051745-47.743374c4.308119-4.889357 4.955872-12.004405 1.602498-17.59268-46.384423-77.30362-103.969956-101.422947-106.400309-102.410438-5.332449-2.170432-11.432377-1.090844-15.693424 2.77009L654.674467 240.664222c-17.004279-8.654101-35.092239-15.756869-53.995775-21.210068l-3.26537-66.490344c-0.280386-5.747911-3.833305-10.824533-9.134031-13.059434-1.683339-0.709151-30.193673-12.391215-76.866668-12.051477-46.672996-0.339738-75.18333 11.342326-76.866668 12.051477-5.300726 2.234901-8.853645 7.311523-9.134031 13.059434l-3.26537 66.490344c-18.903535 5.453199-36.991496 12.555967-53.995775 21.210068l-48.450479-43.922349c-4.261047-3.860934-10.360975-4.940522-15.693424-2.77009-2.430352 0.98749-60.015885 25.106818-106.400309 102.410438-3.353374 5.588275-2.705622 12.703323 1.602498 17.59268l42.051745 47.743374c-10.992355 19.107173-19.878746 39.309284-26.513864 60.282968l-61.390185 3.009544c-5.747911 0.284479-10.824533 3.834328-13.059434 9.138124-1.01512 2.415003-24.687262 60.190871-2.822278 147.651828 1.583055 6.324032 7.072069 10.893094 13.57518 11.308557 5.892197 0.37146 11.751648 0.523933 17.419741 0.667196 14.498202 0.372483 28.193109 0.723477 40.908712 4.63353 4.212952 1.294482 6.435573 8.270361 9.349949 18.763342 1.287319 4.640694 2.617617 9.43693 4.484128 14.010085 1.794879 4.393054 3.75758 8.570189 5.66093 12.607132 1.302669 2.765997 2.529613 5.380544 3.689019 8.018627 2.986007 6.803963 2.682086 9.773598 2.578732 10.349719-3.061732 3.672646-6.391571 7.238868-9.91379 11.015891-1.810229 1.943258-3.680832 3.949962-5.523807 5.980201l-22.560832 24.8909c-3.865028 4.261047-4.940522 10.365068-2.774183 15.693424 0.991584 2.426259 25.102724 60.011792 102.414531 106.400309 5.588275 3.353374 12.703323 2.701528 17.591657-1.603521l23.476691-20.682042c2.346441-2.061962 4.64888-4.336772 6.875594-6.534833 9.05319-8.93858 14.018272-12.95608 17.73185-11.576663 3.305279 1.222851 6.907317 3.166109 10.720156 5.228071 3.325745 1.794879 6.764054 3.650133 10.465352 5.288446 6.016017 2.662643 12.120039 4.688789 18.019399 6.65149 6.827499 2.266623 13.279445 4.409426 18.819624 7.275707 1.518586 0.782829 1.926886 0.994654 2.358721 7.830339 0.726547 11.496845 1.25048 23.276123 1.753947 34.672684 0.264013 5.900384 0.528026 11.803837 0.815575 17.700127 0.284479 5.743818 3.833305 10.82044 9.138124 13.05534 1.654686 0.698918 29.371958 12.063757 74.869175 12.063757 0.328481 0 3.65832 0 3.986801 0 45.497217 0 73.214489-11.364839 74.869175-12.063757 5.304819-2.234901 8.853645-7.311523 9.138124-13.05534 0.287549-5.89629 0.551562-11.799744 0.815575-17.700127 0.503467-11.396561 1.027399-23.175839 1.753947-34.672684 0.431835-6.835685 0.840134-7.04751 2.358721-7.830339 5.54018-2.866281 11.992125-5.009084 18.819624-7.275707 5.89936-1.962701 12.003382-3.988848 18.019399-6.65149 3.701299-1.638313 7.139607-3.493567 10.465352-5.288446 3.812839-2.061962 7.414877-4.00522 10.720156-5.228071 3.713578-1.379417 8.67866 2.638083 17.73185 11.576663 2.226714 2.198062 4.529153 4.472871 6.875594 6.534833l23.476691 20.682042c4.888334 4.305049 12.003382 4.956895 17.591657 1.603521 77.311807-46.388517 101.422947-103.97405 102.414531-106.400309 2.166339-5.328355 1.090844-11.432377-2.774183-15.693424l-22.560832-24.8909c-1.842974-2.030239-3.713578-4.036943-5.523807-5.980201-3.52222-3.777023-6.852058-7.343245-9.91379-11.015891-0.103354-0.576121-0.407276-3.545756 2.578732-10.349719 1.159406-2.638083 2.38635-5.252631 3.689019-8.018627 1.90335-4.036943 3.866051-8.214079 5.66093-12.607132 1.866511-4.573155 3.196809-9.369392 4.484128-14.010085 2.914376-10.492982 5.136997-17.46886 9.349949-18.763342 12.715603-3.910053 26.41051-4.261047 40.908712-4.63353 5.668093-0.143263 11.527544-0.295735 17.419741-0.667196 6.503111-0.415462 11.992125-4.984524 13.57518-11.308557C907.21518 494.340805 883.543038 436.564937 882.527918 434.149934zM643.49894 643.761929c-35.280528 35.280528-82.191954 54.711066-132.086317 54.711066s-96.806813-19.430538-132.086317-54.711066c-35.280528-35.279504-54.711066-82.191954-54.711066-132.086317 0-49.894364 19.430538-96.80272 54.711066-132.082224 35.283598-35.284621 82.191954-54.711066 132.086317-54.711066s96.80579 19.426445 132.086317 54.711066c35.279504 35.279504 54.711066 82.187861 54.711066 132.082224C698.210006 561.569976 678.782537 608.482425 643.49894 643.761929z',
         }));
     };
     ServiceTaskView.prototype.getShape = function () {
-        var attributes = _super.prototype.getAttributes.call(this);
-        var x = attributes.x, y = attributes.y, width = attributes.width, height = attributes.height, fill = attributes.fill, stroke = attributes.stroke, strokeWidth = attributes.strokeWidth, radius = attributes.radius;
-        // todo: 将basic-shape对外暴露，在这里可以直接用。现在纯手写有点麻烦。
+        var model = this.props.model;
+        var x = model.x, y = model.y, width = model.width, height = model.height, radius = model.radius;
+        var style = model.getNodeStyle();
         return h('g', {}, [
-            h('rect', {
-                x: x - width / 2,
-                y: y - height / 2,
-                rx: radius,
-                ry: radius,
-                fill: fill,
-                stroke: stroke,
-                strokeWidth: strokeWidth,
-                width: width,
-                height: height,
-            }),
+            h('rect', __assign({ x: x - width / 2, y: y - height / 2, rx: radius, ry: radius, width: width,
+                height: height }, style)),
             this.getLabelShape(),
         ]);
     };