@leafer-ui/interface 1.10.0 → 1.10.1

package/package.json

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

package/src/IUI.ts

@@ -15,6 +15,7 @@ import { ILeafer } from './app/ILeafer'
 import { IEditorConfig } from './editor/IEditor'
 import { IColorString } from './type/IStringType'
 import { IScroller, IScrollConfig } from './IScroller'
+import { ILeafPaint } from './type/IComputedType'
 
 // Line
 export interface ILine extends ILineAttrData, IUI {
@@ -427,7 +428,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    drawImagePlaceholder(image: ILeaferImage, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    drawImagePlaceholder(image: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void

package/src/type/IComputedType.ts

@@ -1,7 +1,7 @@
 import { IBlendMode, IDirection, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
-import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters } from './IType'
+import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters, IPaint } from './IType'
 import { IPaintType } from './IType'
 import { IStrokeComputedStyle } from '../ICommonAttr'
 
@@ -12,18 +12,14 @@ export interface ILeafPaint {
     style?: ILeafPaintColor
     strokeStyle?: IStrokeComputedStyle // 子描边样式选项
     transform?: IMatrixData // 存在时表示pattern自身不能应用transform
-    blendMode?: IBlendMode
     image?: ILeaferImage
     level?: number
     loadId?: number
     patternId?: string
     patternTask?: ITaskItem
-    changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
-    sync?: boolean // 同步显示图片，不走任务列表生成图案
     isTransparent?: boolean // 是否为透明色
     data?: ILeafPaintPatternData
-    editing?: boolean // 标记编辑中
-    scaleFixed?: IScaleFixed // 平铺图片不跟随画布缩放
+    originPaint?: IPaint // 原始paint对象
 }
 
 export interface ILeafPaintPatternData {

package/src/type/IType.ts

@@ -20,6 +20,7 @@ export interface IPaintBase {
 
     style?: IStrokeStyle
     editing?: boolean // 标记编辑中
+    scaleFixed?: IScaleFixed // 不跟随画布缩放
 }
 
 export type IPaintType =
@@ -94,11 +95,10 @@ export interface IImagePaint extends IPaintBase {
 
     repeat?: IRepeat
     gap?: IGap | IPointGap
-    scaleFixed?: IScaleFixed // 平铺图片不跟随画布缩放
 
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
-    showProgress?: boolean // 是否显示进度
+    showProgress?: boolean | IColorString // 是否显示进度
 }
 
 export interface IStrokeImagePaint extends IImagePaint { }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed, IPathCommandData, IAxis, IAxisReverse, IDirection, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, IBounds, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData, IValue, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IScaleData as IScaleData$1, IBooleanMap, IFunction, IMatrixWithBoundsScaleData } from '@leafer/interface';
+import { IBlendMode, IScaleFixed, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IPathCommandData, IAxis, IAxisReverse, IDirection, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, IBounds, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData, IValue, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IScaleData as IScaleData$1, IBooleanMap, IFunction, IMatrixWithBoundsScaleData } from '@leafer/interface';
 export * from '@leafer/interface';
 import { IObject as IObject$1, IEditSize, IStroke as IStroke$1, IFourNumber as IFourNumber$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, IColorString as IColorString$1, IDirection4, ICursorType, IImageCursor, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IShortcutKeysCheck, IShortcutKeys, IUI as IUI$1, IPointData as IPointData$1, IScaleData, ISkewData, IGroup as IGroup$1, ISelectorProxy, IBox as IBox$1, ILayoutBoundsData, IKeyEvent, IUIEvent, IDragEvent, IMoveEvent, IZoomEvent, IRotateEvent, ITransition as ITransition$1, ILeafList, ILeafer as ILeafer$1, ILeaf, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
@@ -25,6 +25,7 @@ interface IPaintBase {
     opacity?: number;
     style?: IStrokeStyle;
     editing?: boolean;
+    scaleFixed?: IScaleFixed;
 }
 type IPaintType = 'image' | 'solid' | IGradientType;
 type IGradientType = 'linear' | 'radial' | 'angular';
@@ -74,10 +75,9 @@ interface IImagePaint extends IPaintBase {
     clipSize?: ISizeData;
     repeat?: IRepeat;
     gap?: IGap | IPointGap;
-    scaleFixed?: IScaleFixed;
     changeful?: boolean;
     sync?: boolean;
-    showProgress?: boolean;
+    showProgress?: boolean | IColorString;
 }
 interface IStrokeImagePaint extends IImagePaint {
 }
@@ -168,18 +168,14 @@ interface ILeafPaint {
     style?: ILeafPaintColor;
     strokeStyle?: IStrokeComputedStyle;
     transform?: IMatrixData;
-    blendMode?: IBlendMode;
     image?: ILeaferImage;
     level?: number;
     loadId?: number;
     patternId?: string;
     patternTask?: ITaskItem;
-    changeful?: boolean;
-    sync?: boolean;
     isTransparent?: boolean;
     data?: ILeafPaintPatternData;
-    editing?: boolean;
-    scaleFixed?: IScaleFixed;
+    originPaint?: IPaint;
 }
 interface ILeafPaintPatternData {
     scaleX?: number;
@@ -1025,7 +1021,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
-    drawImagePlaceholder(image: ILeaferImage, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    drawImagePlaceholder(image: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void;
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;