@meta2d/core 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "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

@@ -237,10 +237,6 @@ var Canvas = /** @class */ (function () {
             }
             e.preventDefault();
             e.stopPropagation();
-            if (_this.store.options.scroll && !e.ctrlKey && !e.metaKey && _this.scroll) {
-                _this.scroll.wheel(e.deltaY < 0);
-                return;
-            }
             if (_this.store.options.disableScale) {
                 return;
             }
@@ -250,6 +246,29 @@ var Canvas = /** @class */ (function () {
                 return;
             if (_this.store.data.locked === LockState.DisableMoveScale)
                 return;
+            //禁止触摸屏双指缩放操作
+            if (_this.store.options.disableTouchPadScale &&
+                e.ctrlKey &&
+                e.deltaY !== 0) {
+                return;
+            }
+            //window触控板只允许平移 触摸屏一般不超过100
+            var isWin = navigator.userAgent.indexOf('Win') !== -1;
+            if (isWin && !e.ctrlKey && Math.abs(e.deltaY) < 100) {
+                _this.translate(-e.deltaX, -e.deltaY);
+                return;
+            }
+            //mac触控板只允许平移（排除普通鼠标的情况）
+            var isMac = /macintosh|mac os x/i.test(navigator.userAgent) ||
+                navigator.platform.indexOf('Mac') !== -1;
+            if (isMac && !e.ctrlKey && e.wheelDeltaY % 240 !== 0) {
+                _this.translate(-e.deltaX, -e.deltaY);
+                return;
+            }
+            if (_this.store.options.scroll && !e.ctrlKey && !e.metaKey && _this.scroll) {
+                _this.scroll.wheel(e.deltaY < 0);
+                return;
+            }
             // 触摸板平移
             var isTouchPad = !(!e.deltaX && e.deltaY);
             var now = performance.now();
@@ -542,6 +561,20 @@ var Canvas = /** @class */ (function () {
                     _this.store.options.disableAnchor = !_this.store.options.disableAnchor;
                     _this.store.emitter.emit('disableAnchor', _this.store.options.disableAnchor);
                     break;
+                case '=':
+                    if (e.ctrlKey || e.metaKey) {
+                        _this.scale(_this.store.data.scale + 0.1);
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                    break;
+                case '-':
+                    if (e.ctrlKey || e.metaKey) {
+                        _this.scale(_this.store.data.scale - 0.1);
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                    break;
             }
             _this.render(false);
         };
@@ -779,7 +812,7 @@ var Canvas = /** @class */ (function () {
             }
             //shift 快捷添加锚点并连线
             if (!_this.store.options.autoAnchor && !_this.drawingLine) {
-                if (e.shiftKey) {
+                if (e.shiftKey && !e.ctrlKey) {
                     _this.setAnchor(_this.store.pointAt);
                     _this.drawingLineName = _this.store.options.drawingLineName;
                     var anchor = _this.store.activeAnchor;
@@ -2310,21 +2343,26 @@ var Canvas = /** @class */ (function () {
                     : pen.textHeight * font_scale) + "px;";
             }
             else {
-                var tem = pen.height / scale - (pen.textTop || 0);
+                var tem = pen.calculative.worldRect.height / scale - (pen.textTop || 0);
                 if (tem < 0) {
                     tem = 0;
                 }
                 style += "height:" + (pen.fontSize * scale < 12 ? tem * font_scale : tem * scale * font_scale) + "px;";
             }
+            var _textWidth = null;
             if (pen.textWidth) {
+                _textWidth =
+                    (pen.textWidth < 1 && pen.textWidth) > -1
+                        ? pen.textWidth * pen.calculative.worldRect.width
+                        : pen.textWidth;
                 if (pen.whiteSpace !== 'pre-line') {
-                    if (pen.textWidth < pen.fontSize) {
+                    if (_textWidth < pen.fontSize) {
                         style += "width:" + pen.fontSize * 1.2 * font_scale + "px;";
                     }
                     else {
                         style += "width:" + (scale > 1
-                            ? pen.textWidth * font_scale * scale
-                            : pen.textWidth * font_scale) + "px;";
+                            ? _textWidth * font_scale * scale
+                            : _textWidth * font_scale) + "px;";
                     }
                 }
             }
@@ -2357,8 +2395,10 @@ var Canvas = /** @class */ (function () {
             }
             if (pen.whiteSpace !== 'nowrap') {
                 var textWidth = pen.fontSize * 1.2 * pen.text.length;
-                var contentWidth = (pen.textWidth || pen.width / scale) *
-                    Math.floor(pen.height / scale / (pen.lineHeight * pen.fontSize));
+                var contentWidth = (_textWidth || pen.calculative.worldRect.width / scale) *
+                    Math.floor(pen.calculative.worldRect.height /
+                        scale /
+                        (pen.lineHeight * pen.fontSize));
                 if (textWidth > contentWidth) {
                     style += 'justify-content: start;';
                 }
@@ -3484,13 +3524,11 @@ var Canvas = /** @class */ (function () {
         var _this = this;
         var before = this.store.histories[this.store.historyIndex];
         if (before && before.type === EditType.Add) {
+            var pens_6 = [];
             before.pens.forEach(function (pen) {
-                if (!pen.calculative) {
-                    return;
-                }
-                pen.calculative.canvas = _this;
+                pens_6.push(_this.store.pens[pen.id]);
             });
-            this.active(before.pens);
+            this.active(pens_6);
         }
     };
     Canvas.prototype.doEditAction = function (action, undo) {
@@ -4005,6 +4043,22 @@ var Canvas = /** @class */ (function () {
             });
         }
         pen.type && this.initLineRect(pen);
+        if (pen.calculative.gradientTimer) {
+            clearTimeout(pen.calculative.gradientTimer);
+        }
+        pen.calculative.gradientTimer = setTimeout(function () {
+            if (pen.calculative.lineGradient) {
+                pen.calculative.lineGradient = null;
+            }
+            if (pen.calculative.gradient) {
+                pen.calculative.gradient = null;
+            }
+            if (pen.calculative.radialGradient) {
+                pen.calculative.radialGradient = null;
+            }
+            _this.patchFlags = true;
+            pen.calculative.gradientTimer = undefined;
+        }, 50);
     };
     Canvas.prototype.translate = function (x, y) {
         if (x === void 0) { x = 0; }
@@ -4253,6 +4307,7 @@ var Canvas = /** @class */ (function () {
         }, 200);
     };
     Canvas.prototype.movePens = function (e) {
+        var _a, _b;
         if (!this.activeRect || this.store.data.locked) {
             return;
         }
@@ -4262,9 +4317,8 @@ var Canvas = /** @class */ (function () {
         }
         if (!this.store.options.moveConnectedLine &&
             this.store.active.length === 1 &&
-            (this.store.active[0].anchors[0].connectTo ||
-                this.store.active[0].anchors[this.store.active[0].anchors.length - 1]
-                    .connectTo)) {
+            (((_a = this.store.active[0].anchors[0]) === null || _a === void 0 ? void 0 : _a.connectTo) ||
+                ((_b = this.store.active[0].anchors[this.store.active[0].anchors.length - 1]) === null || _b === void 0 ? void 0 : _b.connectTo))) {
             return;
         }
         if (!this.movingPens) {
@@ -4288,7 +4342,7 @@ var Canvas = /** @class */ (function () {
             this.clearDock();
             var moveDock = this.customMoveDock || calcMoveDock;
             this.dock = moveDock(this.store, rect, this.movingPens, offset);
-            var _a = this.dock, xDock = _a.xDock, yDock = _a.yDock;
+            var _c = this.dock, xDock = _c.xDock, yDock = _c.yDock;
             var dockPen = void 0;
             if (xDock) {
                 offset.x += xDock.step;
@@ -4341,11 +4395,12 @@ var Canvas = /** @class */ (function () {
      */
     Canvas.prototype.initMovingPens = function () {
         var _this = this;
+        var _a, _b;
         if (!this.store.options.moveConnectedLine) {
             for (var i = 0; i < this.store.active.length; i++) {
                 var pen = this.store.active[i];
-                if (pen.anchors[0].connectTo ||
-                    pen.anchors[pen.anchors.length - 1].connectTo) {
+                if (((_a = pen.anchors[0]) === null || _a === void 0 ? void 0 : _a.connectTo) ||
+                    ((_b = pen.anchors[pen.anchors.length - 1]) === null || _b === void 0 ? void 0 : _b.connectTo)) {
                     this.store.active.splice(i, 1);
                     pen.calculative.active = undefined;
                     --i;
@@ -4377,7 +4432,7 @@ var Canvas = /** @class */ (function () {
     };
     Canvas.prototype.moveLineAnchor = function (pt, keyOptions) {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!this.activeRect || this.store.data.locked) {
             return;
         }
@@ -4389,7 +4444,7 @@ var Canvas = /** @class */ (function () {
             disconnectLine(pen, getAnchor(pen, this.store.activeAnchor.anchorId), this.store.pens[this.store.activeAnchor.penId], this.store.activeAnchor);
         }
         var anchorId = this.store.activeAnchor.id;
-        var connectedLine = (_b = this.store.pens[this.store.activeAnchor.penId].connectedLines) === null || _b === void 0 ? void 0 : _b.filter(function (item) { return item.anchor === anchorId; });
+        var connectedLine = (_c = (_b = this.store.pens[this.store.activeAnchor.penId]) === null || _b === void 0 ? void 0 : _b.connectedLines) === null || _c === void 0 ? void 0 : _c.filter(function (item) { return item.anchor === anchorId; });
         if (connectedLine && connectedLine.length > 0) {
             connectedLine.forEach(function (connected) {
                 var pen = _this.store.pens[connected.lineId];
@@ -4415,7 +4470,7 @@ var Canvas = /** @class */ (function () {
                 to.prev = undefined;
                 // 重新自动计算连线
                 if (line.lineName !== 'polyline') {
-                    (_c = this[line.lineName]) === null || _c === void 0 ? void 0 : _c.call(this, this.store, line);
+                    (_d = this[line.lineName]) === null || _d === void 0 ? void 0 : _d.call(this, this.store, line);
                 }
             }
         }
@@ -4638,7 +4693,7 @@ var Canvas = /** @class */ (function () {
             return;
         }
         var initPens = !doing && deepClone(pens, true);
-        translateRect(this.activeRect, x, y);
+        this.activeRect && translateRect(this.activeRect, x, y);
         var containChildPens = this.getAllByPens(pens);
         pens.forEach(function (pen) {
             var _a, _b;
@@ -4677,7 +4732,7 @@ var Canvas = /** @class */ (function () {
             _this.updateLines(pen);
             (_b = pen.onMove) === null || _b === void 0 ? void 0 : _b.call(pen, pen);
         });
-        this.getSizeCPs();
+        this.activeRect && this.getSizeCPs();
         this.render();
         this.tooltip.translate(x, y);
         if (!doing) {
@@ -5213,15 +5268,15 @@ var Canvas = /** @class */ (function () {
         var e_20, _a;
         var retPens = [];
         try {
-            for (var pens_6 = __values(pens), pens_6_1 = pens_6.next(); !pens_6_1.done; pens_6_1 = pens_6.next()) {
-                var pen = pens_6_1.value;
+            for (var pens_7 = __values(pens), pens_7_1 = pens_7.next(); !pens_7_1.done; pens_7_1 = pens_7.next()) {
+                var pen = pens_7_1.value;
                 retPens.push.apply(retPens, __spreadArray([], __read(deepClone(getAllChildren(pen, this.store), true)), false));
             }
         }
         catch (e_20_1) { e_20 = { error: e_20_1 }; }
         finally {
             try {
-                if (pens_6_1 && !pens_6_1.done && (_a = pens_6.return)) _a.call(pens_6);
+                if (pens_7_1 && !pens_7_1.done && (_a = pens_7.return)) _a.call(pens_7);
             }
             finally { if (e_20) throw e_20.error; }
         }