@leafer-ui/node 1.5.1 → 1.5.3

package/dist/node.cjs

@@ -849,16 +849,20 @@ Object.assign(core.Creator, {
 core.Platform.layout = Layouter.fullLayout;
 
 function fillText(ui, canvas) {
-    let row;
-    const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
+    let row, data = ui.__.__textDrawData;
+    const { rows, decorationY } = data;
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i];
         if (row.text)
             canvas.fillText(row.text, row.x, row.y);
         else if (row.data)
             row.data.forEach(charData => { canvas.fillText(charData.char, charData.x, row.y); });
-        if (decorationY)
-            canvas.fillRect(row.x, row.y + decorationY, row.width, decorationHeight);
+    }
+    if (decorationY) {
+        const { decorationColor, decorationHeight } = data;
+        if (decorationColor)
+            canvas.fillStyle = decorationColor;
+        rows.forEach(row => decorationY.forEach(value => canvas.fillRect(row.x, row.y + value, row.width, decorationHeight)));
     }
 }
 
@@ -929,16 +933,18 @@ function drawAlignStroke(align, stroke, isStrokes, ui, canvas) {
     out.recycle(ui.__nowWorld);
 }
 function drawTextStroke(ui, canvas) {
-    let row;
-    const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
+    let row, data = ui.__.__textDrawData;
+    const { rows, decorationY } = data;
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i];
         if (row.text)
             canvas.strokeText(row.text, row.x, row.y);
         else if (row.data)
             row.data.forEach(charData => { canvas.strokeText(charData.char, charData.x, row.y); });
-        if (decorationY)
-            canvas.strokeRect(row.x, row.y + decorationY, row.width, decorationHeight);
+    }
+    if (decorationY) {
+        const { decorationHeight } = data;
+        rows.forEach(row => decorationY.forEach(value => canvas.strokeRect(row.x, row.y + value, row.width, decorationHeight)));
     }
 }
 function drawStrokesStyle(strokes, isText, ui, canvas) {
@@ -1504,6 +1510,8 @@ function recycleImage(attrName, data) {
                     }
                     image.unload(paints[i].loadId, !input.some((item) => item.url === url));
                 }
+                else
+                    paints[i].style = null;
             }
         }
         return recycleMap;
@@ -2236,14 +2244,25 @@ function toTextChar(row) {
 }
 
 function decorationText(drawData, style) {
-    const { fontSize } = style;
+    let type;
+    const { fontSize, textDecoration } = style;
     drawData.decorationHeight = fontSize / 11;
-    switch (style.textDecoration) {
+    if (typeof textDecoration === 'object') {
+        type = textDecoration.type;
+        if (textDecoration.color)
+            drawData.decorationColor = draw.ColorConvert.string(textDecoration.color);
+    }
+    else
+        type = textDecoration;
+    switch (type) {
         case 'under':
-            drawData.decorationY = fontSize * 0.15;
+            drawData.decorationY = [fontSize * 0.15];
             break;
         case 'delete':
-            drawData.decorationY = -fontSize * 0.35;
+            drawData.decorationY = [-fontSize * 0.35];
+            break;
+        case 'under-delete':
+            drawData.decorationY = [fontSize * 0.15, -fontSize * 0.35];
     }
 }