@leafer-ui/interface 1.0.0-rc.11 → 1.0.0-rc.16

package/package.json

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

package/src/ICommonAttr.ts

@@ -78,6 +78,9 @@ export interface IStrokeComputedData {
     dashPattern?: number[]
     dashOffset?: number
     miterLimit?: number
+
+    startArrow?: IArrowType
+    endArrow?: IArrowType
 }
 
 // text---

package/src/IUI.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPathCommandData, ILeaferImageConfig, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult, IValue } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -37,7 +37,7 @@ interface IArrowAttrData {
 
 }
 export interface IArrowData extends IArrowAttrData, ILineData { }
-export interface IArrowInputData extends IArrowAttrData, IUIBaseInputData { }
+export interface IArrowInputData extends IArrowAttrData, ILineInputData { }
 
 
 // Rect
@@ -97,16 +97,10 @@ export interface IStarInputData extends IStarAttrData, IUIBaseInputData { }
 // Path
 export interface IPath extends IUI {
     __: IPathData
-    path: IPathCommandData | IPathString
-    windingRule: IWindingRule
 }
 export interface IPathData extends IUIData {
-    path?: IPathCommandData
-    windingRule?: IWindingRule
 }
 export interface IPathInputData extends IUIBaseInputData {
-    path?: IPathCommandData | IPathString
-    windingRule?: IWindingRule
 }
 
 // Pen
@@ -206,13 +200,11 @@ export interface IImageInputData extends IImageAttrData, IUIBaseInputData { }
 
 export interface ICanvas extends IRect {
     __: ICanvasData
-    pixelRatio: number
     smooth: boolean
     canvas: ILeaferCanvas
     __updateSize(): void
 }
 interface ICanvasAttrData {
-    pixelRatio?: number
     smooth?: boolean
 }
 export interface ICanvasData extends ICanvasAttrData, IRectData { }
@@ -221,11 +213,11 @@ export interface ICanvasInputData extends ICanvasAttrData, IUIBaseInputData { }
 
 // Leafer
 export interface ILeaferData extends IGroupData {
-    pixelRatio?: number
+
 }
 
 export interface ILeaferInputData extends IGroupInputData {
-    pixelRatio?: number
+
 }
 
 export interface IAppData extends ILeaferData {
@@ -286,7 +278,7 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     readonly app: ILeafer
     leafer?: ILeafer
     parent?: IGroup
-    isFrame?: boolean
+    readonly isFrame?: boolean
 
     proxyData: IUIInputData
     __proxyData?: IUIInputData
@@ -298,7 +290,7 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     set(data: IUIInputData): void
     toJSON(): IUIInputData
 
-    get(): IUIInputData
+    get(name?: string): IUIInputData | IValue
     createProxyData(): IUIInputData
 
     find(condition: number | string | IFindUIMethod, options?: any): IUI[]
@@ -340,18 +332,10 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    __useEffect?: boolean
-
-    __autoWidth: boolean
-    __autoHeight: boolean
-    __autoBounds: boolean
-
-    // path
-    path?: IPathCommandData
-    windingRule?: IWindingRule
-
-    __pathForRender?: IPathCommandData
-    __path2DForRender?: IPath2D
+    readonly __autoWidth: boolean
+    readonly __autoHeight: boolean
+    readonly __autoSide: boolean
+    readonly __autoSize: boolean
 
     __boxStroke?: boolean
 

package/src/index.ts

@@ -24,13 +24,14 @@ export {
     IUITag, IUIInputData
 } from './IUI'
 
-export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, 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, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, 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'
 
 export { IUIRenderModule, IRectRenderModule, IImageRenderModule, ITextRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'
 export { IUIBoundsModule } from './module/IUIBounds'
 export { IUIHitModule } from './module/IUIHit'
+export { IPathArrowModule } from './module/IPathArrow'
 export { ITextConvertModule } from './module/ITextConvert'
 export { IColorConvertModule } from './module/IColorConvert'
 export { IExportModule } from './module/IExport'

package/src/module/IPathArrow.ts

@@ -0,0 +1,8 @@
+import { IPathDataArrowMap } from '../type/IType'
+import { IUI } from '../IUI'
+
+
+export interface IPathArrowModule {
+    list: IPathDataArrowMap
+    addArrows(ui: IUI, changeRenderPath?: boolean): void
+}

package/src/type/IType.ts

@@ -92,11 +92,27 @@ export type IRepeat = boolean | 'x' | 'y'
 
 // 描边
 export type IStrokeAlign = 'inside' | 'outside' | 'center'
-export type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral'
+export type IStrokeCap = 'none' | 'round' | 'square'
 export type IStrokeJoin = 'bevel' | 'round' | 'miter'
 
 // 箭头
-export type IArrowType = 'none' | 'line' | 'triangle' | 'circle'
+export type IArrowType = IPathDataArrow | 'none' | 'angle' | 'angle-side' | 'arrow' | 'triangle' | 'triangle-flip' | 'circle' | 'circle-line' | 'square' | 'square-line' | 'diamond' | 'diamond-line' | 'mark'
+
+export interface IPathDataArrowMap {
+    [name: string]: IPathDataArrow
+}
+
+export interface IPathDataArrow {
+    connect?: IPathDataArrowOffset // 箭头与线条的连接点位置
+    offset?: IPathDataArrowOffset  // 箭头偏移距离，与末端对齐
+    path: IPathCommandData
+}
+
+export interface IPathDataArrowOffset {
+    x?: number // 偏移距离（x轴）
+    bevelJoin?: number // strokeJoin 为 bevel 时增加的偏移距离（x轴）
+    roundJoin?: number // strokeJoin 为 round 时增加的偏移距离（x轴）
+}
 
 // 文本
 export type ITextAlign = 'left' | 'center' | 'right' | 'justify'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IPointData, IExportFileType, ISizeData, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPickOptions, IPickResult, ILeaf, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
+import { IPointData, IExportFileType, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPickOptions, IPickResult, ILeaf, IValue, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, IObject, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, 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, IGroupInputData as IGroupInputData$1, IStroke as IStroke$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, ICursorType, IImageCursor, IAround } from '@leafer-ui/interface';
 
@@ -78,9 +78,22 @@ interface IImageFilters {
 type IImagePaintMode = 'cover' | 'fit' | 'strench' | 'clip' | 'repeat';
 type IRepeat = boolean | 'x' | 'y';
 type IStrokeAlign = 'inside' | 'outside' | 'center';
-type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral';
+type IStrokeCap = 'none' | 'round' | 'square';
 type IStrokeJoin = 'bevel' | 'round' | 'miter';
-type IArrowType = 'none' | 'line' | 'triangle' | 'circle';
+type IArrowType = IPathDataArrow | 'none' | 'angle' | 'angle-side' | 'arrow' | 'triangle' | 'triangle-flip' | 'circle' | 'circle-line' | 'square' | 'square-line' | 'diamond' | 'diamond-line' | 'mark';
+interface IPathDataArrowMap {
+    [name: string]: IPathDataArrow;
+}
+interface IPathDataArrow {
+    connect?: IPathDataArrowOffset;
+    offset?: IPathDataArrowOffset;
+    path: IPathCommandData;
+}
+interface IPathDataArrowOffset {
+    x?: number;
+    bevelJoin?: number;
+    roundJoin?: number;
+}
 type ITextAlign = 'left' | 'center' | 'right' | 'justify';
 type IVerticalAlign = 'top' | 'middle' | 'bottom';
 type ITextCase = 'upper' | 'lower' | 'title' | 'none' | 'small-caps';
@@ -217,6 +230,8 @@ interface IStrokeComputedData {
     dashPattern?: number[];
     dashOffset?: number;
     miterLimit?: number;
+    startArrow?: IArrowType;
+    endArrow?: IArrowType;
 }
 interface ITextStyleAttrData {
     fontFamily: IString;
@@ -310,7 +325,7 @@ interface IArrowAttrData {
 }
 interface IArrowData extends IArrowAttrData, ILineData {
 }
-interface IArrowInputData extends IArrowAttrData, IUIBaseInputData {
+interface IArrowInputData extends IArrowAttrData, ILineInputData {
 }
 interface IRect extends IUI {
     __: IRectData;
@@ -364,16 +379,10 @@ interface IStarInputData extends IStarAttrData, IUIBaseInputData {
 }
 interface IPath extends IUI {
     __: IPathData;
-    path: IPathCommandData | IPathString;
-    windingRule: IWindingRule;
 }
 interface IPathData extends IUIData {
-    path?: IPathCommandData;
-    windingRule?: IWindingRule;
 }
 interface IPathInputData extends IUIBaseInputData {
-    path?: IPathCommandData | IPathString;
-    windingRule?: IWindingRule;
 }
 interface IPen extends IGroup, IPathCreator {
     __: IPenData;
@@ -458,13 +467,11 @@ interface IImageInputData extends IImageAttrData, IUIBaseInputData {
 }
 interface ICanvas extends IRect {
     __: ICanvasData;
-    pixelRatio: number;
     smooth: boolean;
     canvas: ILeaferCanvas;
     __updateSize(): void;
 }
 interface ICanvasAttrData {
-    pixelRatio?: number;
     smooth?: boolean;
 }
 interface ICanvasData extends ICanvasAttrData, IRectData {
@@ -472,10 +479,8 @@ interface ICanvasData extends ICanvasAttrData, IRectData {
 interface ICanvasInputData extends ICanvasAttrData, IUIBaseInputData {
 }
 interface ILeaferData extends IGroupData {
-    pixelRatio?: number;
 }
 interface ILeaferInputData extends IGroupInputData {
-    pixelRatio?: number;
 }
 interface IAppData extends ILeaferData {
 }
@@ -522,14 +527,14 @@ interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEf
     readonly app: ILeafer;
     leafer?: ILeafer;
     parent?: IGroup;
-    isFrame?: boolean;
+    readonly isFrame?: boolean;
     proxyData: IUIInputData;
     __proxyData?: IUIInputData;
     children?: IUI[];
     reset(data?: IUIInputData): void;
     set(data: IUIInputData): void;
     toJSON(): IUIInputData;
-    get(): IUIInputData;
+    get(name?: string): IUIInputData | IValue;
     createProxyData(): IUIInputData;
     find(condition: number | string | IFindUIMethod, options?: any): IUI[];
     findOne(condition: number | string | IFindUIMethod, options?: any): IUI;
@@ -557,14 +562,10 @@ interface IUIData extends IUIComputedData, ILeafData {
     __drawAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
-    __useEffect?: boolean;
-    __autoWidth: boolean;
-    __autoHeight: boolean;
-    __autoBounds: boolean;
-    path?: IPathCommandData;
-    windingRule?: IWindingRule;
-    __pathForRender?: IPathCommandData;
-    __path2DForRender?: IPath2D;
+    readonly __autoWidth: boolean;
+    readonly __autoHeight: boolean;
+    readonly __autoSide: boolean;
+    readonly __autoSize: boolean;
     __boxStroke?: boolean;
     __font?: string;
     __textDrawData?: ITextDrawData;
@@ -699,6 +700,11 @@ interface IUIBounds extends ILeafBounds {
 
 type IUIHitModule = ILeafHit & ThisType<IUI>;
 
+interface IPathArrowModule {
+    list: IPathDataArrowMap;
+    addArrows(ui: IUI, changeRenderPath?: boolean): void;
+}
+
 interface ITextConvertModule {
     getDrawData(content: string, style: ITextData): ITextDrawData;
 }
@@ -753,4 +759,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, IEditorBase, IEditorConfig, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, 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, IPaintAttr, IPaintGradientModule, IPaintImageModule, 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, 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, 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, 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 };