@meta2d/core 1.0.29 → 1.0.31

package/src/core.d.ts

@@ -341,6 +341,11 @@ export declare class Meta2d {
      * @param pens 本次改变的 pens
      */
     initImageCanvas(pens: Pen[]): void;
+    /**
+     * 模版图元图层改变
+     * @param pens 本次改变的 pens
+     */
+    initTemplateCanvas(pens: Pen[]): void;
     /**
      * 该画笔置底，即放到数组最前，最后绘制即在底部
      * @param pens 画笔们，注意 pen 必须在该数组内才有效

package/src/core.js

@@ -347,6 +347,21 @@ var Meta2d = /** @class */ (function () {
     });
     Meta2d.prototype.setOptions = function (opts) {
         if (opts === void 0) { opts = {}; }
+        if (opts.grid !== undefined ||
+            opts.gridColor !== undefined ||
+            opts.gridSize !== undefined) {
+            this.setGrid({
+                grid: opts.grid,
+                gridColor: opts.gridColor,
+                gridSize: opts.gridSize,
+            });
+        }
+        if (opts.rule !== undefined || opts.ruleColor !== undefined) {
+            this.setRule({
+                rule: opts.rule,
+                ruleColor: opts.ruleColor,
+            });
+        }
         this.store.options = Object.assign(this.store.options, opts);
         if (this.canvas && opts.scroll !== undefined) {
             if (opts.scroll) {
@@ -403,7 +418,7 @@ var Meta2d = /** @class */ (function () {
             // TODO: 若频繁地触发，重复 render 可能带来性能问题，待考虑
             var value = e.value;
             if (value && typeof value === 'object') {
-                var pens = e.params ? _this.find(e.params) : [pen];
+                var pens = e.params ? _this.find(e.params) : _this.find(pen.id);
                 pens.forEach(function (pen) {
                     if (value.hasOwnProperty('visible')) {
                         _this.setVisible(pen, value.visible);
@@ -786,11 +801,11 @@ var Meta2d = /** @class */ (function () {
                         width = this.store.data.width || this.store.options.width;
                         height = this.store.data.height || this.store.options.height;
                         if (width && height) {
-                            this.canvas.canvasImageBottom.canvas.style.backgroundImage = null;
+                            this.canvas.canvasTemplate.canvas.style.backgroundImage = null;
                             this.canvas && (this.canvas.canvasTemplate.bgPatchFlags = true);
                         }
                         else {
-                            this.canvas.canvasImageBottom.canvas.style.backgroundImage = url
+                            this.canvas.canvasTemplate.canvas.style.backgroundImage = url
                                 ? "url('" + url + "')"
                                 : '';
                         }
@@ -800,6 +815,12 @@ var Meta2d = /** @class */ (function () {
                         img = _a.sent();
                         // 用作 toPng 的绘制
                         this.store.bkImg = img;
+                        if (width && height) {
+                            if (this.canvas) {
+                                this.canvas.canvasTemplate.init();
+                                this.render();
+                            }
+                        }
                         return [3 /*break*/, 3];
                     case 2:
                         this.store.bkImg = null;
@@ -2937,15 +2958,36 @@ var Meta2d = /** @class */ (function () {
     };
     Meta2d.prototype.clearFormatPainter = function () {
         var _this = this;
-        var attrs = {};
+        var pens = this.store.active;
+        var initPens = deepClone(pens);
         formatAttrs.forEach(function (attr) {
-            attrs[attr] =
-                _this.store.options.defaultFormat[attr] ||
-                    _this.store.options[attr] ||
-                    undefined;
+            for (var i = 0; i < pens.length; i++) {
+                var pen = pens[i];
+                var _a = _this.store.options, fontSize = _a.fontSize, lineHeight = _a.lineHeight;
+                if (attr === 'lineWidth') {
+                    pen.lineWidth = 1;
+                    pen.calculative.lineWidth = 1;
+                }
+                else if (attr === 'fontSize') {
+                    pen.fontSize = fontSize;
+                    pen.calculative.fontSize = fontSize;
+                }
+                else if (attr === 'lineHeight') {
+                    pen.lineHeight = lineHeight;
+                    pen.calculative.lineHeight = lineHeight;
+                }
+                else {
+                    delete pen[attr];
+                    delete pen.calculative[attr];
+                }
+            }
+        });
+        this.render();
+        this.pushHistory({
+            type: EditType.Update,
+            initPens: initPens,
+            pens: pens,
         });
-        localStorage.setItem('meta2d-formatPainter', JSON.stringify(attrs));
-        this.formatPainter();
     };
     Meta2d.prototype.alignNodes = function (align, pens, rect) {
         var e_8, _a;
@@ -3256,6 +3298,7 @@ var Meta2d = /** @class */ (function () {
                 if (index > -1) {
                     _pens.push(_pens[index]);
                     _pens.splice(index, 1);
+                    _this.initTemplateCanvas([pen]);
                     _this.initImageCanvas([pen]);
                 }
                 _this.specificLayerMove(pen, 'top');
@@ -3284,6 +3327,13 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.initImageCanvas = function (pens) {
         this.canvas.initImageCanvas(pens);
     };
+    /**
+     * 模版图元图层改变
+     * @param pens 本次改变的 pens
+     */
+    Meta2d.prototype.initTemplateCanvas = function (pens) {
+        this.canvas.initTemplateCanvas(pens);
+    };
     /**
      * 该画笔置底，即放到数组最前，最后绘制即在底部
      * @param pens 画笔们，注意 pen 必须在该数组内才有效
@@ -3304,6 +3354,7 @@ var Meta2d = /** @class */ (function () {
                 if (index > -1) {
                     _pens.unshift(_pens[index]);
                     _pens.splice(index + 1, 1);
+                    this_2.initTemplateCanvas([pen_1]);
                     this_2.initImageCanvas([pen_1]);
                 }
                 this_2.specificLayerMove(pen_1, 'bottom');
@@ -3464,6 +3515,7 @@ var Meta2d = /** @class */ (function () {
                     _this.specificLayerMove(_pen, 'up');
                 });
                 _pens.splice.apply(_pens, __spreadArray([lastIndex_1 + 1, 0], __read(orderPens), false));
+                this_4.initTemplateCanvas(orderPens);
                 this_4.initImageCanvas(orderPens);
             }
             else {
@@ -3471,6 +3523,7 @@ var Meta2d = /** @class */ (function () {
                 if (index > -1 && index !== _pens.length - 1) {
                     _pens.splice(index + 2, 0, _pens[index]);
                     _pens.splice(index, 1);
+                    this_4.initTemplateCanvas([pen]);
                     this_4.initImageCanvas([pen]);
                 }
                 this_4.specificLayerMove(pen, 'up');
@@ -3532,6 +3585,7 @@ var Meta2d = /** @class */ (function () {
                     _this.specificLayerMove(_pen, 'down');
                 });
                 _pens.splice.apply(_pens, __spreadArray([firstIndex_1 - 1, 0], __read(orderPens), false));
+                this_5.initTemplateCanvas(orderPens);
                 this_5.initImageCanvas(orderPens);
             }
             else {
@@ -3539,6 +3593,7 @@ var Meta2d = /** @class */ (function () {
                 if (index > -1 && index !== 0) {
                     _pens.splice(index - 1, 0, _pens[index]);
                     _pens.splice(index + 1, 1);
+                    this_5.initTemplateCanvas([pen]);
                     this_5.initImageCanvas([pen]);
                 }
                 this_5.specificLayerMove(pen, 'down');