@leafer-ui/image 1.12.3 → 2.0.0

package/package.json

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

package/src/check.ts

@@ -7,9 +7,9 @@ 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, originPaint } = paint, { exporting } = renderOptions
+    const { image, data, originPaint } = paint, { exporting, snapshot } = renderOptions
 
-    if (!data || (paint.patternId === scaleX + '-' + scaleY && !exporting)) {
+    if (!data || (paint.patternId === scaleX + '-' + scaleY && !exporting) || snapshot) {
         return false // 生成图案中
     } else {
 

package/src/data.ts

@@ -1,5 +1,5 @@
 import { IBoundsData, IGap, ILeaferImage, IPointData, IPointGap, IScaleData } from '@leafer/interface'
-import { MatrixHelper, MathHelper, Bounds, AlignHelper, BoundsHelper, PointHelper, isObject, isString } from '@leafer/core'
+import { MatrixHelper, MathHelper, Bounds, AlignHelper, BoundsHelper, PointHelper, isObject, isString, isNumber } from '@leafer/core'
 
 import { IImagePaint, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
 import { PaintImage } from "@leafer-ui/draw"
@@ -19,7 +19,7 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
     if (paint.mode === 'strench' as string) paint.mode = 'stretch' // 兼容代码，后续可移除
 
     const { width, height } = image
-    const { opacity, mode, align, offset, scale, size, rotation, skew, clipSize, repeat, gap, filters } = paint
+    const { opacity, mode, align, offset, scale, size, rotation, skew, clipSize, repeat, gap, filters, interlace } = paint
     const sameBox = box.width === width && box.height === height
 
     const data: ILeafPaintPatternData = { mode }
@@ -89,6 +89,7 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
     if (opacity && opacity < 1) data.opacity = opacity
     if (filters) data.filters = filters
     if (repeat) data.repeat = isString(repeat) ? (repeat === 'x' ? 'repeat-x' : 'repeat-y') : 'repeat'
+    if (interlace) data.interlace = (isNumber(interlace) || interlace.type === 'percent') ? { type: 'x', offset: interlace } : interlace
     return data
 }
 

package/src/image.ts

@@ -66,7 +66,7 @@ export function image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds:
                 onLoadError(ui, event, error)
                 leafPaint.loadId = undefined
             },
-            paint.lod && image.getThumbSize()
+            paint.lod && image.getThumbSize(paint.lod)
         )
 
         if (ui.placeholderColor) {

package/src/pattern.ts

@@ -49,7 +49,7 @@ export function createPattern(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas,
                 scale(imageMatrix, 1 / scaleX, 1 / scaleY)
             }
 
-            const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth)
+            const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace)
             const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || 'no-repeat'), imageMatrix, paint)
 
             paint.style = pattern