@meta2d/core 1.0.32 → 1.0.33

package/src/core.d.ts

@@ -232,14 +232,14 @@ export declare class Meta2d {
     judgeCondition(pen: Pen, key: string, condition: TriggerCondition): boolean;
     pushChildren(parent: Pen, children: Pen[]): void;
     renderPenRaw: typeof renderPenRaw;
-    toPng(padding?: Padding, callback?: BlobCallback, containBkImg?: boolean): string;
+    toPng(padding?: Padding, callback?: BlobCallback, containBkImg?: boolean, maxWidth?: number): string;
     activeToPng(padding?: Padding): string;
     /**
      * 下载 png
      * @param name 传入参数自带文件后缀名 例如：'test.png'
      * @param padding 上右下左的内边距
      */
-    downloadPng(name?: string, padding?: Padding): void;
+    downloadPng(name?: string, padding?: Padding, maxWidth?: number): void;
     downloadSvg(): void;
     getRect(pens?: Pen[]): Rect;
     hiddenTemplate(): void;

package/src/core.js

@@ -97,6 +97,7 @@ import { lockedError } from './utils/error';
 import { Scroll } from './scroll';
 import { getter } from './utils/object';
 import { queryURLParams } from './utils/url';
+import { HotkeyType } from './data';
 var Meta2d = /** @class */ (function () {
     function Meta2d(parent, opts) {
         var _this = this;
@@ -186,11 +187,32 @@ var Meta2d = /** @class */ (function () {
             (_a = pen.events) === null || _a === void 0 ? void 0 : _a.forEach(function (event) {
                 var _a;
                 if (event.actions && event.actions.length) {
-                    event.actions.forEach(function (action) {
-                        if (_this.events[action.action] && event.name === eventName) {
-                            _this.events[action.action](pen, action);
+                    if (event.name === eventName) {
+                        //条件成立
+                        var flag = false;
+                        if (event.conditions && event.conditions.length) {
+                            if (event.conditionType === 'and') {
+                                flag = event.conditions.every(function (condition) {
+                                    return _this.judgeCondition(pen, condition.key, condition);
+                                });
+                            }
+                            else if (event.conditionType === 'or') {
+                                flag = event.conditions.some(function (condition) {
+                                    return _this.judgeCondition(pen, condition.key, condition);
+                                });
+                            }
                         }
-                    });
+                        else {
+                            flag = true;
+                        }
+                        if (flag) {
+                            event.actions.forEach(function (action) {
+                                if (_this.events[action.action]) {
+                                    _this.events[action.action](pen, action);
+                                }
+                            });
+                        }
+                    }
                 }
                 else {
                     if (_this.events[event.action] && event.name === eventName) {
@@ -362,6 +384,11 @@ var Meta2d = /** @class */ (function () {
                 ruleColor: opts.ruleColor,
             });
         }
+        if (opts.resizeMode !== undefined) {
+            if (!opts.resizeMode) {
+                this.canvas.hotkeyType = HotkeyType.None;
+            }
+        }
         this.store.options = Object.assign(this.store.options, opts);
         if (this.canvas && opts.scroll !== undefined) {
             if (opts.scroll) {
@@ -623,7 +650,7 @@ var Meta2d = /** @class */ (function () {
                 window.location.href = arr[0] + 'id=' + id;
             }
             else {
-                window.location.href = arr[0] + 'id=' + id + arr[1].slice(idx + 1);
+                window.location.href = arr[0] + 'id=' + id + arr[1].slice(idx);
             }
         }
     };
@@ -2495,9 +2522,9 @@ var Meta2d = /** @class */ (function () {
             step: step,
         });
     };
-    Meta2d.prototype.toPng = function (padding, callback, containBkImg) {
+    Meta2d.prototype.toPng = function (padding, callback, containBkImg, maxWidth) {
         if (containBkImg === void 0) { containBkImg = false; }
-        return this.canvas.toPng(padding, callback, containBkImg);
+        return this.canvas.toPng(padding, callback, containBkImg, maxWidth);
     };
     Meta2d.prototype.activeToPng = function (padding) {
         return this.canvas.activeToPng(padding);
@@ -2507,7 +2534,7 @@ var Meta2d = /** @class */ (function () {
      * @param name 传入参数自带文件后缀名 例如：'test.png'
      * @param padding 上右下左的内边距
      */
-    Meta2d.prototype.downloadPng = function (name, padding) {
+    Meta2d.prototype.downloadPng = function (name, padding, maxWidth) {
         var e_6, _a;
         var _this = this;
         var _b;
@@ -2530,7 +2557,7 @@ var Meta2d = /** @class */ (function () {
         setTimeout(function () {
             var a = document.createElement('a');
             a.setAttribute('download', (name || _this.store.data.name || 'le5le.meta2d') + '.png');
-            a.setAttribute('href', _this.toPng(padding, undefined, true));
+            a.setAttribute('href', _this.toPng(padding, undefined, true, maxWidth));
             var evt = document.createEvent('MouseEvents');
             evt.initEvent('click', true, true);
             a.dispatchEvent(evt);