@meta2d/core 1.0.31 → 1.0.33

package/src/core.d.ts

@@ -54,7 +54,7 @@ export declare class Meta2d {
     initEventFns(): void;
     navigatorTo(id: string): void;
     doSendDataEvent(value: any, topics?: string): void;
-    sendDataToNetWork(value: any, network: Network): Promise<void>;
+    sendDataToNetWork(value: any, _network: Network): Promise<void>;
     resize(width?: number, height?: number): void;
     /**
      *
@@ -63,7 +63,7 @@ export declare class Meta2d {
     addPen(pen: Pen, history?: boolean, emit?: boolean): Promise<Pen>;
     addPens(pens: Pen[], history?: boolean): Promise<Pen[]>;
     render(patchFlags?: boolean | number): void;
-    setBackgroundImage(url: string): Promise<void>;
+    setBackgroundImage(url: string, data?: any): Promise<void>;
     setBackgroundColor(color?: string): void;
     setGrid({ grid, gridColor, gridSize, gridRotate, }?: {
         grid?: boolean;
@@ -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);
             }
         }
     };
@@ -651,12 +678,13 @@ var Meta2d = /** @class */ (function () {
         }
         this.store.emitter.emit('sendData', data);
     };
-    Meta2d.prototype.sendDataToNetWork = function (value, network) {
+    Meta2d.prototype.sendDataToNetWork = function (value, _network) {
         return __awaiter(this, void 0, void 0, function () {
-            var i, keys, params, res, clients_1, mqttClient_1, websockets, websocket_1;
+            var network, i, keys, params, res, clients_1, mqttClient_1, websockets, websocket_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        network = deepClone(_network);
                         if (!network.url) {
                             return [2 /*return*/];
                         }
@@ -770,7 +798,8 @@ var Meta2d = /** @class */ (function () {
         var _a;
         (_a = this.canvas) === null || _a === void 0 ? void 0 : _a.render(patchFlags);
     };
-    Meta2d.prototype.setBackgroundImage = function (url) {
+    Meta2d.prototype.setBackgroundImage = function (url, data) {
+        var _a, _b, _c, _e;
         return __awaiter(this, void 0, void 0, function () {
             function loadImage(url) {
                 return __awaiter(this, void 0, void 0, function () {
@@ -793,13 +822,13 @@ var Meta2d = /** @class */ (function () {
                 });
             }
             var that, width, height, img;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         that = this;
                         this.store.data.bkImage = url;
-                        width = this.store.data.width || this.store.options.width;
-                        height = this.store.data.height || this.store.options.height;
+                        width = (data === null || data === void 0 ? void 0 : data.width) || ((_a = this.store.data) === null || _a === void 0 ? void 0 : _a.width) || ((_b = this.store.options) === null || _b === void 0 ? void 0 : _b.width);
+                        height = (data === null || data === void 0 ? void 0 : data.height) || ((_c = this.store.data) === null || _c === void 0 ? void 0 : _c.height) || ((_e = this.store.options) === null || _e === void 0 ? void 0 : _e.height);
                         if (width && height) {
                             this.canvas.canvasTemplate.canvas.style.backgroundImage = null;
                             this.canvas && (this.canvas.canvasTemplate.bgPatchFlags = true);
@@ -812,7 +841,7 @@ var Meta2d = /** @class */ (function () {
                         if (!url) return [3 /*break*/, 2];
                         return [4 /*yield*/, loadImage(url)];
                     case 1:
-                        img = _a.sent();
+                        img = _f.sent();
                         // 用作 toPng 的绘制
                         this.store.bkImg = img;
                         if (width && height) {
@@ -824,7 +853,7 @@ var Meta2d = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 2:
                         this.store.bkImg = null;
-                        _a.label = 3;
+                        _f.label = 3;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -858,7 +887,7 @@ var Meta2d = /** @class */ (function () {
         this.clear(false, data.template);
         this.canvas.autoPolylineFlag = true;
         if (data) {
-            this.setBackgroundImage(data.bkImage);
+            this.setBackgroundImage(data.bkImage, data);
             Object.assign(this.store.data, data);
             this.store.data.pens = [];
             try {
@@ -2064,11 +2093,12 @@ var Meta2d = /** @class */ (function () {
                 _this.store.data.pens.forEach(function (pen) {
                     _this.penMock(pen);
                 });
-            https.forEach(function (item) { return __awaiter(_this, void 0, void 0, function () {
-                var i, keys, i, keys, res, data;
+            https.forEach(function (_item) { return __awaiter(_this, void 0, void 0, function () {
+                var item, i, keys, i, keys, res, data;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            item = deepClone(_item);
                             if (!item.url) return [3 /*break*/, 3];
                             if (typeof item.headers === 'object') {
                                 for (i in item.headers) {
@@ -2492,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);
@@ -2504,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;
@@ -2527,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);