@logicflow/extension 1.0.5 → 1.0.7

package/cjs/bpmn-adapter/index.js

@@ -477,13 +477,12 @@ var BpmnXmlAdapter = {
         lf.adapterOut = this.adapterXmlOut;
     },
     adapterXmlIn: function (bpmnData) {
-        // @ts-ignore
-        var json = new xml2json_1.default.ObjTree().parseXML(bpmnData);
+        var json = xml2json_1.lfXml2Json(bpmnData);
         return BpmnAdapter.adapterIn(json);
     },
     adapterXmlOut: function (data) {
         var outData = BpmnAdapter.adapterOut(data);
-        return json2xml_1.default(outData);
+        return json2xml_1.lfJson2Xml(outData);
     },
 };
 exports.BpmnXmlAdapter = BpmnXmlAdapter;

package/cjs/bpmn-adapter/json2xml.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.lfJson2Xml = void 0;
 /**
  * This work is licensed under Creative Commons GNU LGPL License.
  * License:
@@ -51,11 +52,11 @@ function toXml(v, name, ind, deep) {
     return xml;
 }
 ;
-function json2xml(o) {
+function lfJson2Xml(o) {
     var xmlStr = "";
     for (var m in o) {
         xmlStr += toXml(o[m], m, "\t\n", 0);
     }
     return xmlStr;
 }
-exports.default = json2xml;
+exports.lfJson2Xml = lfJson2Xml;

package/cjs/bpmn-adapter/xml2json.js

@@ -1,6 +1,7 @@
 "use strict";
 // @ts-nocheck
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.lfXml2Json = void 0;
 // ========================================================================  
 //  XML.ObjTree -- XML source code from/to JavaScript object like E4X  
 // ========================================================================  
@@ -522,4 +523,7 @@ which I will do instead of keeping this documentation like it is.
 =cut
 // ========================================================================
 */
-exports.default = XML;
+var lfXml2Json = function (xmlData) {
+    return new XML.ObjTree().parseXML(xmlData);
+};
+exports.lfXml2Json = lfXml2Json;

package/cjs/components/control/index.js

@@ -1,4 +1,15 @@
 "use strict";
+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;
@@ -21,83 +32,96 @@ var __spread = (this && this.__spread) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Control = void 0;
-var Control = {
-    pluginName: 'control',
-    __lf: null,
-    __controlItems: [
-        {
-            key: 'zoom-out',
-            iconClass: 'lf-control-zoomOut',
-            title: '缩小流程图',
-            text: '缩小',
-            onClick: function () { Control.__lf.zoom(false); },
-        },
-        {
-            key: 'zoom-in',
-            iconClass: 'lf-control-zoomIn',
-            title: '放大流程图',
-            text: '放大',
-            onClick: function () { Control.__lf.zoom(true); },
-        },
-        {
-            key: 'reset',
-            iconClass: 'lf-control-fit',
-            title: '恢复流程原有尺寸',
-            text: '适应',
-            onClick: function () { Control.__lf.resetZoom(); },
-        },
-        {
-            key: 'undo',
-            iconClass: 'lf-control-undo',
-            title: '回到上一步',
-            text: '上一步',
-            onClick: function () { Control.__lf.undo(); },
-        },
-        {
-            key: 'redo',
-            iconClass: 'lf-control-redo',
-            title: '移到下一步',
-            text: '下一步',
-            onClick: function () { Control.__lf.redo(); },
-        },
-    ],
-    addItem: function (item) {
-        Control.__controlItems.push(item);
-    },
-    removeItem: function (key) {
-        var index = Control.__controlItems.findIndex(function (item) { return item.key === key; });
-        return Control.__controlItems.splice(index, 1)[0];
-    },
-    install: function () { },
-    render: function (lf, domContainer) {
-        Control.__lf = lf;
-        Control.__domContainer = domContainer;
-        Control.__tool = this.__getControlTool();
-        domContainer.appendChild(Control.__tool);
-    },
-    destroy: function () {
-        var _a;
-        try {
-            (_a = Control.__domContainer) === null || _a === void 0 ? void 0 : _a.removeChild(Control.__tool);
+var Control = /** @class */ (function () {
+    function Control(_a) {
+        var _b;
+        var _this = this;
+        var lf = _a.lf;
+        var _c;
+        this.controlItems = [
+            {
+                key: 'zoom-out',
+                iconClass: 'lf-control-zoomOut',
+                title: '缩小流程图',
+                text: '缩小',
+                onClick: function () {
+                    _this.lf.zoom(false);
+                },
+            },
+            {
+                key: 'zoom-in',
+                iconClass: 'lf-control-zoomIn',
+                title: '放大流程图',
+                text: '放大',
+                onClick: function () {
+                    _this.lf.zoom(true);
+                },
+            },
+            {
+                key: 'reset',
+                iconClass: 'lf-control-fit',
+                title: '恢复流程原有尺寸',
+                text: '适应',
+                onClick: function () {
+                    _this.lf.resetZoom();
+                },
+            },
+            {
+                key: 'undo',
+                iconClass: 'lf-control-undo',
+                title: '回到上一步',
+                text: '上一步',
+                onClick: function () {
+                    _this.lf.undo();
+                },
+            },
+            {
+                key: 'redo',
+                iconClass: 'lf-control-redo',
+                title: '移到下一步',
+                text: '下一步',
+                onClick: function () {
+                    _this.lf.redo();
+                },
+            },
+        ];
+        this.lf = lf;
+        this.lf.extension = __assign(__assign({}, ((_c = this.lf.extension) !== null && _c !== void 0 ? _c : {})), (_b = {}, _b[Control.pluginName] = this, _b));
+    }
+    Control.prototype.render = function (lf, domContainer) {
+        this.destroy();
+        var toolEl = this.getControlTool();
+        this.toolEl = toolEl;
+        domContainer.appendChild(toolEl);
+        this.domContainer = domContainer;
+    };
+    Control.prototype.destroy = function () {
+        if (this.domContainer && this.toolEl && this.domContainer.contains(this.toolEl)) {
+            this.domContainer.removeChild(this.toolEl);
         }
-        catch (e) {
-            console.warn('unexpect destory error', e);
-        } // todo: 目前某些情况存在此处报错情况，暂时这样处理。后续改成class写法就没有问题了。
-    },
-    __getControlTool: function () {
+    };
+    Control.prototype.addItem = function (item) {
+        this.controlItems.push(item);
+    };
+    Control.prototype.removeItem = function (key) {
+        var index = this.controlItems.findIndex(function (item) { return item.key === key; });
+        return this.controlItems.splice(index, 1)[0];
+    };
+    Control.prototype.getControlTool = function () {
+        var _this = this;
         var NORMAL = 'lf-control-item';
         var DISABLED = 'lf-control-item disabled';
         var controlTool = document.createElement('div');
         var controlElements = [];
         controlTool.className = 'lf-control';
-        Control.__controlItems.forEach(function (item) {
+        this.controlItems.forEach(function (item) {
             var itemContainer = document.createElement('div');
             var icon = document.createElement('i');
             var text = document.createElement('span');
             itemContainer.className = DISABLED;
-            item.onClick && (itemContainer.onclick = item.onClick.bind(null, Control.__lf));
-            item.onMouseEnter && (itemContainer.onmouseenter = item.onMouseEnter.bind(null, Control.__lf));
-            item.onMouseLeave && (itemContainer.onmouseleave = item.onMouseLeave.bind(null, Control.__lf));
+            item.onClick && (itemContainer.onclick = item.onClick.bind(null, _this.lf));
+            item.onMouseEnter && (itemContainer.onmouseenter = item.onMouseEnter.bind(null, _this.lf));
+            item.onMouseLeave && (itemContainer.onmouseleave = item.onMouseLeave.bind(null, _this.lf));
             icon.className = item.iconClass;
             text.className = 'lf-control-text';
             text.title = item.title;
@@ -105,13 +129,13 @@ var Control = {
             itemContainer.append(icon, text);
             switch (item.text) {
                 case '上一步':
-                    Control.__lf.on('history:change', function (_a) {
+                    _this.lf.on('history:change', function (_a) {
                         var undoAble = _a.data.undoAble;
                         itemContainer.className = undoAble ? NORMAL : DISABLED;
                     });
                     break;
                 case '下一步':
-                    Control.__lf.on('history:change', function (_a) {
+                    _this.lf.on('history:change', function (_a) {
                         var redoAble = _a.data.redoAble;
                         itemContainer.className = redoAble ? NORMAL : DISABLED;
                     });
@@ -124,7 +148,9 @@ var Control = {
         });
         controlTool.append.apply(controlTool, __spread(controlElements));
         return controlTool;
-    },
-};
+    };
+    Control.pluginName = 'control';
+    return Control;
+}());
 exports.Control = Control;
 exports.default = Control;

package/cjs/components/dnd-panel/index.js

@@ -16,11 +16,12 @@ var DndPanel = /** @class */ (function () {
     }
     DndPanel.prototype.render = function (lf, domContainer) {
         var _this = this;
-        if (this.panelEl) {
-            domContainer.removeChild(this.panelEl);
-        }
-        if (!this.shapeList || this.shapeList.length === 0)
+        this.destroy();
+        if (!this.shapeList || this.shapeList.length === 0) {
+            // 首次render后失败后，后续调用setPatternItems支持渲染
+            this.domContainer = domContainer;
             return;
+        }
         this.panelEl = document.createElement('div');
         this.panelEl.className = 'lf-dndpanel';
         this.shapeList.forEach(function (shapeItem) {
@@ -29,6 +30,11 @@ var DndPanel = /** @class */ (function () {
         domContainer.appendChild(this.panelEl);
         this.domContainer = domContainer;
     };
+    DndPanel.prototype.destroy = function () {
+        if (this.domContainer && this.panelEl && this.domContainer.contains(this.panelEl)) {
+            this.domContainer.removeChild(this.panelEl);
+        }
+    };
     DndPanel.prototype.createDndItem = function (shapeItem) {
         var _this = this;
         var el = document.createElement('div');
@@ -54,7 +60,7 @@ var DndPanel = /** @class */ (function () {
                 });
             }
             if (shapeItem.callback) {
-                shapeItem.callback();
+                shapeItem.callback(_this.lf, _this.domContainer);
             }
         };
         return el;

package/cjs/index.js

@@ -27,3 +27,5 @@ __exportStar(require("./materials/group"), exports);
 __exportStar(require("./NodeResize"), exports);
 __exportStar(require("./tools/flow-path"), exports);
 __exportStar(require("./tools/auto-layout"), exports);
+__exportStar(require("./bpmn-adapter/xml2json"), exports);
+__exportStar(require("./bpmn-adapter/json2xml"), exports);

package/cjs/tools/snapshot/index.js

@@ -132,11 +132,6 @@ var Snapshot = {
         var _this = this;
         var copy = svg.cloneNode(true);
         var graph = copy.lastChild;
-        var style = document.createElement('style');
-        style.innerHTML = this.getClassRules();
-        var foreignObject = document.createElement('foreignObject');
-        foreignObject.appendChild(style);
-        copy.appendChild(foreignObject);
         var childLength = graph.childNodes && graph.childNodes.length;
         if (childLength) {
             for (var i = 0; i < childLength; i++) {
@@ -190,6 +185,11 @@ var Snapshot = {
             ctx.clearRect(0, 0, bboxWidth, bboxHeight);
         }
         var img = new Image();
+        var style = document.createElement('style');
+        style.innerHTML = this.getClassRules();
+        var foreignObject = document.createElement('foreignObject');
+        foreignObject.appendChild(style);
+        copy.appendChild(foreignObject);
         return new Promise(function (resolve) {
             img.onload = function () {
                 ctx.drawImage(img, 0, 0);

package/es/bpmn-adapter/index.js

@@ -15,8 +15,8 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { getBpmnId } from './bpmnIds';
-import json2xml from './json2xml';
-import XML from './xml2json';
+import { lfJson2Xml } from './json2xml';
+import { lfXml2Json } from './xml2json';
 import { ExclusiveGatewayConfig, StartEventConfig, EndEventConfig, ServiceTaskConfig, UserTaskConfig, } from '../bpmn/constant';
 var BpmnElements;
 (function (BpmnElements) {
@@ -473,13 +473,12 @@ var BpmnXmlAdapter = {
         lf.adapterOut = this.adapterXmlOut;
     },
     adapterXmlIn: function (bpmnData) {
-        // @ts-ignore
-        var json = new XML.ObjTree().parseXML(bpmnData);
+        var json = lfXml2Json(bpmnData);
         return BpmnAdapter.adapterIn(json);
     },
     adapterXmlOut: function (data) {
         var outData = BpmnAdapter.adapterOut(data);
-        return json2xml(outData);
+        return lfJson2Xml(outData);
     },
 };
 export { BpmnAdapter, BpmnXmlAdapter, };

package/es/bpmn-adapter/json2xml.d.ts

@@ -1 +1,2 @@
-export default function json2xml(o: any): string;
+declare function lfJson2Xml(o: any): string;
+export { lfJson2Xml };

package/es/bpmn-adapter/json2xml.js

@@ -49,10 +49,11 @@ function toXml(v, name, ind, deep) {
     return xml;
 }
 ;
-export default function json2xml(o) {
+function lfJson2Xml(o) {
     var xmlStr = "";
     for (var m in o) {
         xmlStr += toXml(o[m], m, "\t\n", 0);
     }
     return xmlStr;
 }
+export { lfJson2Xml };

package/es/bpmn-adapter/xml2json.d.ts

@@ -1,2 +1,2 @@
-declare let XML: () => void;
-export default XML;
+declare const lfXml2Json: (xmlData: any) => any;
+export { lfXml2Json, };

package/es/bpmn-adapter/xml2json.js

@@ -520,4 +520,7 @@ which I will do instead of keeping this documentation like it is.
 =cut
 // ========================================================================
 */
-export default XML;
+var lfXml2Json = function (xmlData) {
+    return new XML.ObjTree().parseXML(xmlData);
+};
+export { lfXml2Json, };

package/es/components/control/index.d.ts

@@ -1,4 +1,4 @@
-import LogicFlow, { Extension } from '@logicflow/core';
+import LogicFlow from '@logicflow/core';
 declare type ControlItem = {
     key: string;
     iconClass: string;
@@ -8,16 +8,20 @@ declare type ControlItem = {
     onMouseEnter?: Function;
     onMouseLeave?: Function;
 };
-interface ControlPlugin extends Extension {
-    pluginName: string;
-    __lf?: LogicFlow;
-    __controlItems: ControlItem[];
-    addItem: (item: ControlItem) => void;
-    removeItem: (key: string) => ControlItem;
-    install: (lf: any) => void;
-    render: (lf: any, domContainer: any) => void;
-    __getControlTool: () => HTMLElement;
+declare class Control {
+    lf: LogicFlow;
+    static pluginName: string;
+    controlItems: ControlItem[];
+    domContainer: HTMLElement;
+    toolEl: HTMLElement;
+    constructor({ lf }: {
+        lf: any;
+    });
+    render(lf: any, domContainer: any): void;
+    destroy(): void;
+    addItem(item: any): void;
+    removeItem(key: any): ControlItem;
+    private getControlTool;
 }
-declare const Control: ControlPlugin;
 export default Control;
-export { Control, };
+export { Control };

package/es/components/control/index.js

@@ -1,3 +1,14 @@
+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;
@@ -18,83 +29,96 @@ var __spread = (this && this.__spread) || function () {
     for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
     return ar;
 };
-var Control = {
-    pluginName: 'control',
-    __lf: null,
-    __controlItems: [
-        {
-            key: 'zoom-out',
-            iconClass: 'lf-control-zoomOut',
-            title: '缩小流程图',
-            text: '缩小',
-            onClick: function () { Control.__lf.zoom(false); },
-        },
-        {
-            key: 'zoom-in',
-            iconClass: 'lf-control-zoomIn',
-            title: '放大流程图',
-            text: '放大',
-            onClick: function () { Control.__lf.zoom(true); },
-        },
-        {
-            key: 'reset',
-            iconClass: 'lf-control-fit',
-            title: '恢复流程原有尺寸',
-            text: '适应',
-            onClick: function () { Control.__lf.resetZoom(); },
-        },
-        {
-            key: 'undo',
-            iconClass: 'lf-control-undo',
-            title: '回到上一步',
-            text: '上一步',
-            onClick: function () { Control.__lf.undo(); },
-        },
-        {
-            key: 'redo',
-            iconClass: 'lf-control-redo',
-            title: '移到下一步',
-            text: '下一步',
-            onClick: function () { Control.__lf.redo(); },
-        },
-    ],
-    addItem: function (item) {
-        Control.__controlItems.push(item);
-    },
-    removeItem: function (key) {
-        var index = Control.__controlItems.findIndex(function (item) { return item.key === key; });
-        return Control.__controlItems.splice(index, 1)[0];
-    },
-    install: function () { },
-    render: function (lf, domContainer) {
-        Control.__lf = lf;
-        Control.__domContainer = domContainer;
-        Control.__tool = this.__getControlTool();
-        domContainer.appendChild(Control.__tool);
-    },
-    destroy: function () {
-        var _a;
-        try {
-            (_a = Control.__domContainer) === null || _a === void 0 ? void 0 : _a.removeChild(Control.__tool);
+var Control = /** @class */ (function () {
+    function Control(_a) {
+        var _b;
+        var _this = this;
+        var lf = _a.lf;
+        var _c;
+        this.controlItems = [
+            {
+                key: 'zoom-out',
+                iconClass: 'lf-control-zoomOut',
+                title: '缩小流程图',
+                text: '缩小',
+                onClick: function () {
+                    _this.lf.zoom(false);
+                },
+            },
+            {
+                key: 'zoom-in',
+                iconClass: 'lf-control-zoomIn',
+                title: '放大流程图',
+                text: '放大',
+                onClick: function () {
+                    _this.lf.zoom(true);
+                },
+            },
+            {
+                key: 'reset',
+                iconClass: 'lf-control-fit',
+                title: '恢复流程原有尺寸',
+                text: '适应',
+                onClick: function () {
+                    _this.lf.resetZoom();
+                },
+            },
+            {
+                key: 'undo',
+                iconClass: 'lf-control-undo',
+                title: '回到上一步',
+                text: '上一步',
+                onClick: function () {
+                    _this.lf.undo();
+                },
+            },
+            {
+                key: 'redo',
+                iconClass: 'lf-control-redo',
+                title: '移到下一步',
+                text: '下一步',
+                onClick: function () {
+                    _this.lf.redo();
+                },
+            },
+        ];
+        this.lf = lf;
+        this.lf.extension = __assign(__assign({}, ((_c = this.lf.extension) !== null && _c !== void 0 ? _c : {})), (_b = {}, _b[Control.pluginName] = this, _b));
+    }
+    Control.prototype.render = function (lf, domContainer) {
+        this.destroy();
+        var toolEl = this.getControlTool();
+        this.toolEl = toolEl;
+        domContainer.appendChild(toolEl);
+        this.domContainer = domContainer;
+    };
+    Control.prototype.destroy = function () {
+        if (this.domContainer && this.toolEl && this.domContainer.contains(this.toolEl)) {
+            this.domContainer.removeChild(this.toolEl);
         }
-        catch (e) {
-            console.warn('unexpect destory error', e);
-        } // todo: 目前某些情况存在此处报错情况，暂时这样处理。后续改成class写法就没有问题了。
-    },
-    __getControlTool: function () {
+    };
+    Control.prototype.addItem = function (item) {
+        this.controlItems.push(item);
+    };
+    Control.prototype.removeItem = function (key) {
+        var index = this.controlItems.findIndex(function (item) { return item.key === key; });
+        return this.controlItems.splice(index, 1)[0];
+    };
+    Control.prototype.getControlTool = function () {
+        var _this = this;
         var NORMAL = 'lf-control-item';
         var DISABLED = 'lf-control-item disabled';
         var controlTool = document.createElement('div');
         var controlElements = [];
         controlTool.className = 'lf-control';
-        Control.__controlItems.forEach(function (item) {
+        this.controlItems.forEach(function (item) {
             var itemContainer = document.createElement('div');
             var icon = document.createElement('i');
             var text = document.createElement('span');
             itemContainer.className = DISABLED;
-            item.onClick && (itemContainer.onclick = item.onClick.bind(null, Control.__lf));
-            item.onMouseEnter && (itemContainer.onmouseenter = item.onMouseEnter.bind(null, Control.__lf));
-            item.onMouseLeave && (itemContainer.onmouseleave = item.onMouseLeave.bind(null, Control.__lf));
+            item.onClick && (itemContainer.onclick = item.onClick.bind(null, _this.lf));
+            item.onMouseEnter && (itemContainer.onmouseenter = item.onMouseEnter.bind(null, _this.lf));
+            item.onMouseLeave && (itemContainer.onmouseleave = item.onMouseLeave.bind(null, _this.lf));
             icon.className = item.iconClass;
             text.className = 'lf-control-text';
             text.title = item.title;
@@ -102,13 +126,13 @@ var Control = {
             itemContainer.append(icon, text);
             switch (item.text) {
                 case '上一步':
-                    Control.__lf.on('history:change', function (_a) {
+                    _this.lf.on('history:change', function (_a) {
                         var undoAble = _a.data.undoAble;
                         itemContainer.className = undoAble ? NORMAL : DISABLED;
                     });
                     break;
                 case '下一步':
-                    Control.__lf.on('history:change', function (_a) {
+                    _this.lf.on('history:change', function (_a) {
                         var redoAble = _a.data.redoAble;
                         itemContainer.className = redoAble ? NORMAL : DISABLED;
                     });
@@ -121,7 +145,9 @@ var Control = {
         });
         controlTool.append.apply(controlTool, __spread(controlElements));
         return controlTool;
-    },
-};
+    };
+    Control.pluginName = 'control';
+    return Control;
+}());
 export default Control;
-export { Control, };
+export { Control };