@logicflow/extension 1.1.20 → 1.2.0-alpha.10

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.d.ts

@@ -1,45 +1,53 @@
-declare const BpmnAdapter: {
-    pluginName: string;
-    install(lf: any): void;
-    shapeConfigMap: Map<any, any>;
+declare class BpmnAdapter {
+    static pluginName: string;
+    static shapeConfigMap: Map<any, any>;
+    processAttributes: {
+        ['-isExecutable']: string;
+        ['-id']: string;
+    };
+    definitionAttributes: {
+        ['-id']: string;
+        ['-xmlns:xsi']: string;
+        ['-xmlns:bpmn']: string;
+        ['-xmlns:bpmndi']: string;
+        ['-xmlns:dc']: string;
+        ['-xmlns:di']: string;
+        ['-targetNamespace']: string;
+        ['-exporter']: string;
+        ['-exporterVersion']: string;
+        [key: string]: any;
+    };
+    constructor({ lf }: {
+        lf: any;
+    });
     setCustomShape(key: any, val: any): void;
-    adapterOut(data: any): {
+    adapterOut: (data: any) => {
         'bpmn:definitions': {
-            '-id': string;
-            '-xmlns:xsi': string;
-            '-xmlns:bpmn': string;
-            '-xmlns:bpmndi': string;
-            '-xmlns:dc': string;
-            '-xmlns:di': string;
-            '-targetNamespace': string;
-            '-exporter': string;
-            '-exporterVersion': string;
-            'bpmn:process': {
-                '-id': string;
-                '-isExecutable': string;
-            };
-            'bpmndi:BPMNDiagram': {
-                '-id': string;
-                'bpmndi:BPMNPlane': {
-                    '-id': string;
-                    '-bpmnElement': string;
-                };
-            };
+            [key: string]: any;
+            "-id": string;
+            "-xmlns:xsi": string;
+            "-xmlns:bpmn": string;
+            "-xmlns:bpmndi": string;
+            "-xmlns:dc": string;
+            "-xmlns:di": string;
+            "-targetNamespace": string;
+            "-exporter": string;
+            "-exporterVersion": string;
         };
     };
-    adapterIn(bpmnData: any): {
+    adapterIn: (bpmnData: any) => {
         nodes: any[];
         edges: any[];
     };
-};
-declare const BpmnXmlAdapter: {
-    pluginName: string;
-    install(lf: any): void;
-    adapterXmlIn(bpmnData: any): {
+}
+declare class BpmnXmlAdapter extends BpmnAdapter {
+    static pluginName: string;
+    constructor(data: any);
+    adapterXmlIn: (bpmnData: any) => {
         nodes: any[];
         edges: any[];
     };
-    adapterXmlOut(data: any): string;
-};
+    adapterXmlOut: (data: any) => string;
+}
 export { BpmnAdapter, BpmnXmlAdapter, };
 export default BpmnAdapter;

package/es/bpmn-adapter/index.js

@@ -1,3 +1,27 @@
+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;
@@ -29,8 +53,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) {
@@ -114,8 +138,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;
         }
@@ -128,19 +150,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,
@@ -155,6 +175,23 @@ function convertLf2ProcessData(bpmnProcessData, data) {
         }
         return edgeConfig;
     });
+    // @see https://github.com/didi/LogicFlow/issues/325
+    // 需要保证incoming在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;
 }
 /**
@@ -399,53 +436,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_" + 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_" + getBpmnId(),
         };
-        convertLf2DiagramData(bpmnDiagramData, data);
-        var bpmnData = {
-            'bpmn:definitions': {
-                '-id': "Definitions_" + 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_" + 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;
+}());
 BpmnAdapter.shapeConfigMap.set(BpmnElements.START, {
     width: StartEventConfig.width,
     height: StartEventConfig.height,
@@ -466,20 +509,25 @@ BpmnAdapter.shapeConfigMap.set(BpmnElements.USER, {
     width: UserTaskConfig.width,
     height: UserTaskConfig.height,
 });
-var BpmnXmlAdapter = {
-    pluginName: 'bpmnXmlAdapter',
-    install: function (lf) {
-        lf.adapterIn = this.adapterXmlIn;
-        lf.adapterOut = this.adapterXmlOut;
-    },
-    adapterXmlIn: function (bpmnData) {
-        var json = lfXml2Json(bpmnData);
-        return BpmnAdapter.adapterIn(json);
-    },
-    adapterXmlOut: function (data) {
-        var outData = BpmnAdapter.adapterOut(data);
-        return 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 = lfXml2Json(bpmnData);
+            return _this.adapterIn(json);
+        };
+        _this.adapterXmlOut = function (data) {
+            var outData = _this.adapterOut(data);
+            return lfJson2Xml(outData);
+        };
+        var lf = data.lf;
+        lf.adapterIn = _this.adapterXmlIn;
+        lf.adapterOut = _this.adapterXmlOut;
+        return _this;
+    }
+    BpmnXmlAdapter.pluginName = 'bpmnXmlAdapter';
+    return BpmnXmlAdapter;
+}(BpmnAdapter));
 export { BpmnAdapter, BpmnXmlAdapter, };
 export default BpmnAdapter;

package/es/bpmn-adapter/json2xml.js

@@ -22,10 +22,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) {