@meta2d/core 1.1.13 → 1.1.14

package/package.json

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

@@ -3,7 +3,7 @@ import { addLineAnchor, calcIconRect, calcTextRect, calcWorldAnchors, calcWorldR
 import { calcRotate, distance, getDistance, hitPoint, PointType, PrevNextType, rotatePoint, samePoint, scalePoint, translatePoint, TwoWay, } from '../point';
 import { calcCenter, calcRightBottom, calcRelativePoint, getRect, getRectOfPoints, pointInRect, pointInSimpleRect, rectInRect, rectToPoints, resizeRect, translateRect, pointInPolygon } from '../rect';
 import { EditType, globalStore, } from '../store';
-import { deepClone, fileToBase64, uploadFile, formatPadding, rgba, s8, } from '../utils';
+import { deepClone, fileToBase64, uploadFile, formatPadding, rgba, s8, toNumber, } from '../utils';
 import { inheritanceProps, defaultCursors, defaultDrawLineFns, HotkeyType, HoverType, MouseRight, rotatedCursors, } from '../data';
 import { createOffscreen } from './offscreen';
 import { curve, mind, getLineLength, getLineRect, pointInLine, simplify, smoothLine, lineSegment, getLineR, lineInRect, } from '../diagrams';
@@ -3914,6 +3914,16 @@ export class Canvas {
                 }
             }
         }
+        if (this.drawingLine.lineName === 'polyline' &&
+            !to.connectTo &&
+            this.drawingLine.calculative.worldAnchors.length > 2) {
+            //拐出一点
+            let toLast = this.drawingLine.calculative.worldAnchors[this.drawingLine.calculative.worldAnchors.length - 2];
+            if (Math.abs(toLast.x - to.x) / this.store.data.scale < 5 &&
+                Math.abs(toLast.y - to.y) / this.store.data.scale < 5) {
+                this.drawingLine.calculative.worldAnchors.pop();
+            }
+        }
         const rect = getLineRect(this.drawingLine);
         Object.assign(this.drawingLine, rect);
         this.drawingLine.calculative.worldRect = rect;
@@ -4271,7 +4281,7 @@ export class Canvas {
             });
         }
         pen.type && this.initLineRect(pen);
-        if (pen.gradientColors || pen.lineGradientColors) {
+        if ((pen.bkType && pen.gradientColors) || (pen.strokeType && pen.lineGradientColors)) {
             if (pen.calculative.gradientTimer) {
                 clearTimeout(pen.calculative.gradientTimer);
             }
@@ -4313,7 +4323,13 @@ export class Canvas {
             }
         });
         this.store.styles = {};
-        const themeObj = le5leTheme.getThemeObj(this.store.data.theme);
+        let defaultTheme = '';
+        const width = this.store.data.width || this.store.options.width;
+        const height = this.store.data.height || this.store.options.height;
+        if (!width && !height) {
+            defaultTheme = 'default'; // 认为2d 默认没有主题
+        }
+        const themeObj = le5leTheme.getThemeObj(this.store.data.theme || defaultTheme);
         Object.assign(this.store.styles, options, data, theme, themeObj);
     }
     render = (patchFlags) => {
@@ -7018,7 +7034,7 @@ export class Canvas {
             const pen = this.store.pens[this.inputDiv.dataset.penId];
             if (pen && pen.inputType === 'number') {
                 const value = e.target.innerText;
-                const numericValue = value.replace(/[^0-9]/g, ''); // 移除非数字字符
+                const numericValue = toNumber(value); // 移除非数字字符
                 // 如果输入的值不是纯数字，则替换为纯数字
                 if (value !== numericValue) {
                     e.preventDefault();