@leafer-ui/image 1.5.3 → 1.6.0

package/package.json

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

package/src/check.ts

@@ -1,47 +1,41 @@
-
 import { ILeaferCanvas } from '@leafer/interface'
-import { ImageManager, Platform } from '@leafer/core'
+import { ImageManager, Platform, ResizeEvent } from '@leafer/core'
 
-import { IUI, ILeafPaint } from '@leafer-ui/interface'
+import { IUI, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
 import { Export } from '@leafer-ui/draw'
 
 import { createPattern } from './pattern'
 
+
 const { abs } = Math
 
-export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
+export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowDraw?: boolean): boolean {
     const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld
-    const { pixelRatio } = canvas
+    const { pixelRatio } = canvas, { data } = paint
 
-    if (!paint.data || (paint.patternId === scaleX + '-' + scaleY + '-' + pixelRatio && !Export.running)) {
-        return false
+    if (!data || (paint.patternId === scaleX + '-' + scaleY + '-' + pixelRatio && !Export.running)) {
+        return false // 生成图案中
     } else {
 
-        const { data } = paint
-
-        if (allowPaint) {
-            if (!data.repeat) {
-                let { width, height } = data
-                width *= abs(scaleX) * pixelRatio
-                height *= abs(scaleY) * pixelRatio
-                if (data.scaleX) {
-                    width *= data.scaleX
-                    height *= data.scaleY
-                }
-                allowPaint = (width * height > Platform.image.maxCacheSize) || Export.running
+        if (allowDraw) {
+            if (data.repeat) {
+                allowDraw = false
             } else {
-                allowPaint = false
+                if (!(paint.changeful || ResizeEvent.isResizing(ui) || Export.running)) {
+                    let { width, height } = data
+                    width *= abs(scaleX) * pixelRatio
+                    height *= abs(scaleY) * pixelRatio
+                    if (data.scaleX) {
+                        width *= data.scaleX
+                        height *= data.scaleY
+                    }
+                    allowDraw = (width * height > Platform.image.maxCacheSize)
+                }
             }
         }
 
-        if (allowPaint) {
-            canvas.save()
-            ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip()
-            if (paint.blendMode) canvas.blendMode = paint.blendMode
-            if (data.opacity) canvas.opacity *= data.opacity
-            if (data.transform) canvas.transform(data.transform)
-            canvas.drawImage(paint.image.getFull(data.filters), 0, 0, data.width, data.height)
-            canvas.restore()
+        if (allowDraw) {
+            drawImage(ui, canvas, paint, data) // 直接绘制图像，不生成图案
             return true
         } else {
             if (!paint.style || paint.sync || Export.running) {
@@ -58,4 +52,15 @@ export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, al
             return false
         }
     }
+}
+
+
+function drawImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, data: ILeafPaintPatternData): void { // 后续可优化
+    canvas.save()
+    ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip()
+    if (paint.blendMode) canvas.blendMode = paint.blendMode
+    if (data.opacity) canvas.opacity *= data.opacity
+    if (data.transform) canvas.transform(data.transform)
+    canvas.drawImage(paint.image.getFull(data.filters), 0, 0, data.width, data.height)
+    canvas.restore()
 }

package/src/data.ts

@@ -12,8 +12,9 @@ const tempPoint = {} as IPointData
 const tempScaleData = {} as IScaleData
 
 export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
-    const { blendMode, sync } = paint
+    const { blendMode, changeful, sync } = paint
     if (blendMode) leafPaint.blendMode = blendMode
+    if (changeful) leafPaint.changeful = changeful
     if (sync) leafPaint.sync = sync
     leafPaint.data = getPatternData(paint, box, image)
 }

package/src/recycle.ts

@@ -5,15 +5,16 @@ import { IImagePaint, ILeafPaint, IPaintAttr, IUIData } from '@leafer-ui/interfa
 
 
 export function recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap {
-    const paints = (data as IObject)['_' + attrName] as ILeafPaint[]
+    const paints: ILeafPaint[] = (data as IObject)['_' + attrName]
 
     if (paints instanceof Array) {
 
-        let image: ILeaferImage, recycleMap: IBooleanMap, input: IImagePaint[], url: string
+        let paint: ILeafPaint, image: ILeaferImage, recycleMap: IBooleanMap, input: IImagePaint[], url: string
 
         for (let i = 0, len = paints.length; i < len; i++) {
 
-            image = paints[i].image
+            paint = paints[i]
+            image = paint.image
             url = image && image.url
 
             if (url) {
@@ -28,7 +29,7 @@ export function recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap {
                         if (!(input instanceof Array)) input = [input]
                     }
                     image.unload(paints[i].loadId, !input.some((item: IImagePaint) => item.url === url))
-                } else paints[i].style = null // fix: 小程序垃圾回收
+                }
             }
 
         }