@leafer-ui/image 1.10.0 → 1.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/image",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "@leafer-ui/image",
   "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/check.ts

@@ -1,13 +1,13 @@
 import { ILeaferCanvas, IRenderOptions, IScaleData } from '@leafer/interface'
 import { Platform, ResizeEvent } from '@leafer/core'
 
-import { IUI, ILeafPaint } from '@leafer-ui/interface'
+import { IUI, ILeafPaint, IImagePaint } from '@leafer-ui/interface'
 import { PaintImage } from "@leafer-ui/draw"
 
 
 export function checkImage(paint: ILeafPaint, drawImage: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): boolean {
     const { scaleX, scaleY } = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions)
-    const { image, data } = paint, { exporting } = renderOptions
+    const { image, data, originPaint } = paint, { exporting } = renderOptions
 
     if (!data || (paint.patternId === scaleX + '-' + scaleY && !exporting)) {
         return false // 生成图案中
@@ -16,7 +16,7 @@ export function checkImage(paint: ILeafPaint, drawImage: boolean, ui: IUI, canva
         if (drawImage) {
             if (data.repeat) {
                 drawImage = false
-            } else if (!(paint.changeful || (Platform.name === 'miniapp' && ResizeEvent.isResizing(ui)) || exporting)) { //  小程序resize过程中直接绘制原图（绕过垃圾回收bug)
+            } else if (!((originPaint as IImagePaint).changeful || (Platform.name === 'miniapp' && ResizeEvent.isResizing(ui)) || exporting)) { //  小程序resize过程中直接绘制原图（绕过垃圾回收bug)
                 drawImage = Platform.image.isLarge(image, scaleX, scaleY)
             }
         }
@@ -29,7 +29,7 @@ export function checkImage(paint: ILeafPaint, drawImage: boolean, ui: IUI, canva
             PaintImage.drawImage(paint, scaleX, scaleY, ui, canvas, renderOptions) // 直接绘制图像，不生成图案
             return true
         } else {
-            if (!paint.style || paint.sync || exporting) PaintImage.createPattern(paint, ui, canvas, renderOptions)
+            if (!paint.style || (originPaint as IImagePaint).sync || exporting) PaintImage.createPattern(paint, ui, canvas, renderOptions)
             else PaintImage.createPatternTask(paint, ui, canvas, renderOptions)
             return false
         }
@@ -37,10 +37,10 @@ export function checkImage(paint: ILeafPaint, drawImage: boolean, ui: IUI, canva
 }
 
 export function drawImage(paint: ILeafPaint, _imageScaleX: number, _imageScaleY: number, ui: IUI, canvas: ILeaferCanvas, _renderOptions: IRenderOptions): void {
-    const { data, image, blendMode } = paint, { opacity, transform } = data, view = image.getFull(data.filters), u = ui.__
+    const { data, image } = paint, { blendMode } = paint.originPaint as IImagePaint, { opacity, transform } = data, view = image.getFull(data.filters), u = ui.__
     let { width, height } = image, clipUI: any
 
-    if ((transform && !transform.onlyScale) || (clipUI = u.path || u.cornerRadius) || opacity || blendMode) {
+    if ((clipUI = (transform && !transform.onlyScale) || u.path || u.cornerRadius) || opacity || blendMode) {
         canvas.save()
         clipUI && canvas.clipUI(ui)
         blendMode && (canvas.blendMode = blendMode)
@@ -56,7 +56,7 @@ export function drawImage(paint: ILeafPaint, _imageScaleX: number, _imageScaleY:
 }
 
 export function getImageRenderScaleData(paint: ILeafPaint, ui: IUI, canvas?: ILeaferCanvas, _renderOptions?: IRenderOptions): IScaleData {
-    const scaleData = ui.getRenderScaleData(true, paint.scaleFixed), { data } = paint
+    const scaleData = ui.getRenderScaleData(true, paint.originPaint.scaleFixed), { data } = paint
     if (canvas) {
         const { pixelRatio } = canvas
         scaleData.scaleX *= pixelRatio

package/src/data.ts

@@ -11,10 +11,6 @@ const tempScaleData = {} as IScaleData
 const tempImage = {} as IBoundsData
 
 export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
-    const { changeful, sync, scaleFixed } = paint
-    if (changeful) leafPaint.changeful = changeful
-    if (sync) leafPaint.sync = sync
-    if (scaleFixed) leafPaint.scaleFixed = scaleFixed
     leafPaint.data = PaintImage.getPatternData(paint, box, image)
 }