@meta2d/core 1.0.36 → 1.0.37

package/src/core.d.ts

@@ -1,6 +1,6 @@
 import { EventType, Handler, WildcardHandler } from 'mitt';
 import { Canvas } from './canvas';
-import { Options } from './options';
+import { Options, PenPlugin, PluginOptions } from './options';
 import { calcTextDrawRect, calcTextLines, calcTextRect, facePen, getWords, LockState, Pen, renderPenRaw, IValue, setElemPosition } from './pen';
 import { Point } from './point';
 import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network, HttpOptions } from './store';
@@ -16,6 +16,12 @@ export declare class Meta2d {
     mqttClient: MqttClient;
     websockets: WebSocket[];
     mqttClients: MqttClient[];
+    penPluginMap: Map<PenPlugin, {
+        tag?: string;
+        name?: string;
+        id?: string;
+        option: Object;
+    }[]>;
     socketFn: (e: string, context?: {
         meta2d?: Meta2d;
         type?: string;
@@ -421,6 +427,20 @@ export declare class Meta2d {
      * @returns 组合图形
      */
     toComponent(pens?: Pen[], showChild?: number, anchor?: boolean): Pen[];
+    /**
+     * @description 安装插件方法
+     * @param plugins 插件列表及其配置项
+     * @param pen {string | Pen} 接受tag、name、或者Pen对象*/
+    installPenPlugins(pen: {
+        tag?: string;
+        name?: string;
+        id?: string;
+    }, plugins: PluginOptions[]): void;
+    uninstallPenPlugins(pen: {
+        tag?: string;
+        name?: string;
+        id?: string;
+    }, plugins: PluginOptions[]): void;
     setVisible(pen: Pen, visible: boolean, render?: boolean): void;
     clearHover(): void;
     closeSocket(): void;

package/src/core.js

@@ -83,7 +83,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { commonAnchors, commonPens, cube } from './diagrams';
 import { Canvas } from './canvas';
-import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, } from './pen';
+import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, } from './pen';
 import { rotatePoint } from './point';
 import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
@@ -102,6 +102,7 @@ var Meta2d = /** @class */ (function () {
     function Meta2d(parent, opts) {
         var _this = this;
         if (opts === void 0) { opts = {}; }
+        this.penPluginMap = new Map();
         this.events = {};
         this.facePen = facePen;
         this.getWords = getWords;
@@ -893,7 +894,7 @@ var Meta2d = /** @class */ (function () {
         var e_1, _a, e_2, _b, e_3, _c, e_4, _e;
         var _this = this;
         if (render === void 0) { render = true; }
-        this.clear(false, data.template);
+        this.clear(false, data === null || data === void 0 ? void 0 : data.template);
         this.canvas.autoPolylineFlag = true;
         if (data) {
             this.setBackgroundImage(data.bkImage, data);
@@ -4112,11 +4113,16 @@ var Meta2d = /** @class */ (function () {
                 },
             ];
         }
+        //如果本身就是 一个 组合图元
+        var parents = components.filter(function (pen) { return !pen.parentId; });
         var p = components.find(function (pen) {
             return pen.width === rect.width && pen.height === rect.height;
         });
         var oneIsParent = p && showChild === undefined;
-        if (oneIsParent) {
+        if (parents.length === 1) {
+            parent = parents[0];
+        }
+        else if (oneIsParent) {
             if (!p.children) {
                 p.children = [];
             }
@@ -4142,10 +4148,76 @@ var Meta2d = /** @class */ (function () {
             pen.locked = (_a = pen.lockedOnCombine) !== null && _a !== void 0 ? _a : LockState.DisableMove;
             // pen.type = PenType.Node;
         });
-        return oneIsParent
+        return (oneIsParent || parents.length === 1)
             ? deepClone(components)
             : deepClone(__spreadArray([parent], __read(components), false));
     };
+    // TODO 安装pen插件 此处是否应当进行相关的适配？不再让插件内部处理install的目标逻辑？
+    /**
+     * @description 安装插件方法
+     * @param plugins 插件列表及其配置项
+     * @param pen {string | Pen} 接受tag、name、或者Pen对象*/
+    Meta2d.prototype.installPenPlugins = function (pen, plugins) {
+        var _this = this;
+        if (!pen.tag && !pen.name && !pen.id)
+            return;
+        var type;
+        pen.id ? type = 'id' :
+            pen.tag ? type = 'tag' :
+                pen.name ? type = 'name' : '';
+        plugins.forEach(function (pluginConfig) {
+            var _a, _b;
+            var plugin = pluginConfig.plugin;
+            var option = pluginConfig.options;
+            if (!plugin)
+                return;
+            // 插件校验
+            if (validationPlugin(plugin) && type) {
+                plugin.install(pen, option);
+                // 若当前不存在此插件
+                if (!_this.penPluginMap.has(plugin)) {
+                    _this.penPluginMap.set(plugin, [(_a = {}, _a[type] = pen[type], _a.option = option, _a)]);
+                }
+                else {
+                    var op = _this.penPluginMap.get(plugin).find(function (i) {
+                        return i[type] === pen[type];
+                    });
+                    // 存在替换
+                    if (op) {
+                        op.option = option;
+                    }
+                    else {
+                        _this.penPluginMap.get(plugin).push((_b = {},
+                            _b[type] = pen[type],
+                            _b.option = option,
+                            _b));
+                    }
+                }
+            }
+        });
+    };
+    Meta2d.prototype.uninstallPenPlugins = function (pen, plugins) {
+        var _this = this;
+        var type;
+        pen.id ? type = 'id' :
+            pen.tag ? type = 'tag' :
+                pen.name ? type = 'name' : '';
+        if (!type)
+            return;
+        plugins.forEach(function (pluginConfig) {
+            var plugin = pluginConfig.plugin;
+            plugin.uninstall(pen, pluginConfig.options);
+            var mapList = _this.penPluginMap.get(plugin);
+            var op = mapList.findIndex(function (i) { return i[type] === pen[type]; });
+            if (op !== -1) {
+                mapList.splice(op, 1);
+                // TODO 在运行时 插件卸载后是否需要移除？
+                if (mapList.length === 0) {
+                    _this.penPluginMap.delete(plugin);
+                }
+            }
+        });
+    };
     Meta2d.prototype.setVisible = function (pen, visible, render) {
         var e_18, _a;
         if (render === void 0) { render = true; }