@leafer-ui/interface 1.0.0-rc.8 → 1.0.0-rc.9

package/package.json

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

package/src/ICommonAttr.ts

@@ -1,4 +1,4 @@
-import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData, ITextWrap, IStroke, IFill } from './type/IType'
+import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData, ITextWrap, IStroke, IFill, IArrowType } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
 import { IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
 
@@ -44,6 +44,9 @@ export interface IStrokeAttrData {
     dashPattern: number[] | IDashPatternString
     dashOffset: number
     miterLimit: number
+
+    startArrow: IArrowType
+    endArrow: IArrowType
 }
 export interface IStrokeInputData {
     stroke?: IStroke
@@ -55,6 +58,9 @@ export interface IStrokeInputData {
     dashPattern?: number[] | IDashPatternString
     dashOffset?: number
     miterLimit?: number
+
+    startArrow?: IArrowType
+    endArrow?: IArrowType
 }
 export interface IStrokeComputedData {
     stroke?: IColorString | ILeafStrokePaint[]

package/src/IUI.ts

@@ -30,6 +30,18 @@ export interface ILineData extends ILineAttrData, IUIData { }
 export interface ILineInputData extends ILineAttrData, IUIBaseInputData { }
 
 
+// Arrow
+export interface IArrow extends ILine {
+    __: IArrowData
+}
+
+interface IArrowAttrData {
+
+}
+export interface IArrowData extends IArrowAttrData, ILineData { }
+export interface IArrowInputData extends IArrowAttrData, IUIBaseInputData { }
+
+
 // Rect
 export interface IRect extends IUI {
     __: IRectData
@@ -189,7 +201,9 @@ export interface IImage extends IRect, ILeaferImageConfig {
 interface IImageAttrData {
     url?: string
 }
-export interface IImageData extends IImageAttrData, IRectData { }
+export interface IImageData extends IImageAttrData, IRectData {
+    __setImageFill(value: string): void
+}
 export interface IImageInputData extends IImageAttrData, IUIBaseInputData { }
 
 export interface ICanvas extends IRect {
@@ -291,8 +305,8 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     find(condition: number | string | IFindUIMethod, options?: any): IUI[]
     findOne(condition: number | string | IFindUIMethod, options?: any): IUI
 
-    getPath(curve?: boolean): IPathCommandData
-    getPathString(curve?: boolean): IPathString
+    getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData
+    getPathString(curve?: boolean, pathForRender?: boolean): IPathString
 
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
     __drawPathByBox(drawer: IPathDrawer): void

package/src/index.ts

@@ -5,6 +5,7 @@ export { ILeafer } from './app/ILeafer'
 
 export {
     ILine, ILineInputData, ILineData,
+    IArrow, IArrowInputData, IArrowData,
     IRect, IRectInputData, IRectData,
     IEllipse, IEllipseInputData, IEllipseData,
     IPolygon, IPolygonInputData, IPolygonData,
@@ -23,7 +24,7 @@ export {
     IUITag, IUIInputData
 } from './IUI'
 
-export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IStrokeAlign, IStrokeJoin, IStrokeCap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat } from './type/IType'
+export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat } from './type/IType'
 export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 
 export interface IUnitData {
@@ -70,6 +70,7 @@ export interface IImagePaint extends IPaintBase {
     filters?: IImageFilters
 
     offset?: IPointData
+    size?: number | ISizeData
     scale?: number | IPointData
     rotation?: number
 
@@ -92,6 +93,9 @@ export type IStrokeAlign = 'inside' | 'outside' | 'center'
 export type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral'
 export type IStrokeJoin = 'bevel' | 'round' | 'miter'
 
+// 箭头
+export type IArrowType = 'none' | 'line' | 'triangle' | 'circle'
+
 // 文本
 export type ITextAlign = 'left' | 'center' | 'right' | 'justify'
 export type IVerticalAlign = 'top' | 'middle' | 'bottom'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IPointData, IExportFileType, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPathDrawer, AnswerType, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeaferAttrData, IControl, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
+import { IPointData, IExportFileType, ISizeData, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPathDrawer, AnswerType, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeaferAttrData, IControl, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
 export * from '@leafer/interface';
 import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, IObject as IObject$1, ILeaf as ILeaf$1, IEditSize, IDragEvent, IRotateEvent, IStroke as IStroke$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, ICursorType, IAround } from '@leafer-ui/interface';
 
@@ -60,6 +60,7 @@ interface IImagePaint extends IPaintBase {
     format?: IExportFileType;
     filters?: IImageFilters;
     offset?: IPointData;
+    size?: number | ISizeData;
     scale?: number | IPointData;
     rotation?: number;
     repeat?: IRepeat;
@@ -78,6 +79,7 @@ type IRepeat = boolean | 'x' | 'y';
 type IStrokeAlign = 'inside' | 'outside' | 'center';
 type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral';
 type IStrokeJoin = 'bevel' | 'round' | 'miter';
+type IArrowType = 'none' | 'line' | 'triangle' | 'circle';
 type ITextAlign = 'left' | 'center' | 'right' | 'justify';
 type IVerticalAlign = 'top' | 'middle' | 'bottom';
 type ITextCase = 'upper' | 'lower' | 'title' | 'none' | 'small-caps';
@@ -186,6 +188,8 @@ interface IStrokeAttrData {
     dashPattern: number[] | IDashPatternString;
     dashOffset: number;
     miterLimit: number;
+    startArrow: IArrowType;
+    endArrow: IArrowType;
 }
 interface IStrokeInputData {
     stroke?: IStroke;
@@ -196,6 +200,8 @@ interface IStrokeInputData {
     dashPattern?: number[] | IDashPatternString;
     dashOffset?: number;
     miterLimit?: number;
+    startArrow?: IArrowType;
+    endArrow?: IArrowType;
 }
 interface IStrokeComputedData {
     stroke?: IColorString | ILeafStrokePaint[];
@@ -308,6 +314,15 @@ interface ILineData extends ILineAttrData, IUIData {
 }
 interface ILineInputData extends ILineAttrData, IUIBaseInputData {
 }
+interface IArrow extends ILine {
+    __: IArrowData;
+}
+interface IArrowAttrData {
+}
+interface IArrowData extends IArrowAttrData, ILineData {
+}
+interface IArrowInputData extends IArrowAttrData, IUIBaseInputData {
+}
 interface IRect extends IUI {
     __: IRectData;
 }
@@ -448,6 +463,7 @@ interface IImageAttrData {
     url?: string;
 }
 interface IImageData extends IImageAttrData, IRectData {
+    __setImageFill(value: string): void;
 }
 interface IImageInputData extends IImageAttrData, IUIBaseInputData {
 }
@@ -527,8 +543,8 @@ interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEf
     createProxyData(): IUIInputData;
     find(condition: number | string | IFindUIMethod, options?: any): IUI[];
     findOne(condition: number | string | IFindUIMethod, options?: any): IUI;
-    getPath(curve?: boolean): IPathCommandData;
-    getPathString(curve?: boolean): IPathString;
+    getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
+    getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
@@ -723,4 +739,4 @@ interface IEffectModule {
     backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void;
 }
 
-export type { IApp, IAppConfig, IAppData, IAppInputData, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, ICornerRadiusString, IDashPatternString, IEditorBase, IEditorConfig, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IExportOptions, IExportResult, IExportResultFunction, IFill, IFindUIMethod, 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, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStroke, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, 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, IEditorBase, IEditorConfig, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IExportOptions, IExportResult, IExportResultFunction, IFill, IFindUIMethod, 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, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStroke, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, IVectorPath, IVerticalAlign };