@meta2d/core 1.0.51 → 1.0.52

package/src/core.d.ts

@@ -156,7 +156,7 @@ export declare class Meta2d {
      * @param pens 组合的画笔们
      * @param showChild 组合后展示第几个孩子
      */
-    combine(pens?: Pen[], showChild?: number): void;
+    combine(pens?: Pen[], showChild?: number): any;
     uncombine(pen?: Pen): void;
     appendChild(pens?: Pen[]): void;
     isCombine(pen: Pen): boolean;
@@ -260,8 +260,8 @@ export declare class Meta2d {
     pushChildren(parent: Pen, children: Pen[]): void;
     renderPenRaw: typeof renderPenRaw;
     toPng(padding?: Padding, callback?: BlobCallback, containBkImg?: boolean, maxWidth?: number): string;
-    activeToPng(padding?: Padding): string;
-    pensToPng(pens?: Pen[], padding?: Padding): string;
+    activeToPng(padding?: Padding, maxWidth?: number): string;
+    pensToPng(pens?: Pen[], padding?: Padding, maxWidth?: number): string;
     /**
      * 下载 png
      * @param name 传入参数自带文件后缀名 例如：'test.png'

package/src/core.js

@@ -861,7 +861,7 @@ var Meta2d = /** @class */ (function () {
                             value[key] = _pen[key];
                         }
                     }
-                    value.id = _pen.id;
+                    // value.id = _pen.id;
                     if (_pen.deviceId) {
                         value.deviceId = _pen.deviceId;
                     }
@@ -939,7 +939,8 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.sendDataToNetWork = function (value, pen, e) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var network, i, keys, params, res, data, fnJs, clients_1, mqttClient_1, websockets, websocket_1;
+            var network, i, keys, params, url_1, keys, res, data, fnJs, clients_1, mqttClient_1, websockets, websocket_1;
+            var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -954,13 +955,16 @@ var Meta2d = /** @class */ (function () {
                         if (!(network.protocol === 'http')) return [3 /*break*/, 5];
                         if (typeof network.headers === 'object') {
                             for (i in network.headers) {
-                                keys = network.headers[i].match(/(?<=\$\{).*?(?=\})/g);
-                                if (keys) {
-                                    network.headers[i] = network.headers[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                if (typeof network.headers[i] === 'string') {
+                                    keys = network.headers[i].match(/(?<=\$\{).*?(?=\})/g);
+                                    if (keys) {
+                                        network.headers[i] = network.headers[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                    }
                                 }
                             }
                         }
                         params = undefined;
+                        url_1 = network.url;
                         if (network.method === 'GET') {
                             params =
                                 '?' +
@@ -968,7 +972,17 @@ var Meta2d = /** @class */ (function () {
                                         .map(function (key) { return key + '=' + value[key]; })
                                         .join('&');
                         }
-                        return [4 /*yield*/, fetch(network.url + (params ? params : ''), {
+                        if (network.method === 'POST') {
+                            if (url_1.indexOf('${') > -1) {
+                                keys = url_1.match(/(?<=\$\{).*?(?=\})/g);
+                                if (keys) {
+                                    keys.forEach(function (key) {
+                                        url_1 = url_1.replace("${" + key + "}", getter(pen, key) || _this.getDynamicParam(key));
+                                    });
+                                }
+                            }
+                        }
+                        return [4 /*yield*/, fetch(url_1 + (params ? params : ''), {
                                 headers: network.headers || {},
                                 method: network.method,
                                 body: network.method === 'POST' ? JSON.stringify(value) : undefined,
@@ -1864,6 +1878,7 @@ var Meta2d = /** @class */ (function () {
         }
         this.store.emitter.emit('combine', [parent]);
         this.render();
+        return parent;
     };
     Meta2d.prototype.uncombine = function (pen) {
         var _this = this;
@@ -3090,12 +3105,12 @@ var Meta2d = /** @class */ (function () {
         if (containBkImg === void 0) { containBkImg = false; }
         return this.canvas.toPng(padding, callback, containBkImg, maxWidth);
     };
-    Meta2d.prototype.activeToPng = function (padding) {
-        return this.canvas.activeToPng(padding);
+    Meta2d.prototype.activeToPng = function (padding, maxWidth) {
+        return this.canvas.activeToPng(padding, maxWidth);
     };
-    Meta2d.prototype.pensToPng = function (pens, padding) {
+    Meta2d.prototype.pensToPng = function (pens, padding, maxWidth) {
         if (pens === void 0) { pens = this.store.active; }
-        return this.canvas.pensToPng(pens, padding);
+        return this.canvas.pensToPng(pens, padding, maxWidth);
     };
     /**
      * 下载 png