@leafer-ui/paint 1.6.1 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/paint",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "@leafer-ui/paint",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.6.1",
-    "@leafer-ui/draw": "1.6.1"
+    "@leafer/core": "1.6.2",
+    "@leafer-ui/draw": "1.6.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.1",
-    "@leafer-ui/interface": "1.6.1"
+    "@leafer/interface": "1.6.2",
+    "@leafer-ui/interface": "1.6.2"
   }
 }

package/src/Fill.ts

@@ -8,46 +8,52 @@ import { fillText } from './FillText'
 
 export function fill(fill: string, ui: IUI, canvas: ILeaferCanvas): void {
     canvas.fillStyle = fill
-    ui.__.__font ? fillText(ui, canvas) : (ui.__.windingRule ? canvas.fill(ui.__.windingRule) : canvas.fill())
+    fillPathOrText(ui, canvas)
 }
 
 
 export function fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void {
     let item: ILeafPaint
-    const { windingRule, __font } = ui.__
     for (let i = 0, len = fills.length; i < len; i++) {
         item = fills[i]
 
-        if (item.image && PaintImage.checkImage(ui, canvas, item, !__font)) continue
+        if (item.image) {
 
-        if (item.style) {
+            if (PaintImage.checkImage(ui, canvas, item, !ui.__.__font)) continue
 
-            canvas.fillStyle = item.style
+            if (!item.style) {
+                if (!i && item.image.isPlacehold) ui.drawImagePlaceholder(canvas, item.image) // 图片加载中或加载失败
+                continue
+            }
 
-            if (item.transform) {
-                canvas.save()
+        }
 
-                canvas.transform(item.transform)
+        canvas.fillStyle = item.style
 
-                if (item.blendMode) canvas.blendMode = item.blendMode
+        if (item.transform) {
 
-                __font ? fillText(ui, canvas) : (windingRule ? canvas.fill(windingRule) : canvas.fill())
+            canvas.save()
+            canvas.transform(item.transform)
+            if (item.blendMode) canvas.blendMode = item.blendMode
+            fillPathOrText(ui, canvas)
+            canvas.restore()
 
-                canvas.restore()
-            } else {
-                if (item.blendMode) {
-                    canvas.saveBlendMode(item.blendMode)
+        } else {
 
-                    __font ? fillText(ui, canvas) : (windingRule ? canvas.fill(windingRule) : canvas.fill())
+            if (item.blendMode) {
 
-                    canvas.restoreBlendMode()
-                } else {
+                canvas.saveBlendMode(item.blendMode)
+                fillPathOrText(ui, canvas)
+                canvas.restoreBlendMode()
 
-                    __font ? fillText(ui, canvas) : (windingRule ? canvas.fill(windingRule) : canvas.fill())
+            } else fillPathOrText(ui, canvas)
 
-                }
-            }
         }
 
     }
+}
+
+
+export function fillPathOrText(ui: IUI, canvas: ILeaferCanvas): void {
+    ui.__.__font ? fillText(ui, canvas) : (ui.__.windingRule ? canvas.fill(ui.__.windingRule) : canvas.fill())
 }

package/src/FillText.ts

@@ -1,12 +1,14 @@
 import { ILeaferCanvas } from '@leafer/interface'
 
-import { IUI, ITextRowData } from '@leafer-ui/interface'
+import { ITextRowData, IText } from '@leafer-ui/interface'
 
 
-export function fillText(ui: IUI, canvas: ILeaferCanvas): void {
+export function fillText(ui: IText, canvas: ILeaferCanvas): void {
 
-    let row: ITextRowData, data = ui.__.__textDrawData
-    const { rows, decorationY } = data
+    const data = ui.__, { rows, decorationY } = data.__textDrawData
+    if (data.__isPlacehold && data.placeholderColor) canvas.fillStyle = data.placeholderColor
+
+    let row: ITextRowData
 
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i]
@@ -16,7 +18,7 @@ export function fillText(ui: IUI, canvas: ILeaferCanvas): void {
     }
 
     if (decorationY) {
-        const { decorationColor, decorationHeight } = data
+        const { decorationColor, decorationHeight } = data.__textDrawData
         if (decorationColor) canvas.fillStyle = decorationColor
         rows.forEach(row => decorationY.forEach(value => canvas.fillRect(row.x, row.y + value, row.width, decorationHeight)))
     }

package/src/index.ts

@@ -1,6 +1,6 @@
 import { IPaintModule } from '@leafer-ui/interface'
 
-import { fill, fills } from './Fill'
+import { fill, fills, fillPathOrText } from './Fill'
 import { fillText } from './FillText'
 import { stroke, strokes } from './Stroke'
 import { strokeText, drawTextStroke } from './StrokeText'
@@ -12,6 +12,7 @@ export const PaintModule: IPaintModule = {
     compute,
     fill,
     fills,
+    fillPathOrText,
     fillText,
     stroke,
     strokes,