@leafer-ui/interface 1.0.0 → 1.0.2

package/package.json

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

package/src/IUI.ts

@@ -224,6 +224,7 @@ export interface ICanvas extends IRect {
 interface ICanvasAttrData {
     smooth?: boolean
     contextSettings?: ICanvasContext2DSettings
+    url?: string
 }
 export interface ICanvasData extends ICanvasAttrData, IRectData { }
 export interface ICanvasInputData extends ICanvasAttrData, IUIBaseInputData { }

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 } 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 } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy {
     config: IEditorConfig
@@ -14,6 +14,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     readonly editing: boolean
     innerEditing: boolean
     readonly groupOpening: boolean
+    resizeDirection?: number
 
     readonly multiple: boolean
     readonly single: boolean
@@ -74,16 +75,20 @@ export interface IEditorConfig {
     pointSize?: number
     pointRadius?: number
 
-    point?: IBoxInputData | IBoxInputData[]
-    middlePoint?: IBoxInputData | IBoxInputData[]
-    rotatePoint?: IBoxInputData
+    point?: IEditPointInputData | IEditPointInputData[]
+    middlePoint?: IEditPointInputData | IEditPointInputData[]
 
     rect?: IBoxInputData
     area?: IRectInputData
-    mask?: IColorString
+    mask?: boolean | IColorString
 
-    buttonsDirection?: 'top' | 'right' | 'bottom' | 'left'
-    buttonsFixed?: boolean
+    circle?: IEditPointInputData
+    circleDirection?: IDirection4
+    circleMargin?: number
+    rotatePoint?: IEditPointInputData // 改用circle代替，后期可移除
+
+    buttonsDirection?: IDirection4
+    buttonsFixed?: boolean | 'AABB' | 'OBB'
     buttonsMargin?: number
 
     hideOnMove?: boolean
@@ -106,18 +111,23 @@ export interface IEditorConfig {
     continuousSelect?: boolean // 点击可以连续选择
     openInner?: 'double' | 'long' // 双击/长按打开内部
 
-    moveable?: boolean
-    rotateable?: boolean | 'rotate'
+    moveable?: boolean | 'move'
     resizeable?: boolean | 'zoom'
+    flipable?: boolean
+    rotateable?: boolean | 'rotate'
     skewable?: boolean
 }
 
+export interface IEditPointInputData extends IBoxInputData {
+    direction?: number
+    pointType?: IEditPointType
+}
 export interface IEditPoint extends IBox {
     direction: number
     pointType: IEditPointType
 }
 
-export type IEditPointType = 'rotate' | 'resize'
+export type IEditPointType = 'rotate' | 'resize' | 'button'
 
 export interface IEditBoxBase extends IGroup {
     editor: IEditorBase

package/src/index.ts

@@ -43,4 +43,4 @@ export { IPaintModule, IPaintImageModule, IPaintGradientModule } from './module/
 export { IEffectModule } from './module/IEffect'
 export { ICachedShape } from './ICachedShape'
 
-export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointType, IEditToolFunction, IEditorConfigFunction } from './editor/IEditor'
+export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorConfigFunction } from './editor/IEditor'

package/src/type/IComputedType.ts

@@ -16,6 +16,7 @@ export interface ILeafPaint {
     loadId?: number
     patternId?: string
     patternTask?: ITaskItem
+    sync?: boolean // 同步显示图片，不走任务列表生成图案
     data?: ILeafPaintPatternData
 }
 

package/src/type/IType.ts

@@ -14,7 +14,6 @@ export interface IPaintBase {
     blendMode?: IBlendMode
     visible?: boolean
     opacity?: number
-
 }
 
 export type IPaintType =
@@ -76,6 +75,7 @@ export interface IImagePaint extends IPaintBase {
     rotation?: number
 
     repeat?: IRepeat
+    sync?: boolean // 同步显示，不走任务列表生成图案
 }
 export interface IImageFilters {
     exposure?: number // 曝光

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IPathCreator, IBoundsData as IBoundsData$1, ILeaferImageConfig, ICanvasContext2DSettings, ILeaferCanvas, ICanvasContext2D, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IJSONOptions, IValue, IFindCondition, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, IObject as IObject$1, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, IStateStyleType, ICachedLeaf, IBooleanMap, IAround } from '@leafer/interface';
 export * from '@leafer/interface';
-import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IObject, ILeaf, IEditSize, IDragEvent, IZoomEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStroke as IStroke$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, IColorString as IColorString$1, ICursorType, IImageCursor, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent } from '@leafer-ui/interface';
+import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IObject, ILeaf, IEditSize, IDragEvent, IZoomEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, 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, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent } 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;
+    sync?: boolean;
 }
 interface IImageFilters {
     exposure?: number;
@@ -135,6 +136,7 @@ interface ILeafPaint {
     loadId?: number;
     patternId?: string;
     patternTask?: ITaskItem;
+    sync?: boolean;
     data?: ILeafPaintPatternData;
 }
 interface ILeafPaintPatternData {
@@ -312,6 +314,7 @@ 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;
@@ -355,14 +358,17 @@ interface IEditorConfig {
     pointFill?: IFill$1;
     pointSize?: number;
     pointRadius?: number;
-    point?: IBoxInputData$1 | IBoxInputData$1[];
-    middlePoint?: IBoxInputData$1 | IBoxInputData$1[];
-    rotatePoint?: IBoxInputData$1;
+    point?: IEditPointInputData | IEditPointInputData[];
+    middlePoint?: IEditPointInputData | IEditPointInputData[];
     rect?: IBoxInputData$1;
     area?: IRectInputData$1;
-    mask?: IColorString$1;
-    buttonsDirection?: 'top' | 'right' | 'bottom' | 'left';
-    buttonsFixed?: boolean;
+    mask?: boolean | IColorString$1;
+    circle?: IEditPointInputData;
+    circleDirection?: IDirection4;
+    circleMargin?: number;
+    rotatePoint?: IEditPointInputData;
+    buttonsDirection?: IDirection4;
+    buttonsFixed?: boolean | 'AABB' | 'OBB';
     buttonsMargin?: number;
     hideOnMove?: boolean;
     hideOnSmall?: boolean | number;
@@ -380,16 +386,21 @@ interface IEditorConfig {
     boxSelect?: boolean;
     continuousSelect?: boolean;
     openInner?: 'double' | 'long';
-    moveable?: boolean;
-    rotateable?: boolean | 'rotate';
+    moveable?: boolean | 'move';
     resizeable?: boolean | 'zoom';
+    flipable?: boolean;
+    rotateable?: boolean | 'rotate';
     skewable?: boolean;
 }
+interface IEditPointInputData extends IBoxInputData$1 {
+    direction?: number;
+    pointType?: IEditPointType;
+}
 interface IEditPoint extends IBox$1 {
     direction: number;
     pointType: IEditPointType;
 }
-type IEditPointType = 'rotate' | 'resize';
+type IEditPointType = 'rotate' | 'resize' | 'button';
 interface IEditBoxBase extends IGroup$1 {
     editor: IEditorBase;
     dragging: boolean;
@@ -606,6 +617,7 @@ interface ICanvas extends IRect {
 interface ICanvasAttrData {
     smooth?: boolean;
     contextSettings?: ICanvasContext2DSettings;
+    url?: string;
 }
 interface ICanvasData extends ICanvasAttrData, IRectData {
 }
@@ -868,4 +880,4 @@ interface IEffectModule {
     backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStateModule, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign };
+export type { IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStateModule, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign };