@meta2d/core 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
     "main": "index.js",
     "types": "index.d.ts",

package/src/canvas/canvas.js

@@ -2513,17 +2513,22 @@ var Canvas = /** @class */ (function () {
             _this.store.emitter.emit('valueUpdate', pen);
         };
         this.canvasImageBottom = new CanvasImage(parentElement, store, true);
+        this.canvasImageBottom.canvas.style.zIndex = '1';
         parentElement.appendChild(this.canvas);
         this.canvas.style.position = 'absolute';
         this.canvas.style.backgroundRepeat = 'no-repeat';
         this.canvas.style.backgroundSize = '100% 100%';
+        this.canvas.style.zIndex = '2';
         this.canvasImage = new CanvasImage(parentElement, store);
+        this.canvasImage.canvas.style.zIndex = '3';
         this.magnifierCanvas = new MagnifierCanvas(this, parentElement, store);
+        this.magnifierCanvas.canvas.style.zIndex = '4';
         this.externalElements.style.position = 'absolute';
         this.externalElements.style.left = '0';
         this.externalElements.style.top = '0';
         this.externalElements.style.outline = 'none';
         this.externalElements.style.background = 'transparent';
+        this.externalElements.style.zIndex = '4';
         parentElement.style.position = 'relative';
         parentElement.appendChild(this.externalElements);
         this.createInput();
@@ -2743,6 +2748,7 @@ var Canvas = /** @class */ (function () {
                             img.onerror = function (e) {
                                 reject(e);
                             };
+                            img.crossOrigin = 'anonymous';
                             img.src = url;
                         })];
                 }
@@ -5225,7 +5231,8 @@ var Canvas = /** @class */ (function () {
     });
     Canvas.prototype.copy = function (pens) {
         return __awaiter(this, void 0, void 0, function () {
-            var page, _a, origin, scale, clipboard, _b;
+            var page, _a, origin, scale, copyPens, clipboard, _b;
+            var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -5234,9 +5241,20 @@ var Canvas = /** @class */ (function () {
                         this.store.clipboard = undefined;
                         localStorage.removeItem(this.clipboardName);
                         sessionStorage.setItem('page', page);
+                        copyPens = this.getAllByPens(deepClone(pens || this.store.active, true));
+                        //根据pens顺序复制
+                        copyPens.forEach(function (activePen) {
+                            activePen.copyIndex = _this.store.data.pens.findIndex(function (pen) { return pen.id === activePen.id; });
+                        });
+                        copyPens.sort(function (a, b) {
+                            return a.copyIndex - b.copyIndex;
+                        });
+                        copyPens.forEach(function (activePen) {
+                            delete activePen.copyIndex;
+                        });
                         clipboard = {
                             meta2d: true,
-                            pens: this.getAllByPens(deepClone(pens || this.store.active, true)),
+                            pens: copyPens,
                             origin: deepClone(origin),
                             scale: scale,
                             page: page,