@meta2d/core 1.0.25 → 1.0.27

package/src/core.d.ts

@@ -282,6 +282,7 @@ export declare class Meta2d {
     formatPainter(): void;
     clearFormatPainter(): void;
     alignNodes(align: string, pens?: Pen[], rect?: Rect): void;
+    alignNodesV(align: string, pens?: Pen[]): void;
     /**
      * 对齐画笔，基于第一个画笔
      * @param align 左对齐，右对齐，上对齐，下对齐，居中对齐

package/src/core.js

@@ -96,6 +96,7 @@ import pkg from '../package.json';
 import { lockedError } from './utils/error';
 import { Scroll } from './scroll';
 import { getter } from './utils/object';
+import { queryURLParams } from './utils/url';
 var Meta2d = /** @class */ (function () {
     function Meta2d(parent, opts) {
         var _this = this;
@@ -569,6 +570,31 @@ var Meta2d = /** @class */ (function () {
                 }
             }
         };
+        this.events[EventAction.PostMessage] = function (pen, e) {
+            if (typeof e.value !== 'string') {
+                console.warn('[meta2d] Emit value must be a string');
+                return;
+            }
+            var _pen = e.params ? _this.findOne(e.params) : pen;
+            if (_pen.name !== 'iframe' || !_pen.iframe) {
+                console.warn('不是嵌入页面');
+                return;
+            }
+            var params = queryURLParams(_pen.iframe.split('?')[1]);
+            _pen.calculative.singleton.div.children[0].contentWindow.postMessage(JSON.stringify({
+                name: e.value,
+                id: params.id,
+            }), '*');
+            return;
+        };
+        this.events[EventAction.PostMessageToParent] = function (pen, e) {
+            if (typeof e.value !== 'string') {
+                console.warn('[meta2d] Emit value must be a string');
+                return;
+            }
+            window.parent.postMessage(JSON.stringify(e.value), '*');
+            return;
+        };
     };
     Meta2d.prototype.navigatorTo = function (id) {
         if (!id) {
@@ -1205,9 +1231,11 @@ var Meta2d = /** @class */ (function () {
         var _this = this;
         this.stopAnimate(idOrTagOrPens);
         var pens;
+        // 没有参数 则播放有自动播放属性的动画
         if (!idOrTagOrPens) {
             pens = this.store.data.pens.filter(function (pen) {
-                return (pen.type || pen.frames) && pen.autoPlay;
+                return (((pen.type || pen.frames) && pen.autoPlay) ||
+                    (pen.animations && pen.autoPlay));
             });
         }
         else if (typeof idOrTagOrPens === 'string') {
@@ -1217,6 +1245,7 @@ var Meta2d = /** @class */ (function () {
             pens = idOrTagOrPens;
         }
         pens.forEach(function (pen) {
+            var _a;
             if (pen.calculative.pause) {
                 var d = Date.now() - pen.calculative.pause;
                 pen.calculative.pause = undefined;
@@ -1224,8 +1253,8 @@ var Meta2d = /** @class */ (function () {
                 pen.calculative.frameEnd += d;
             }
             else {
+                var index = -1;
                 if (params !== undefined && pen.animations) {
-                    var index = -1;
                     if (typeof params === 'string') {
                         index = pen.animations.findIndex(function (animation) { return animation.name === params; });
                         if (index === -1) {
@@ -1240,6 +1269,11 @@ var Meta2d = /** @class */ (function () {
                             return;
                         }
                     }
+                }
+                else if (params === undefined) {
+                    index = ((_a = pen.animations) === null || _a === void 0 ? void 0 : _a.findIndex(function (i) { return i.autoPlay; })) || -1;
+                }
+                if (index !== -1) {
                     var animate = deepClone(pen.animations[index]);
                     delete animate.name;
                     animate.currentAnimation = index;
@@ -1308,7 +1342,8 @@ var Meta2d = /** @class */ (function () {
         });
         this.initImageCanvas(pens);
         setTimeout(function () {
-            _this.canvas.calcActiveRect();
+            var _a;
+            (_a = _this.canvas) === null || _a === void 0 ? void 0 : _a.calcActiveRect();
             _this.render();
         }, 20);
     };
@@ -1972,12 +2007,6 @@ var Meta2d = /** @class */ (function () {
     };
     //获取动态参数
     Meta2d.prototype.getDynamicParam = function (key) {
-        function queryURLParams() {
-            var url = window.location.href.split('?')[1];
-            var urlSearchParams = new URLSearchParams(url);
-            var params = Object.fromEntries(urlSearchParams.entries());
-            return params;
-        }
         function getCookie(name) {
             var arr;
             var reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
@@ -2869,6 +2898,38 @@ var Meta2d = /** @class */ (function () {
             pens: pens,
         });
     };
+    //对齐大屏
+    Meta2d.prototype.alignNodesV = function (align, pens) {
+        var e_9, _a;
+        if (pens === void 0) { pens = this.store.data.pens; }
+        var width = this.store.data.width || this.store.options.width;
+        var height = this.store.data.height || this.store.options.height;
+        var rect = {
+            x: 0,
+            y: 0,
+            width: width,
+            height: height,
+        };
+        var initPens = deepClone(pens); // 原 pens ，深拷贝一下
+        try {
+            for (var pens_2 = __values(pens), pens_2_1 = pens_2.next(); !pens_2_1.done; pens_2_1 = pens_2.next()) {
+                var item = pens_2_1.value;
+                this.alignPen(align, item, rect);
+            }
+        }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        finally {
+            try {
+                if (pens_2_1 && !pens_2_1.done && (_a = pens_2.return)) _a.call(pens_2);
+            }
+            finally { if (e_9) throw e_9.error; }
+        }
+        this.pushHistory({
+            type: EditType.Update,
+            initPens: initPens,
+            pens: pens,
+        });
+    };
     /**
      * 对齐画笔，基于第一个画笔
      * @param align 左对齐，右对齐，上对齐，下对齐，居中对齐
@@ -2949,7 +3010,7 @@ var Meta2d = /** @class */ (function () {
      * @param distance 总的宽 or 高
      */
     Meta2d.prototype.spaceBetweenByDirection = function (direction, pens, distance) {
-        var e_9, _a;
+        var e_10, _a;
         var _this = this;
         if (pens === void 0) { pens = this.store.data.pens; }
         !distance && (distance = this.getPenRect(this.getRect(pens))[direction]);
@@ -2975,20 +3036,20 @@ var Meta2d = /** @class */ (function () {
         var pen0Rect = this.getPenRect(pens[0]);
         var left = direction === 'width' ? pen0Rect.x : pen0Rect.y;
         try {
-            for (var pens_2 = __values(pens), pens_2_1 = pens_2.next(); !pens_2_1.done; pens_2_1 = pens_2.next()) {
-                var pen = pens_2_1.value;
+            for (var pens_3 = __values(pens), pens_3_1 = pens_3.next(); !pens_3_1.done; pens_3_1 = pens_3.next()) {
+                var pen = pens_3_1.value;
                 var penRect = this.getPenRect(pen);
                 direction === 'width' ? (penRect.x = left) : (penRect.y = left);
                 left += penRect[direction] + space;
                 this.setValue(__assign({ id: pen.id }, penRect), { render: false, doEvent: false });
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
-                if (pens_2_1 && !pens_2_1.done && (_a = pens_2.return)) _a.call(pens_2);
+                if (pens_3_1 && !pens_3_1.done && (_a = pens_3.return)) _a.call(pens_3);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         this.render();
         this.pushHistory({
@@ -3105,7 +3166,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens pen 置顶的画笔
      */
     Meta2d.prototype.top = function (pens) {
-        var e_10, _a;
+        var e_11, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -3133,12 +3194,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_3(pen);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
     };
     /**
@@ -3154,7 +3215,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens 画笔们，注意 pen 必须在该数组内才有效
      */
     Meta2d.prototype.bottom = function (pens) {
-        var e_11, _a;
+        var e_12, _a;
         if (!pens)
             pens = this.store.active;
         if (!Array.isArray(pens))
@@ -3185,12 +3246,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_4(pen);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
     };
     /**
@@ -3199,7 +3260,7 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.upByArea = function (pen) {
-        var _a, e_12, _b;
+        var _a, e_13, _b;
         var _this = this;
         var index = this.store.data.pens.findIndex(function (p) { return p.id === pen.id; });
         if (index === -1) {
@@ -3249,12 +3310,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_6(pen_2);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (allPens_1_1 && !allPens_1_1.done && (_b = allPens_1.return)) _b.call(allPens_1);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         this.initImageCanvas([pen]);
     };
@@ -3295,7 +3356,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens 画笔
      */
     Meta2d.prototype.up = function (pens) {
-        var e_13, _a;
+        var e_14, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -3348,12 +3409,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_7(pen);
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.error; }
         }
     };
     /**
@@ -3361,7 +3422,7 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.down = function (pens) {
-        var e_14, _a;
+        var e_15, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -3416,12 +3477,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_9(pen);
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
     };
     Meta2d.prototype.setLayer = function (pen, toIndex, pens) {
@@ -3463,6 +3524,10 @@ var Meta2d = /** @class */ (function () {
                 console.warn(node, 'node contain a error connectedLine');
                 return;
             }
+            if (lines.find(function (_line) { return _line.id === line.id; })) {
+                //去重
+                return;
+            }
             switch (type) {
                 case 'all':
                     lines.push(line);
@@ -3496,7 +3561,7 @@ var Meta2d = /** @class */ (function () {
             var nextNodes_1 = [];
             // 2. 遍历出线的 nextNode
             lines.forEach(function (line) {
-                var e_15, _a;
+                var e_16, _a;
                 var lineNextNode = _this.nextNode(line);
                 var _loop_11 = function (node) {
                     var have = nextNodes_1.find(function (next) { return next.id === node.id; });
@@ -3509,12 +3574,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_11(node);
                     }
                 }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                catch (e_16_1) { e_16 = { error: e_16_1 }; }
                 finally {
                     try {
                         if (lineNextNode_1_1 && !lineNextNode_1_1.done && (_a = lineNextNode_1.return)) _a.call(lineNextNode_1);
                     }
-                    finally { if (e_15) throw e_15.error; }
+                    finally { if (e_16) throw e_16.error; }
                 }
             });
             return nextNodes_1;
@@ -3537,7 +3602,7 @@ var Meta2d = /** @class */ (function () {
             var preNodes_1 = [];
             // 2. 遍历入线的 preNode
             lines.forEach(function (line) {
-                var e_16, _a;
+                var e_17, _a;
                 var linePreNode = _this.previousNode(line);
                 var _loop_12 = function (node) {
                     var have = preNodes_1.find(function (pre) { return pre.id === node.id; });
@@ -3550,12 +3615,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_12(node);
                     }
                 }
-                catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                catch (e_17_1) { e_17 = { error: e_17_1 }; }
                 finally {
                     try {
                         if (linePreNode_1_1 && !linePreNode_1_1.done && (_a = linePreNode_1.return)) _a.call(linePreNode_1);
                     }
-                    finally { if (e_16) throw e_16.error; }
+                    finally { if (e_17) throw e_17.error; }
                 }
             });
             return preNodes_1;
@@ -3831,7 +3896,7 @@ var Meta2d = /** @class */ (function () {
             : deepClone(__spreadArray([parent], __read(components), false));
     };
     Meta2d.prototype.setVisible = function (pen, visible, render) {
-        var e_17, _a;
+        var e_18, _a;
         if (render === void 0) { render = true; }
         this.onSizeUpdate();
         this.setValue({ id: pen.id, visible: visible }, { render: false, doEvent: false });
@@ -3843,12 +3908,12 @@ var Meta2d = /** @class */ (function () {
                     child && this.setVisible(child, visible, false);
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            catch (e_18_1) { e_18 = { error: e_18_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_17) throw e_17.error; }
+                finally { if (e_18) throw e_18.error; }
             }
         }
         render && this.render();