@leafer-ui/interface 1.12.4 → 2.0.1

package/package.json

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

package/src/IUI.ts

@@ -9,7 +9,7 @@ import {
     ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData,
     IStrokeComputedStyle
 } from './ICommonAttr'
-import { IOverflow } from './type/IType'
+import { IFill, IOverflow } from './type/IType'
 import { IAnimation, IAnimate, IKeyframe, IKeyframeId, IAnimateType } from './IAnimation'
 import { ILeafer } from './app/ILeafer'
 import { IEditorConfig } from './editor/IEditor'
@@ -309,6 +309,8 @@ export interface IImage extends IImageAttrData, IRect {
 }
 interface IImageAttrData {
     url?: string
+    foreground?: IFill
+    background?: IFill
 }
 export interface IImageData extends IImageAttrData, IRectData {
     __setImageFill(value: string): void
@@ -571,6 +573,7 @@ export type IUITag =
     | 'Robot'
     | 'GIF'
     | 'Video'
+    | (string & {})
 
 
 export interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IBoxInputData, IFrameInputData, IFlowInputData, IArrowInputData, IGIFInputData, IVideoInputData, IRobotInputData, IUIBaseInputData, IObject {

package/src/type/IComputedType.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, IDirection, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
+import { IBlendMode, IDirection, IInterlace, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters, IPaint } from './IType'
@@ -36,6 +36,7 @@ export interface ILeafPaintPatternData {
     filters?: IImageFilters
     mode?: IImagePaintMode
     repeat?: 'repeat' | 'repeat-x' | 'repeat-y'
+    interlace?: IInterlace
 }
 
 export type ILeafFill = ILeafPaint

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed, IDirection, IImageLOD } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IInterlace, IFilter, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed, IDirection, IImageLOD, IPercentData } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 import { IStrokeStyle } from '../ICommonAttr'
 
@@ -66,6 +66,7 @@ export interface IStrokeGradientPaint extends IGradientPaint { }
 export interface IColorStop {
     offset: number
     color: IColor
+    selected?: boolean
 }
 
 // ---
@@ -96,7 +97,7 @@ export interface IImagePaint extends IPaintBase {
 
     repeat?: IRepeat
     gap?: IGap | IPointGap
-    interlace?: number | IInterlace // 平铺图案交错排列
+    interlace?: number | IPercentData | IInterlace  // 平铺图案交错排列
 
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
@@ -115,10 +116,6 @@ export interface IImageFilters {
 }
 export type IImagePaintMode = 'normal' | 'cover' | 'fit' | 'stretch' | 'clip' | 'repeat'
 export type IRepeat = boolean | 'x' | 'y' | IPointData
-export interface IInterlace {
-    type: IAxis
-    offset: number
-}
 
 // 描边
 export type IStrokeAlign = 'inside' | 'outside' | 'center'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, IScaleFixed, IAlign, IUnitPointData, IImageLOD, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IAxis, IPathCommandData, 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, IAround, 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, IImageLOD, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IPercentData, IInterlace, IPathCommandData, IAxis, IAxisReverse, IDirection, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IBounds, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData, IValue, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, IAround, 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';
 
@@ -57,6 +57,7 @@ interface IStrokeGradientPaint extends IGradientPaint {
 interface IColorStop {
     offset: number;
     color: IColor;
+    selected?: boolean;
 }
 interface IImagePaint extends IPaintBase {
     type: "image";
@@ -76,7 +77,7 @@ interface IImagePaint extends IPaintBase {
     clipSize?: ISizeData;
     repeat?: IRepeat;
     gap?: IGap | IPointGap;
-    interlace?: number | IInterlace;
+    interlace?: number | IPercentData | IInterlace;
     changeful?: boolean;
     sync?: boolean;
     showProgress?: boolean | IColorString;
@@ -94,10 +95,6 @@ interface IImageFilters {
 }
 type IImagePaintMode = 'normal' | 'cover' | 'fit' | 'stretch' | 'clip' | 'repeat';
 type IRepeat = boolean | 'x' | 'y' | IPointData;
-interface IInterlace {
-    type: IAxis;
-    offset: number;
-}
 type IStrokeAlign = 'inside' | 'outside' | 'center';
 type IStrokeCap = 'none' | 'round' | 'square';
 type IStrokeJoin = 'bevel' | 'round' | 'miter';
@@ -194,6 +191,7 @@ interface ILeafPaintPatternData {
     filters?: IImageFilters;
     mode?: IImagePaintMode;
     repeat?: 'repeat' | 'repeat-x' | 'repeat-y';
+    interlace?: IInterlace;
 }
 type ILeafFill = ILeafPaint;
 interface ILeafStrokePaint extends ILeafPaint {
@@ -939,6 +937,8 @@ interface IImage extends IImageAttrData, IRect {
 }
 interface IImageAttrData {
     url?: string;
+    foreground?: IFill;
+    background?: IFill;
 }
 interface IImageData extends IImageAttrData, IRectData {
     __setImageFill(value: string): void;
@@ -1115,7 +1115,7 @@ interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderCompute
 interface IUIBaseInputData extends IUIAttrData, IFillInputData, IStrokeInputData, ITextStyleInputData, ICornerRadiusInputData, IEffectInputData, ILeafInputData {
     children?: IUIInputData[];
 }
-type IUITag = 'App' | 'Leafer' | 'Rect' | 'Ellipse' | 'Polygon' | 'Star' | 'Line' | 'Path' | 'Pen' | 'Text' | 'Image' | 'Canvas' | 'Group' | 'Frame' | 'Box' | 'Arrow' | 'Robot' | 'GIF' | 'Video';
+type IUITag = 'App' | 'Leafer' | 'Rect' | 'Ellipse' | 'Polygon' | 'Star' | 'Line' | 'Path' | 'Pen' | 'Text' | 'Image' | 'Canvas' | 'Group' | 'Frame' | 'Box' | 'Arrow' | 'Robot' | 'GIF' | 'Video' | (string & {});
 interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IBoxInputData, IFrameInputData, IFlowInputData, IArrowInputData, IGIFInputData, IVideoInputData, IRobotInputData, IUIBaseInputData, IObject {
     children?: IUIInputData[];
 }