@leafer-ui/interface 1.0.5 → 1.0.7

package/package.json

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

package/src/IUI.ts

@@ -20,7 +20,7 @@ export interface ILine extends ILineAttrData, IUI {
 
 interface ILineAttrData {
     toPoint?: IPointData
-    points?: number[]
+    points?: number[] | IPointData[]
     curve?: boolean | number
 }
 export interface ILineData extends ILineAttrData, IUIData { }
@@ -159,7 +159,7 @@ export interface IPolygon extends IPolygonAttrData, IUI {
 }
 interface IPolygonAttrData {
     sides?: number
-    points?: number[]
+    points?: number[] | IPointData[]
     curve?: boolean | number
 }
 export interface IPolygonData extends IPolygonAttrData, IUIData { }
@@ -346,10 +346,10 @@ export interface IGroup extends IUI {
     __: IGroupData
     children: IUI[]
     pick(hitPoint: IPointData, options?: IPickOptions): IPickResult
-    add(child: IUI | IUIInputData, index?: number): void
-    addAt(child: IUI | IUIInputData, index: number): void
-    addAfter(child: IUI | IUIInputData, after: IUI): void
-    addBefore(child: IUI | IUIInputData, before: IUI): void
+    add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void
+    addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void
+    addAfter(child: IUI | IUI[] | IUIInputData | IUIInputData[], after: IUI): void
+    addBefore(child: IUI | IUI[] | IUIInputData | IUIInputData[], before: IUI): void
     addMany(...children: ILeaf[] | IUIInputData[]): void
     remove(child?: IUI | number | string | IFindCondition | IFindUIMethod): void
     removeAll(): void
@@ -367,6 +367,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     parent?: IGroup
     zoomLayer?: IGroup
     readonly isFrame?: boolean
+    isOverflow?: boolean
 
     proxyData?: IUIInputData
     __proxyData?: IUIInputData
@@ -405,6 +406,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
     __drawPathByBox(drawer: IPathDrawer): void
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation, options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
     killAnimate(type?: IAnimateType): void
@@ -457,6 +459,8 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isStrokes?: boolean
 
     readonly __strokeWidth: number
+    readonly __hasStroke: boolean
+
 
     __pixelFill?: boolean // png / svg / webp
     __pixelStroke?: boolean
@@ -468,16 +472,18 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __opacityStroke?: boolean
 
     __drawAfterFill?: boolean
+    readonly __clipAfterFill?: boolean
+
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    __boxStroke?: boolean
+    __boxStroke?: boolean // box闭合描边，可不用计算miterLimit造成的渲染包围盒变化
 
     // text
     __font?: string
     __textDrawData?: ITextDrawData
 
-    __needComputePaint: boolean
+    __needComputePaint?: boolean
     __computePaint(): void
 }
 export interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {

package/src/module/IUIRender.ts

@@ -6,6 +6,7 @@ export type IUIRenderModule = IUIRender & ThisType<IUI>
 
 export interface IUIRender extends ILeafRender {
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 }
 
 export type IRectRenderModule = IRectRender & ThisType<IRect>

package/types/index.d.ts

@@ -540,7 +540,7 @@ interface ILine extends ILineAttrData, IUI {
 }
 interface ILineAttrData {
     toPoint?: IPointData;
-    points?: number[];
+    points?: number[] | IPointData[];
     curve?: boolean | number;
 }
 interface ILineData extends ILineAttrData, IUIData {
@@ -653,7 +653,7 @@ interface IPolygon extends IPolygonAttrData, IUI {
 }
 interface IPolygonAttrData {
     sides?: number;
-    points?: number[];
+    points?: number[] | IPointData[];
     curve?: boolean | number;
 }
 interface IPolygonData extends IPolygonAttrData, IUIData {
@@ -807,10 +807,10 @@ interface IGroup extends IUI {
     __: IGroupData;
     children: IUI[];
     pick(hitPoint: IPointData, options?: IPickOptions): IPickResult;
-    add(child: IUI | IUIInputData, index?: number): void;
-    addAt(child: IUI | IUIInputData, index: number): void;
-    addAfter(child: IUI | IUIInputData, after: IUI): void;
-    addBefore(child: IUI | IUIInputData, before: IUI): void;
+    add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void;
+    addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void;
+    addAfter(child: IUI | IUI[] | IUIInputData | IUIInputData[], after: IUI): void;
+    addBefore(child: IUI | IUI[] | IUIInputData | IUIInputData[], before: IUI): void;
     addMany(...children: ILeaf$1[] | IUIInputData[]): void;
     remove(child?: IUI | number | string | IFindCondition | IFindUIMethod): void;
     removeAll(): void;
@@ -827,6 +827,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     parent?: IGroup;
     zoomLayer?: IGroup;
     readonly isFrame?: boolean;
+    isOverflow?: boolean;
     proxyData?: IUIInputData;
     __proxyData?: IUIInputData;
     animation?: IAnimation;
@@ -852,6 +853,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation, options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
     killAnimate(type?: IAnimateType): void;
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
@@ -884,6 +886,7 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isFills?: boolean;
     __isStrokes?: boolean;
     readonly __strokeWidth: number;
+    readonly __hasStroke: boolean;
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
     __isHitPixel?: boolean;
@@ -891,12 +894,13 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __opacityFill?: boolean;
     __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
+    readonly __clipAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
     __boxStroke?: boolean;
     __font?: string;
     __textDrawData?: ITextDrawData;
-    __needComputePaint: boolean;
+    __needComputePaint?: boolean;
     __computePaint(): void;
 }
 interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
@@ -941,6 +945,7 @@ interface IAppConfig extends ILeaferConfig {
 type IUIRenderModule = IUIRender & ThisType<IUI>;
 interface IUIRender extends ILeafRender {
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
 }
 type IRectRenderModule = IRectRender & ThisType<IRect>;
 interface IRectRender extends IUIRender {