@leafer-ui/paint 1.10.0 → 1.10.1

package/package.json

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

package/src/Compute.ts

@@ -32,61 +32,66 @@ export function compute(attrName: IPaintAttr, ui: IUI): void {
     (data as IObject)['_' + attrName] = leafPaints.length ? leafPaints : undefined
 
     if (leafPaints.length) {
+
         if (leafPaints.every(item => item.isTransparent)) {
             if (leafPaints.some(item => item.image)) isAlphaPixel = true
             isTransparent = true
         }
-    }
 
-    if (attrName === 'fill') {
-        stintSet(data, '__isAlphaPixelFill', isAlphaPixel)
-        stintSet(data, '__isTransparentFill', isTransparent)
+        if (attrName === 'fill') {
+            stintSet(data, '__isAlphaPixelFill', isAlphaPixel)
+            stintSet(data, '__isTransparentFill', isTransparent)
+        } else {
+            stintSet(data, '__isAlphaPixelStroke', isAlphaPixel)
+            stintSet(data, '__isTransparentStroke', isTransparent)
+            stintSet(data, '__hasMultiStrokeStyle', maxChildStrokeWidth)
+        }
+
     } else {
-        stintSet(data, '__isAlphaPixelStroke', isAlphaPixel)
-        stintSet(data, '__isTransparentStroke', isTransparent)
-        stintSet(data, '__hasMultiStrokeStyle', maxChildStrokeWidth)
+        data.__removePaint(attrName, false)
     }
+
 }
 
 
 function getLeafPaint(attrName: string, paint: IPaint, ui: IUI): ILeafPaint {
     if (!isObject(paint) || paint.visible === false || paint.opacity === 0) return undefined
 
-    let data: ILeafPaint
+    let leafPaint: ILeafPaint
     const { boxBounds } = ui.__layout
 
     switch (paint.type) {
         case 'image':
-            data = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url])
+            leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url])
             break
         case 'linear':
-            data = PaintGradient.linearGradient(paint, boxBounds)
+            leafPaint = PaintGradient.linearGradient(paint, boxBounds)
             break
         case 'radial':
-            data = PaintGradient.radialGradient(paint, boxBounds)
+            leafPaint = PaintGradient.radialGradient(paint, boxBounds)
             break
         case 'angular':
-            data = PaintGradient.conicGradient(paint, boxBounds)
+            leafPaint = PaintGradient.conicGradient(paint, boxBounds)
             break
         case 'solid':
             const { type, color, opacity } = paint
-            data = { type, style: ColorConvert.string(color, opacity) }
+            leafPaint = { type, style: ColorConvert.string(color, opacity) }
             break
         default:
-            if (!isUndefined((paint as IRGB).r)) data = { type: 'solid', style: ColorConvert.string(paint) }
+            if (!isUndefined((paint as IRGB).r)) leafPaint = { type: 'solid', style: ColorConvert.string(paint) }
     }
 
-    if (data) {
+    if (leafPaint) {
+        // 原始paint
+        leafPaint.originPaint = paint
+
         // 描边样式
-        if (isString(data.style) && hasTransparent(data.style)) data.isTransparent = true
+        if (isString(leafPaint.style) && hasTransparent(leafPaint.style)) leafPaint.isTransparent = true
         if (paint.style) {
             if (paint.style.strokeWidth === 0) return undefined
-            data.strokeStyle = paint.style as IStrokeComputedStyle
+            leafPaint.strokeStyle = paint.style as IStrokeComputedStyle
         }
-
-        if (paint.editing) data.editing = paint.editing
-        if (paint.blendMode) data.blendMode = paint.blendMode
     }
 
-    return data
+    return leafPaint
 }

package/src/Fill.ts

@@ -1,6 +1,6 @@
 import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
 
-import { ILeafPaint, IUI } from '@leafer-ui/interface'
+import { IImagePaint, ILeafPaint, IUI } from '@leafer-ui/interface'
 import { PaintImage, Paint } from "@leafer-ui/draw"
 
 
@@ -11,16 +11,18 @@ export function fill(fill: string, ui: IUI, canvas: ILeaferCanvas, renderOptions
 
 
 export function fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void {
-    let item: ILeafPaint
+    let item: ILeafPaint, originPaint: IImagePaint, countImage: number
     for (let i = 0, len = fills.length; i < len; i++) {
-        item = fills[i]
+        item = fills[i], originPaint = item.originPaint as IImagePaint
 
         if (item.image) {
 
+            countImage ? countImage++ : countImage = 1
+
             if (PaintImage.checkImage(item, !ui.__.__font, ui, canvas, renderOptions)) continue
 
             if (!item.style) {
-                if (!i && item.image.isPlacehold) ui.drawImagePlaceholder(item.image, canvas, renderOptions) // 图片加载中或加载失败
+                if (countImage === 1 && item.image.isPlacehold) ui.drawImagePlaceholder(item, canvas, renderOptions) // 图片加载中或加载失败
                 continue
             }
 
@@ -28,23 +30,23 @@ export function fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, rende
 
         canvas.fillStyle = item.style
 
-        if (item.transform || item.scaleFixed) {
+        if (item.transform || originPaint.scaleFixed) {
 
             canvas.save()
             if (item.transform) canvas.transform(item.transform)
-            if (item.scaleFixed) {
+            if (originPaint.scaleFixed) {
                 const { scaleX, scaleY } = ui.getRenderScaleData(true)
-                if (item.scaleFixed === true || (item.scaleFixed === 'zoom-in' && scaleX > 1 && scaleY > 1)) canvas.scale(1 / scaleX, 1 / scaleY)
+                if (originPaint.scaleFixed === true || (originPaint.scaleFixed === 'zoom-in' && scaleX > 1 && scaleY > 1)) canvas.scale(1 / scaleX, 1 / scaleY)
             }
-            if (item.blendMode) canvas.blendMode = item.blendMode
+            if (originPaint.blendMode) canvas.blendMode = originPaint.blendMode
             fillPathOrText(ui, canvas, renderOptions)
             canvas.restore()
 
         } else {
 
-            if (item.blendMode) {
+            if (originPaint.blendMode) {
 
-                canvas.saveBlendMode(item.blendMode)
+                canvas.saveBlendMode(originPaint.blendMode)
                 fillPathOrText(ui, canvas, renderOptions)
                 canvas.restoreBlendMode()
 

package/src/StrokeText.ts

@@ -79,8 +79,8 @@ export function drawStrokesStyle(strokes: ILeafStrokePaint[], strokeWidthScale:
                 strokeStyle ? canvas.setStroke(item.style, data.__getRealStrokeWidth(strokeStyle) * strokeWidthScale, data, strokeStyle) : canvas.setStroke(item.style, data.__strokeWidth * strokeWidthScale, data)
             } else canvas.strokeStyle = item.style
 
-            if (item.blendMode) {
-                canvas.saveBlendMode(item.blendMode)
+            if (item.originPaint.blendMode) {
+                canvas.saveBlendMode(item.originPaint.blendMode)
                 isText ? Paint.drawTextStroke(ui, canvas, renderOptions) : canvas.stroke()
                 canvas.restoreBlendMode()
             } else {