@leafer-ui/interface 1.4.1 → 1.5.0

package/package.json

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

package/src/IUI.ts

@@ -376,10 +376,6 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     animation?: IAnimation | IAnimation[]
     animationOut?: IAnimation | IAnimation[]
 
-    editConfig?: IEditorConfig
-    editOuter: string
-    editInner: string
-
     children?: IUI[]
 
     __animate?: IAnimate
@@ -413,6 +409,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void
 
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>
+    syncExport(filename: string, options?: IExportOptions | number | boolean): IExportResult
     clone(data?: IUIInputData): IUI
 }
 
@@ -446,6 +443,10 @@ interface IUIAttrData {
     selectedStyle?: IStateStyle
     disabledStyle?: IStateStyle
     placeholderStyle?: IStateStyle
+
+    editConfig?: IEditorConfig
+    editOuter?: string
+    editInner?: string
 }
 
 export interface IFindUIMethod {

package/src/editor/IEditor.ts

@@ -1,4 +1,4 @@
-import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4 } from '@leafer-ui/interface'
+import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4, IPointData, ILayoutBoundsData } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy {
     config: IEditorConfig
@@ -14,13 +14,13 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     readonly editing: boolean
     innerEditing: boolean
     readonly groupOpening: boolean
-    resizeDirection?: number
 
     readonly multiple: boolean
     readonly single: boolean
 
     readonly dragging: boolean
     readonly moving: boolean
+    readonly dragPoint: IEditPoint // 正在拖拽的控制点
 
     element?: IUI
     buttons: IGroup
@@ -105,9 +105,11 @@ export interface IEditorConfig extends IObject {
     rotateGap?: number
 
     selector?: boolean
+    editBox?: boolean
     hover?: boolean
     hoverStyle?: IUIInputData
     select?: 'press' | 'tap'
+    selectedStyle?: IUIInputData
     boxSelect?: boolean
     continuousSelect?: boolean // 点击可以连续选择
     openInner?: 'double' | 'long' // 双击/长按打开内部
@@ -131,7 +133,7 @@ export interface IEditPoint extends IBox {
     pointType: IEditPointType
 }
 
-export type IEditPointType = 'rotate' | 'resize' | 'button'
+export type IEditPointType = 'rotate' | 'resize' | 'resize-rotate' | 'button'
 
 export interface IEditBoxBase extends IGroup {
     editor: IEditorBase
@@ -149,13 +151,16 @@ export interface IEditBoxBase extends IGroup {
     rotatePoints: IEditPoint[]
     resizeLines: IEditPoint[]
 
+    enterPoint: IEditPoint
+    dragPoint: IEditPoint // 正在拖拽的控制点
+
+    dragStartData: IEditorDragStartData
+
     readonly flipped: boolean
     readonly flippedX: boolean
     readonly flippedY: boolean
     readonly flippedOne: boolean
 
-    enterPoint: IEditPoint
-
     getPointStyle(userStyle?: IBoxInputData): IBoxInputData
     getPointsStyle(): IBoxInputData[]
     getMiddlePointsStyle(): IBoxInputData[]
@@ -168,6 +173,14 @@ export interface IEditBoxBase extends IGroup {
 
 }
 
+export interface IEditorDragStartData {
+    x: number
+    y: number
+    point: IPointData
+    bounds: ILayoutBoundsData
+    rotation: number
+}
+
 export interface IEditorConfigFunction {
     (ui: any): IEditorConfig
 }

package/src/index.ts

@@ -50,4 +50,4 @@ export { IEffectModule } from './module/IEffect'
 export { IFilterModule, IFilterProcessor, IFilterFunction } from './module/IFilter'
 export { ICachedShape } from './ICachedShape'
 
-export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorConfigFunction } from './editor/IEditor'
+export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction } from './editor/IEditor'

package/src/module/IExport.ts

@@ -4,4 +4,5 @@ import { ILeaf, IExportFileType, IExportOptions, IExportResult } from '@leafer/i
 export interface IExportModule {
     running?: boolean
     export(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>
+    syncExport(leaf: ILeaf, filename: string, options?: IExportOptions | number | boolean): IExportResult
 }

package/src/type/IType.ts

@@ -77,6 +77,8 @@ export interface IImagePaint extends IPaintBase {
     rotation?: number
 
     repeat?: IRepeat
+
+    changeful?: boolean // 会频繁变化 url（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
 }
 export interface IImageFilters {

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData as IBoundsData$1, IPathCreator, IJSONOptions, IValue, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround, IMatrixWithBoundsScaleData } from '@leafer/interface';
 export * from '@leafer/interface';
-import { IObject as IObject$1, IEditSize, IStroke as IStroke$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, IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent, ILeaf, IDragEvent, IZoomEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
+import { IObject as IObject$1, IEditSize, IStroke as IStroke$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, IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IBox as IBox$1, IRect as IRect$1, IPointData as IPointData$1, ILayoutBoundsData, IBoundsData, IKeyEvent, ILeaf, IDragEvent, IZoomEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
 type IPercent = string;
 type IColorString = string;
@@ -63,6 +63,7 @@ interface IImagePaint extends IPaintBase {
     scale?: number | IPointData;
     rotation?: number;
     repeat?: IRepeat;
+    changeful?: boolean;
     sync?: boolean;
 }
 interface IImageFilters {
@@ -387,11 +388,11 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     readonly editing: boolean;
     innerEditing: boolean;
     readonly groupOpening: boolean;
-    resizeDirection?: number;
     readonly multiple: boolean;
     readonly single: boolean;
     readonly dragging: boolean;
     readonly moving: boolean;
+    readonly dragPoint: IEditPoint;
     element?: IUI$1;
     buttons: IGroup$1;
     selector: IGroup$1;
@@ -454,9 +455,11 @@ interface IEditorConfig extends IObject$1 {
     lockRatio?: boolean | 'corner';
     rotateGap?: number;
     selector?: boolean;
+    editBox?: boolean;
     hover?: boolean;
     hoverStyle?: IUIInputData$1;
     select?: 'press' | 'tap';
+    selectedStyle?: IUIInputData$1;
     boxSelect?: boolean;
     continuousSelect?: boolean;
     openInner?: 'double' | 'long';
@@ -476,7 +479,7 @@ interface IEditPoint extends IBox$1 {
     direction: number;
     pointType: IEditPointType;
 }
-type IEditPointType = 'rotate' | 'resize' | 'button';
+type IEditPointType = 'rotate' | 'resize' | 'resize-rotate' | 'button';
 interface IEditBoxBase extends IGroup$1 {
     editor: IEditorBase;
     dragging: boolean;
@@ -488,11 +491,13 @@ interface IEditBoxBase extends IGroup$1 {
     resizePoints: IEditPoint[];
     rotatePoints: IEditPoint[];
     resizeLines: IEditPoint[];
+    enterPoint: IEditPoint;
+    dragPoint: IEditPoint;
+    dragStartData: IEditorDragStartData;
     readonly flipped: boolean;
     readonly flippedX: boolean;
     readonly flippedY: boolean;
     readonly flippedOne: boolean;
-    enterPoint: IEditPoint;
     getPointStyle(userStyle?: IBoxInputData$1): IBoxInputData$1;
     getPointsStyle(): IBoxInputData$1[];
     getMiddlePointsStyle(): IBoxInputData$1[];
@@ -501,6 +506,13 @@ interface IEditBoxBase extends IGroup$1 {
     unload(): void;
     onArrow(e: IKeyEvent): void;
 }
+interface IEditorDragStartData {
+    x: number;
+    y: number;
+    point: IPointData$1;
+    bounds: ILayoutBoundsData;
+    rotation: number;
+}
 interface IEditorConfigFunction {
     (ui: any): IEditorConfig;
 }
@@ -806,9 +818,6 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __proxyData?: IUIInputData;
     animation?: IAnimation | IAnimation[];
     animationOut?: IAnimation | IAnimation[];
-    editConfig?: IEditorConfig;
-    editOuter: string;
-    editInner: string;
     children?: IUI[];
     __animate?: IAnimate;
     readonly pen: IPathCreator;
@@ -831,6 +840,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     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>;
+    syncExport(filename: string, options?: IExportOptions | number | boolean): IExportResult;
     clone(data?: IUIInputData): IUI;
 }
 interface IStateStyle extends IUIInputData {
@@ -852,6 +862,9 @@ interface IUIAttrData {
     selectedStyle?: IStateStyle;
     disabledStyle?: IStateStyle;
     placeholderStyle?: IStateStyle;
+    editConfig?: IEditorConfig;
+    editOuter?: string;
+    editInner?: string;
 }
 interface IFindUIMethod {
     (leaf: IUI, options?: any): IAnswer;
@@ -978,6 +991,7 @@ interface IColorConvertModule {
 interface IExportModule {
     running?: boolean;
     export(leaf: ILeaf$1, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
+    syncExport(leaf: ILeaf$1, filename: string, options?: IExportOptions | number | boolean): IExportResult;
 }
 
 interface IStateModule {
@@ -1057,4 +1071,4 @@ interface IFilterFunction {
     (filter: IFilter, ui: IUI, bounds: IMatrixWithBoundsScaleData, currentCanvas: ILeaferCanvas, originCanvas: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };
+export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };