@logicflow/extension 1.1.13 → 1.2.0-alpha.2

package/cjs/NodeResize/Control/Control.js

@@ -125,12 +125,12 @@ var Control = /** @class */ (function (_super) {
             var afterPoint;
             edges.sourceEdges.forEach(function (item) {
                 params.point = item.startPoint;
-                afterPoint = Util_1.getRectReizeEdgePoint(params);
+                afterPoint = Util_1.getRectResizeEdgePoint(params);
                 item.updateStartPoint(afterPoint);
             });
             edges.targetEdges.forEach(function (item) {
                 params.point = item.endPoint;
-                afterPoint = Util_1.getRectReizeEdgePoint(params);
+                afterPoint = Util_1.getRectResizeEdgePoint(params);
                 item.updateEndPoint(afterPoint);
             });
             _this.eventEmit({ beforeNode: beforeNode, afterNode: afterNode });
@@ -189,12 +189,12 @@ var Control = /** @class */ (function (_super) {
             var afterPoint;
             edges.sourceEdges.forEach(function (item) {
                 params.point = item.startPoint;
-                afterPoint = Util_1.getEllipseReizeEdgePoint(params);
+                afterPoint = Util_1.getEllipseResizeEdgePoint(params);
                 item.updateStartPoint(afterPoint);
             });
             edges.targetEdges.forEach(function (item) {
                 params.point = item.endPoint;
-                afterPoint = Util_1.getEllipseReizeEdgePoint(params);
+                afterPoint = Util_1.getEllipseResizeEdgePoint(params);
                 item.updateEndPoint(afterPoint);
             });
             _this.eventEmit({ beforeNode: __assign(__assign({}, beforeNode), { rx: rx, ry: ry }), afterNode: afterNode });
@@ -253,12 +253,12 @@ var Control = /** @class */ (function (_super) {
             var edges = _this.getNodeEdges(id);
             edges.sourceEdges.forEach(function (item) {
                 params.point = item.startPoint;
-                afterPoint = Util_1.getDiamondReizeEdgePoint(params);
+                afterPoint = Util_1.getDiamondResizeEdgePoint(params);
                 item.updateStartPoint(afterPoint);
             });
             edges.targetEdges.forEach(function (item) {
                 params.point = item.endPoint;
-                afterPoint = Util_1.getDiamondReizeEdgePoint(params);
+                afterPoint = Util_1.getDiamondResizeEdgePoint(params);
                 item.updateEndPoint(afterPoint);
             });
             _this.eventEmit({ beforeNode: beforeNode, afterNode: afterNode });
@@ -270,7 +270,7 @@ var Control = /** @class */ (function (_super) {
             var newNodeSize = __assign({ id: id, modelType: modelType, type: type }, afterNode);
             _this.graphModel.eventCenter.emit('node:resize', { oldNodeSize: oldNodeSize, newNodeSize: newNodeSize });
         };
-        _this.onDraging = function (_a) {
+        _this.onDragging = function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY;
             var modelType = _this.nodeModel.modelType;
             // html和矩形的计算方式是一样的，共用一个方法
@@ -300,7 +300,7 @@ var Control = /** @class */ (function (_super) {
         }
         _this.state = {};
         _this.dragHandler = new StepDrag({
-            onDraging: _this.onDraging,
+            onDragging: _this.onDragging,
             step: step,
         });
         return _this;

package/cjs/NodeResize/Control/Util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDiamondReizeEdgePoint = exports.getEllipseReizeEdgePoint = exports.getRectReizeEdgePoint = exports.ModelType = void 0;
+exports.getDiamondResizeEdgePoint = exports.getEllipseResizeEdgePoint = exports.getRectResizeEdgePoint = exports.ModelType = void 0;
 var ModelType;
 (function (ModelType) {
     ModelType["NODE"] = "node";
@@ -28,7 +28,7 @@ function getNodeBox(node) {
     };
 }
 // 计算矩形radius设置后，四个圆角的圆心
-function getRidusCenter(node) {
+function getRadiusCenter(node) {
     var nodeBox = getNodeBox(node);
     var radius = node.radius;
     var minX = nodeBox.minX, minY = nodeBox.minY, maxX = nodeBox.maxX, maxY = nodeBox.maxY;
@@ -52,7 +52,7 @@ function getRidusCenter(node) {
     ];
 }
 // 获取矩形resize之后，与矩形连接边的新端点
-function getRectReizeEdgePoint(_a) {
+function getRectResizeEdgePoint(_a) {
     var point = _a.point, beforeNode = _a.beforeNode, afterNode = _a.afterNode;
     var x = point.x, y = point.y;
     var afterPoint = {
@@ -107,8 +107,8 @@ function getRectReizeEdgePoint(_a) {
     }
     else {
         // 在圆角部分
-        var beeforCoc = getRidusCenter(beforeNode);
-        var afterCoc = getRidusCenter(afterNode);
+        var beforeCoc = getRadiusCenter(beforeNode);
+        var afterCoc = getRadiusCenter(afterNode);
         var nodeBox = getNodeBox(beforeNode);
         var minX = nodeBox.minX, minY = nodeBox.minY, maxX = nodeBox.maxX, maxY = nodeBox.maxY;
         var index = -1;
@@ -130,16 +130,16 @@ function getRectReizeEdgePoint(_a) {
         }
         if (index > -1) {
             // 根据夹角角度计算位置
-            var angle = Math.atan2((y - beeforCoc[index].y), (x - beeforCoc[index].x));
+            var angle = Math.atan2((y - beforeCoc[index].y), (x - beforeCoc[index].x));
             afterPoint.x = afterCoc[index].x + radius * Math.cos(angle);
             afterPoint.y = afterCoc[index].y + radius * Math.sin(angle);
         }
     }
     return afterPoint;
 }
-exports.getRectReizeEdgePoint = getRectReizeEdgePoint;
+exports.getRectResizeEdgePoint = getRectResizeEdgePoint;
 // 获取椭圆resize之后，与椭圆连接边的新端点
-function getEllipseReizeEdgePoint(_a) {
+function getEllipseResizeEdgePoint(_a) {
     var point = _a.point, beforeNode = _a.beforeNode, afterNode = _a.afterNode;
     var rx = afterNode.rx, ry = afterNode.ry;
     var afterPoint = point;
@@ -176,9 +176,9 @@ function getEllipseReizeEdgePoint(_a) {
     afterPoint = { x: x + afterNode.x, y: y + afterNode.y };
     return afterPoint;
 }
-exports.getEllipseReizeEdgePoint = getEllipseReizeEdgePoint;
+exports.getEllipseResizeEdgePoint = getEllipseResizeEdgePoint;
 // 获取菱形resize之后，与菱形连接边的新端点
-function getDiamondReizeEdgePoint(_a) {
+function getDiamondResizeEdgePoint(_a) {
     var point = _a.point, beforeNode = _a.beforeNode, afterNode = _a.afterNode;
     var afterPoint = point;
     var x;
@@ -213,4 +213,4 @@ function getDiamondReizeEdgePoint(_a) {
     };
     return afterPoint;
 }
-exports.getDiamondReizeEdgePoint = getDiamondReizeEdgePoint;
+exports.getDiamondResizeEdgePoint = getDiamondResizeEdgePoint;

package/cjs/bpmn-adapter/index.js

@@ -1,4 +1,28 @@
 "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 __());
+    };
+})();
+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;
@@ -32,8 +56,8 @@ var BpmnElements;
 })(BpmnElements || (BpmnElements = {}));
 var defaultAttrs = ['-name', '-id', 'bpmn:incoming', 'bpmn:outgoing', '-sourceRef', '-targetRef'];
 /**
- * 将普通json转换为xmljson
- * xmljson中properity会以“-”开头
+ * 将普通json转换为xmlJson
+ * xmlJson中property会以“-”开头
  * 如果没有“-”表示为子节点
  */
 function toXmlJson(json) {
@@ -117,8 +141,6 @@ function convertLf2ProcessData(bpmnProcessData, data) {
     var sequenceFlow = data.edges.map(function (edge) {
         var _a, _b;
         var targetNode = nodeMap.get(edge.targetNodeId);
-        // @see https://github.com/didi/LogicFlow/issues/325
-        // 需要保证incomming在outgoing之前
         if (!targetNode['bpmn:incoming']) {
             targetNode['bpmn:incoming'] = edge.id;
         }
@@ -131,19 +153,17 @@ function convertLf2ProcessData(bpmnProcessData, data) {
                 edge.id,
             ];
         }
-        var sourceNode = nodeMap.get(edge.sourceNodeId);
-        if (!sourceNode['bpmn:outgoing']) {
-            sourceNode['bpmn:outgoing'] = edge.id;
-        }
-        else if (Array.isArray(sourceNode['bpmn:outgoing'])) {
-            sourceNode['bpmn:outgoing'].push(edge.id);
-        }
-        else { // 字符串转数组
-            sourceNode['bpmn:outgoing'] = [
-                sourceNode['bpmn:outgoing'],
-                edge.id,
-            ];
-        }
+        // const sourceNode = nodeMap.get(edge.sourceNodeId);
+        // if (!sourceNode['bpmn:outgoing']) {
+        //   sourceNode['bpmn:outgoing'] = edge.id;
+        // } else if (Array.isArray(sourceNode['bpmn:outgoing'])) {
+        //   sourceNode['bpmn:outgoing'].push(edge.id);
+        // } else { // 字符串转数组
+        //   sourceNode['bpmn:outgoing'] = [
+        //     sourceNode['bpmn:outgoing'],
+        //     edge.id,
+        //   ];
+        // }
         var edgeConfig = {
             '-id': edge.id,
             '-sourceRef': edge.sourceNodeId,
@@ -158,6 +178,23 @@ function convertLf2ProcessData(bpmnProcessData, data) {
         }
         return edgeConfig;
     });
+    // @see https://github.com/didi/LogicFlow/issues/325
+    // 需要保证incomming在outgoing之前
+    data.edges.forEach(function (edge) {
+        var sourceNode = nodeMap.get(edge.sourceNodeId);
+        if (!sourceNode['bpmn:outgoing']) {
+            sourceNode['bpmn:outgoing'] = edge.id;
+        }
+        else if (Array.isArray(sourceNode['bpmn:outgoing'])) {
+            sourceNode['bpmn:outgoing'].push(edge.id);
+        }
+        else { // 字符串转数组
+            sourceNode['bpmn:outgoing'] = [
+                sourceNode['bpmn:outgoing'],
+                edge.id,
+            ];
+        }
+    });
     bpmnProcessData[BpmnElements.FLOW] = sequenceFlow;
 }
 /**
@@ -402,53 +439,59 @@ function getEdgeConfig(edgeValue, processValue) {
     }
     return edge;
 }
-var BpmnAdapter = {
-    pluginName: 'bpmn-adapter',
-    install: function (lf) {
-        lf.adapterIn = this.adapterIn;
-        lf.adapterOut = this.adapterOut;
-    },
-    shapeConfigMap: new Map(),
-    setCustomShape: function (key, val) {
-        this.shapeConfigMap.set(key, val);
-    },
-    adapterOut: function (data) {
-        var bpmnProcessData = {
-            '-id': "Process_" + bpmnIds_1.getBpmnId(),
-            '-isExecutable': 'false',
+var BpmnAdapter = /** @class */ (function () {
+    function BpmnAdapter(_a) {
+        var _this = this;
+        var lf = _a.lf;
+        this.adapterOut = function (data) {
+            var bpmnProcessData = __assign({}, _this.processAttributes);
+            convertLf2ProcessData(bpmnProcessData, data);
+            var bpmnDiagramData = {
+                '-id': 'BPMNPlane_1',
+                '-bpmnElement': bpmnProcessData['-id'],
+            };
+            convertLf2DiagramData(bpmnDiagramData, data);
+            var definitions = _this.definitionAttributes;
+            definitions['bpmn:process'] = bpmnProcessData;
+            definitions['bpmndi:BPMNDiagram'] = {
+                '-id': 'BPMNDiagram_1',
+                'bpmndi:BPMNPlane': bpmnDiagramData,
+            };
+            var bpmnData = {
+                'bpmn:definitions': definitions,
+            };
+            return bpmnData;
+        };
+        this.adapterIn = function (bpmnData) {
+            if (bpmnData) {
+                return convertBpmn2LfData(bpmnData);
+            }
         };
-        convertLf2ProcessData(bpmnProcessData, data);
-        var bpmnDiagramData = {
-            '-id': 'BPMNPlane_1',
-            '-bpmnElement': bpmnProcessData['-id'],
+        lf.adapterIn = function (data) { return _this.adapterIn(data); };
+        lf.adapterOut = function (data) { return _this.adapterOut(data); };
+        this.processAttributes = {
+            '-isExecutable': 'true',
+            '-id': "Process_" + bpmnIds_1.getBpmnId(),
         };
-        convertLf2DiagramData(bpmnDiagramData, data);
-        var bpmnData = {
-            'bpmn:definitions': {
-                '-id': "Definitions_" + bpmnIds_1.getBpmnId(),
-                '-xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-                '-xmlns:bpmn': 'http://www.omg.org/spec/BPMN/20100524/MODEL',
-                '-xmlns:bpmndi': 'http://www.omg.org/spec/BPMN/20100524/DI',
-                '-xmlns:dc': 'http://www.omg.org/spec/DD/20100524/DC',
-                '-xmlns:di': 'http://www.omg.org/spec/DD/20100524/DI',
-                '-targetNamespace': 'http://bpmn.io/schema/bpmn',
-                '-exporter': 'bpmn-js (https://demo.bpmn.io)',
-                '-exporterVersion': '7.3.0',
-                'bpmn:process': bpmnProcessData,
-                'bpmndi:BPMNDiagram': {
-                    '-id': 'BPMNDiagram_1',
-                    'bpmndi:BPMNPlane': bpmnDiagramData,
-                },
-            },
+        this.definitionAttributes = {
+            '-id': "Definitions_" + bpmnIds_1.getBpmnId(),
+            '-xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+            '-xmlns:bpmn': 'http://www.omg.org/spec/BPMN/20100524/MODEL',
+            '-xmlns:bpmndi': 'http://www.omg.org/spec/BPMN/20100524/DI',
+            '-xmlns:dc': 'http://www.omg.org/spec/DD/20100524/DC',
+            '-xmlns:di': 'http://www.omg.org/spec/DD/20100524/DI',
+            '-targetNamespace': 'http://logic-flow.org',
+            '-exporter': 'logicflow',
+            '-exporterVersion': '1.2.0',
         };
-        return bpmnData;
-    },
-    adapterIn: function (bpmnData) {
-        if (bpmnData) {
-            return convertBpmn2LfData(bpmnData);
-        }
-    },
-};
+    }
+    BpmnAdapter.prototype.setCustomShape = function (key, val) {
+        BpmnAdapter.shapeConfigMap.set(key, val);
+    };
+    BpmnAdapter.pluginName = 'bpmn-adapter';
+    BpmnAdapter.shapeConfigMap = new Map();
+    return BpmnAdapter;
+}());
 exports.BpmnAdapter = BpmnAdapter;
 BpmnAdapter.shapeConfigMap.set(BpmnElements.START, {
     width: constant_1.StartEventConfig.width,
@@ -470,20 +513,25 @@ BpmnAdapter.shapeConfigMap.set(BpmnElements.USER, {
     width: constant_1.UserTaskConfig.width,
     height: constant_1.UserTaskConfig.height,
 });
-var BpmnXmlAdapter = {
-    pluginName: 'bpmnXmlAdapter',
-    install: function (lf) {
-        lf.adapterIn = this.adapterXmlIn;
-        lf.adapterOut = this.adapterXmlOut;
-    },
-    adapterXmlIn: function (bpmnData) {
-        var json = xml2json_1.lfXml2Json(bpmnData);
-        return BpmnAdapter.adapterIn(json);
-    },
-    adapterXmlOut: function (data) {
-        var outData = BpmnAdapter.adapterOut(data);
-        return json2xml_1.lfJson2Xml(outData);
-    },
-};
+var BpmnXmlAdapter = /** @class */ (function (_super) {
+    __extends(BpmnXmlAdapter, _super);
+    function BpmnXmlAdapter(data) {
+        var _this = _super.call(this, data) || this;
+        _this.adapterXmlIn = function (bpmnData) {
+            var json = xml2json_1.lfXml2Json(bpmnData);
+            return _this.adapterIn(json);
+        };
+        _this.adapterXmlOut = function (data) {
+            var outData = _this.adapterOut(data);
+            return json2xml_1.lfJson2Xml(outData);
+        };
+        var lf = data.lf;
+        lf.adapterIn = _this.adapterXmlIn;
+        lf.adapterOut = _this.adapterXmlOut;
+        return _this;
+    }
+    BpmnXmlAdapter.pluginName = 'bpmnXmlAdapter';
+    return BpmnXmlAdapter;
+}(BpmnAdapter));
 exports.BpmnXmlAdapter = BpmnXmlAdapter;
 exports.default = BpmnAdapter;

package/cjs/bpmn-adapter/json2xml.js

@@ -25,10 +25,13 @@ function toXml(v, name, ind, deep) {
         var hasChild = false;
         xml += addIndSpace(ind, deep) + "<" + name;
         for (var m in v) {
-            if (m.charAt(0) == "-")
+            if (m.charAt(0) == "-") {
+                console.log(m, v[m]);
                 xml += " " + m.substr(1) + "=\"" + v[m].toString() + "\"";
-            else
+            }
+            else {
                 hasChild = true;
+            }
         }
         xml += hasChild ? ">" : " />";
         if (hasChild) {