@leafer/interface 1.0.0-rc.26 → 1.0.0-rc.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-rc.26",
+  "version": "1.0.0-rc.28",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/app/ILeafer.ts

@@ -17,7 +17,7 @@ import { IControl } from '../control/IControl'
 import { IFunction } from '../function/IFunction'
 
 
-export type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart'
+export type ILeaferType = 'draw' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom'
 export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean
     type?: ILeaferType
@@ -70,7 +70,6 @@ export interface ILeaferAttrData {
     unlockLayout(): void
     lockLayout(): void
 
-    forceRender(bounds?: IBoundsData): void
     updateCursor(cursor?: ICursorType): void
     resize(size: IScreenSizeData): void
 

package/src/canvas/IHitCanvasManager.ts

@@ -5,5 +5,5 @@ import { IHitCanvas, ILeaferCanvasConfig } from './ILeaferCanvas'
 export interface IHitCanvasManager extends ICanvasManager {
     maxTotal: number // 最多缓存多少张画布
     getPathType(leaf: ILeaf): IHitCanvas
-    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas
+    getPixelType(leaf: ILeaf, config?: ILeaferCanvasConfig): IHitCanvas
 }

package/src/canvas/ILeaferCanvas.ts

@@ -158,6 +158,9 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     backgroundColor?: string
     hittable?: boolean
 
+    zIndex?: number
+    childIndex?: number
+
     bounds: IBounds
     clientBounds: IBoundsData
 

package/src/display/ILeaf.ts

@@ -111,6 +111,9 @@ export interface ILeafAttrData {
     focusStyle: ILeafInputData
     selectedStyle: ILeafInputData
     disabledStyle: ILeafInputData
+
+    // 预留给用户使用的数据对象
+    data: IObject
 }
 
 
@@ -367,6 +370,9 @@ export interface ILeafInputData {
     selectedStyle?: ILeafInputData
     disabledStyle?: ILeafInputData
 
+    // 预留给用户使用的数据对象
+    data?: IObject
+
     children?: ILeafInputData[]
 
     // other
@@ -455,6 +461,10 @@ export interface ILeafComputedData {
     selectedStyle?: ILeafInputData
     disabledStyle?: ILeafInputData
 
+
+    // 预留给用户使用的数据对象
+    data?: IObject
+
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
@@ -546,6 +556,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     readonly __onlyHitMask: boolean
     readonly __ignoreHitWorld: boolean
+    readonly __inLazyBounds: boolean
 
     readonly pathInputed: boolean
 
@@ -566,6 +577,10 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     set(data: IObject): void
     get(name?: string | string[] | IObject): ILeafInputData | IValue
+    setAttr(name: string, value: any): void
+    getAttr(name: string): any
+    getComputedAttr(name: string): any
+
     toJSON(): IObject
     toString(): string
     toSVG(): string
@@ -585,9 +600,10 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     findId(id: number | string): ILeaf | undefined
 
     focus(value?: boolean): void
-    forceUpdate(attrName?: string): void
 
     updateLayout(): void
+    forceUpdate(attrName?: string): void
+    forceRender(_bounds?: IBoundsData): void
 
     // ILeafMatrix ->
     __updateWorldMatrix(): void
@@ -629,6 +645,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData
+    getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[]
 
     getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData
 

package/src/file/IExport.ts

@@ -1,19 +1,21 @@
 import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { ICanvasContext2DSettings } from '../canvas/ICanvas'
 import { ILeaf } from '../display/ILeaf'
 import { ILocationType } from '../layout/ILeafLayout'
 import { IBoundsData } from '../math/IMath'
 
-
 export interface IExportOptions {
     quality?: number
     blob?: boolean
     scale?: number
+    smooth?: boolean
     pixelRatio?: number
     slice?: boolean
     trim?: boolean
     fill?: string
     screenshot?: IBoundsData | boolean
     relative?: ILocationType | ILeaf
+    contextSettings?: ICanvasContext2DSettings
     onCanvas?: IExportOnCanvasFunction
 }
 

package/src/interaction/IInteraction.ts

@@ -82,10 +82,10 @@ export interface IInteractionCanvas extends ILeaferCanvas {
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
-    cursor?: ICursorConfig
     zoom?: IZoomConfig
     move?: IMoveConfig
     eventer?: IObject
+    cursor?: boolean
     keyEvent?: boolean
 }
 

package/src/platform/IPlatform.ts

@@ -1,4 +1,4 @@
-import { IFunction } from '../function/IFunction'
+import { IFunction, IStringFunction } from '../function/IFunction'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { ILeaf } from '../display/ILeaf'
 import { IExportFileType, IExportImageType } from '../file/IFileType'
@@ -43,8 +43,10 @@ export interface IPlatform {
         hitCanvasSize: number // 图片生成碰撞画布的最大尺寸(单边)
         maxCacheSize: number // 最大等级缓存，一般取当前屏幕大小，默认2k: 2560 * 1600
         maxPatternSize: number // 最大repeat pattern缓存, 默认4k: 4096 * 2160
-        suffix: string  // 需要带上后缀区分dom中image标签的缓存，否则会导致浏览器缓存跨域问题
+        prefix?: string // url加前缀
+        suffix?: string  // 需要带上后缀区分dom中image标签的缓存，否则会导致浏览器缓存跨域问题
         crossOrigin: string | false // 跨域设置
+        getRealURL: IStringFunction // 处理前缀、后缀
     }
 }
 

package/types/index.d.ts

@@ -880,12 +880,14 @@ interface IExportOptions {
     quality?: number;
     blob?: boolean;
     scale?: number;
+    smooth?: boolean;
     pixelRatio?: number;
     slice?: boolean;
     trim?: boolean;
     fill?: string;
     screenshot?: IBoundsData | boolean;
     relative?: ILocationType | ILeaf;
+    contextSettings?: ICanvasContext2DSettings;
     onCanvas?: IExportOnCanvasFunction;
 }
 interface IExportResult {
@@ -1010,6 +1012,8 @@ interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     readonly allowBackgroundColor?: boolean;
     backgroundColor?: string;
     hittable?: boolean;
+    zIndex?: number;
+    childIndex?: number;
     bounds: IBounds;
     clientBounds: IBoundsData;
     config: ILeaferCanvasConfig;
@@ -1287,6 +1291,7 @@ interface ILeafAttrData {
     focusStyle: ILeafInputData;
     selectedStyle: ILeafInputData;
     disabledStyle: ILeafInputData;
+    data: IObject;
 }
 type IAxis = 'x' | 'y';
 type IAxisReverse = 'x-reverse' | 'y-reverse';
@@ -1404,6 +1409,7 @@ interface ILeafInputData {
     focusStyle?: ILeafInputData;
     selectedStyle?: ILeafInputData;
     disabledStyle?: ILeafInputData;
+    data?: IObject;
     children?: ILeafInputData[];
     noBounds?: boolean;
 }
@@ -1470,6 +1476,7 @@ interface ILeafComputedData {
     focusStyle?: ILeafInputData;
     selectedStyle?: ILeafInputData;
     disabledStyle?: ILeafInputData;
+    data?: IObject;
     __childBranchNumber?: number;
     __complex?: boolean;
     __naturalWidth?: number;
@@ -1535,6 +1542,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __hasGrow?: boolean;
     readonly __onlyHitMask: boolean;
     readonly __ignoreHitWorld: boolean;
+    readonly __inLazyBounds: boolean;
     readonly pathInputed: boolean;
     __parentWait?: IFunction[];
     __leaferWait?: IFunction[];
@@ -1548,6 +1556,9 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __bindLeafer(leafer: ILeaferBase | null): void;
     set(data: IObject): void;
     get(name?: string | string[] | IObject): ILeafInputData | IValue;
+    setAttr(name: string, value: any): void;
+    getAttr(name: string): any;
+    getComputedAttr(name: string): any;
     toJSON(): IObject;
     toString(): string;
     toSVG(): string;
@@ -1562,8 +1573,9 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     findOne(condition: number | string | IFindMethod, options?: any): ILeaf | undefined;
     findId(id: number | string): ILeaf | undefined;
     focus(value?: boolean): void;
-    forceUpdate(attrName?: string): void;
     updateLayout(): void;
+    forceUpdate(attrName?: string): void;
+    forceRender(_bounds?: IBoundsData): void;
     __updateWorldMatrix(): void;
     __updateLocalMatrix(): void;
     __updateWorldBounds(): void;
@@ -1590,6 +1602,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
+    getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[];
     getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData;
     worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
@@ -1805,10 +1818,10 @@ interface IInteractionCanvas extends ILeaferCanvas {
 interface IInteractionConfig {
     wheel?: IWheelConfig;
     pointer?: IPointerConfig;
-    cursor?: ICursorConfig;
     zoom?: IZoomConfig;
     move?: IMoveConfig;
     eventer?: IObject;
+    cursor?: boolean;
     keyEvent?: boolean;
 }
 interface IZoomConfig {
@@ -1853,20 +1866,17 @@ interface IPointerConfig {
     preventDefault?: boolean;
     preventDefaultMenu?: boolean;
 }
-interface ICursorConfig {
-    stop?: boolean;
-}
 
 interface IHitCanvasManager extends ICanvasManager {
     maxTotal: number;
     getPathType(leaf: ILeaf): IHitCanvas;
-    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas;
+    getPixelType(leaf: ILeaf, config?: ILeaferCanvasConfig): IHitCanvas;
 }
 
 interface IZoomView extends IBranch {
 }
 
-type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart';
+type ILeaferType = 'draw' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom';
 interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean;
     type?: ILeaferType;
@@ -1904,7 +1914,6 @@ interface ILeaferAttrData {
     stop(): void;
     unlockLayout(): void;
     lockLayout(): void;
-    forceRender(bounds?: IBoundsData): void;
     updateCursor(cursor?: ICursorType): void;
     resize(size: IScreenSizeData): void;
     waitReady(item: IFunction, bind?: IObject): void;
@@ -2083,8 +2092,10 @@ interface IPlatform {
         hitCanvasSize: number;
         maxCacheSize: number;
         maxPatternSize: number;
-        suffix: string;
+        prefix?: string;
+        suffix?: string;
         crossOrigin: string | false;
+        getRealURL: IStringFunction;
     };
 }
 interface IMiniappSelect extends IObject {