@leafer-ui/display 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "2.0.1",
-    "@leafer-ui/data": "2.0.1",
-    "@leafer-ui/display-module": "2.0.1",
-    "@leafer-ui/decorator": "2.0.1",
-    "@leafer-ui/external": "2.0.1"
+    "@leafer/core": "2.0.3",
+    "@leafer-ui/data": "2.0.3",
+    "@leafer-ui/display-module": "2.0.3",
+    "@leafer-ui/decorator": "2.0.3",
+    "@leafer-ui/external": "2.0.3"
   },
   "devDependencies": {
-    "@leafer/interface": "2.0.1",
-    "@leafer-ui/interface": "2.0.1"
+    "@leafer/interface": "2.0.3",
+    "@leafer-ui/interface": "2.0.3"
   }
 }

package/src/Ellipse.ts

@@ -29,10 +29,10 @@ export class Ellipse<TInputData = IEllipseInputData> extends UI<TInputData> impl
 
     public __updatePath(): void {
 
-        const { width, height, innerRadius, startAngle, endAngle } = this.__
+        const data = this.__, { width, height, innerRadius, startAngle, endAngle } = data
         const rx = width / 2, ry = height / 2
 
-        const path: number[] = this.__.path = []
+        const path: number[] = data.path = []
         let open: boolean
 
         if (innerRadius) {
@@ -63,7 +63,7 @@ export class Ellipse<TInputData = IEllipseInputData> extends UI<TInputData> impl
         if (!open) closePath(path)
 
         // fix node
-        if (Platform.ellipseToCurve) this.__.path = this.getPath(true)
+        if (Platform.ellipseToCurve || data.__useArrow) data.path = this.getPath(true)
 
     }
 

package/src/Group.ts

@@ -63,7 +63,10 @@ export class Group<TInputData = IGroupInputData> extends UI<TInputData> implemen
 
     override toJSON(options?: IJSONOptions): IUIJSONData {
         const data = super.toJSON(options)
-        if (!this.childlessJSON) data.children = this.children.map(child => child.toJSON(options))
+        if (!this.childlessJSON) {
+            const children: IUIJSONData[] = data.children = []
+            this.children.forEach(child => child.skipJSON || children.push(child.toJSON(options)))
+        }
         return data
     }
 

package/src/Leafer.ts

@@ -72,6 +72,10 @@ export class Leafer extends Group implements ILeafer {
         // pixelSnap: false // 是否对齐像素，避免图片存在浮点坐标导致模糊
     }
 
+    // @leafer-in/find will rewrite
+    public cacheId?: boolean
+    public cacheInnerId?: boolean
+
     public autoLayout?: IAutoBounds
     public lazyBounds: IBounds
 
@@ -184,13 +188,13 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
-    public unlockLayout(): void {
+    public unlockLayout(updateLayout: boolean = true): void {
         this.layouter.start()
-        this.updateLayout()
+        if (updateLayout) this.updateLayout()
     }
 
-    public lockLayout(): void {
-        this.updateLayout()
+    public lockLayout(updateLayout: boolean = true): void {
+        if (updateLayout) this.updateLayout()
         this.layouter.stop()
     }
 

package/src/UI.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IRenderOptions, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, IWindingRule, IPathCreator, IFourNumber, IBoundsData, IFlowType, IGap, IFlowWrap, IAxis, IConstraint, IAutoBoxData, IFlowBoxType, IPointGap, IFlowAlign, IFlowAxisAlign, IFindCondition, IAutoSize, IRangeSize, IAlign, IUnitPointData, IObject, IScaleData, IUnitData, IPathCommandObject, ITransition, IFilter, IScaleFixed, IDragBoundsType, IPathCommandNode } from '@leafer/interface'
 import { Leaf, PathDrawer, surfaceType, dimType, dataType, positionType, scrollType, boundsType, pathType, scaleType, rotationType, opacityType, visibleType, sortType, maskType, dataProcessor, registerUI, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, pen, naturalBoundsType, pathInputType, MathHelper, Plugin, DataHelper, affectRenderBoundsType, isString, isNumber } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowStyle, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, IAnimateType, IStateStyle, IColorString, IAnimateList, ILeafPaint } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowStyle, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, IAnimateType, IStateStyle, IColorString, IAnimateList, ILeafPaint, ILinker } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -33,6 +33,10 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
 
     declare public children?: IUI[]
 
+    // linker
+    public startLinker?: ILinker[]
+    public endLinker?: ILinker[]
+
     // ---
 
     // id
@@ -259,7 +263,11 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     public strokeWidth?: IFourNumber | IStrokeWidthString
 
     @strokeType(false)
-    public strokeWidthFixed?: IScaleFixed
+    public strokeScaleFixed?: IScaleFixed
+
+    // 未来将移除，请用 strokeScaleFixed 代替
+    public set strokeWidthFixed(value: IScaleFixed) { this.strokeScaleFixed = value }
+    public get strokeWidthFixed(): IScaleFixed { return this.strokeScaleFixed }
 
     @strokeType('none')
     public strokeCap?: IStrokeCap
@@ -312,6 +320,11 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     public filter?: IFilter | IFilter[]
 
 
+    // need rewrite
+
+    public complex?: boolean
+
+
     // @leafer-in/animate rewrite
 
     public animation?: IAnimation | IAnimation[]
@@ -449,6 +462,9 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         return PathConvert.stringify(this.getPath(curve, pathForRender), floatLength)
     }
 
+    public asPath(curve?: boolean, pathForRender?: boolean): void {
+        this.path = this.getPath(curve, pathForRender)
+    }
 
     public load(): void {
         this.__.__computePaint() // 手动加载图片
@@ -461,17 +477,19 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         }
     }
 
-    public __updateRenderPath(): void {
+    public __updateRenderPath(updateCache?: boolean): void {
         const data = this.__
         if (data.path) {
             data.__pathForRender = data.cornerRadius ? PathCorner.smooth(data.path, data.cornerRadius, data.cornerSmoothing) : data.path
-            if (data.__useArrow) PathArrow.addArrows(this)
+            if (data.__useArrow) PathArrow.addArrows(this, updateCache)
         } else data.__pathForRender && (data.__pathForRender = undefined)
     }
 
     public __drawRenderPath(canvas: ILeaferCanvas): void {
+        const data = this.__
         canvas.beginPath()
-        this.__drawPathByData(canvas, this.__.__pathForRender)
+        if (data.__useArrow) PathArrow.updateArrow(this)
+        this.__drawPathByData(canvas, data.__pathForRender)
     }
 
     public __drawPath(canvas: ILeaferCanvas): void {
@@ -547,9 +565,10 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
 
 
     public destroy(): void {
+        this.__.__willDestroy = true
         this.fill = this.stroke = null
         if (this.__animate) this.killAnimate()
         super.destroy()
     }
 
-}
+}

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { IString, INumber, IBoolean, IMaskType, IEraserType, IScaleFixed, IAlign, IUnitPointData, IFourNumber, IPathCommandData, IPathCommandNode, IPathCommandObject, IPathString, IWindingRule, IFlowType, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IDragBoundsType, IHitType, ICursorType, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IFindCondition, ILeaferCanvas, IPathDrawer, IRenderOptions, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IValue, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
 import { Leaf, LeafList } from '@leafer/core';
-import { IUIInputData, IUI, IUIData, ILeafer, IGroup, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowStyle, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IAnimation, IStates, IStateName, IStateStyle, IColorString, IEditorConfig, IAnimate, IAnimateList, IFindUIMethod, ILeafPaint, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupInputData, IGroupData, IUIJSONData, IFindCondition as IFindCondition$1, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, IBoxInputData, IBox, IBoxData, IOverflow, IScrollConfig, IScroller, IFrameInputData, IFrame, IFrameData, IRectInputData, IRect, IRectData, IEllipseInputData, IEllipse, IEllipseData, IPolygonInputData, IPolygon, IPolygonData, IStarInputData, IStar, IStarData, ILineInputData, ILine, ILineData, IImageInputData, IImage, IImageData, ICanvasInputData, ICanvas, ICanvasData, ITextInputData, IText, ITextData, IBackgroundBoxStyle, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextOverflow, ITextDrawData, IPathInputData, IPath, IPathData, IPenInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPointData as IPointData$1 } from '@leafer-ui/interface';
+import { IUIInputData, IUI, IUIData, ILeafer, IGroup, ILinker, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowStyle, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IAnimation, IStates, IStateName, IStateStyle, IColorString, IEditorConfig, IAnimate, IAnimateList, IFindUIMethod, ILeafPaint, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupInputData, IGroupData, IUIJSONData, IFindCondition as IFindCondition$1, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, IBoxInputData, IBox, IBoxData, IOverflow, IScrollConfig, IScroller, IFrameInputData, IFrame, IFrameData, IRectInputData, IRect, IRectData, IEllipseInputData, IEllipse, IEllipseData, IPolygonInputData, IPolygon, IPolygonData, IStarInputData, IStar, IStarData, ILineInputData, ILine, ILineData, IImageInputData, IImage, IImageData, ICanvasInputData, ICanvas, ICanvasData, ITextInputData, IText, ITextData, IBackgroundBoxStyle, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextOverflow, ITextDrawData, IPathInputData, IPath, IPathData, IPenInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPointData as IPointData$1 } from '@leafer-ui/interface';
 
 declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements IUI {
     __: IUIData;
@@ -12,6 +12,8 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     zoomLayer: IGroup;
     get isFrame(): boolean;
     children?: IUI[];
+    startLinker?: ILinker[];
+    endLinker?: ILinker[];
     id?: IString;
     name?: IString;
     className?: IString;
@@ -76,7 +78,9 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     stroke?: IStroke;
     strokeAlign?: IStrokeAlign;
     strokeWidth?: IFourNumber | IStrokeWidthString;
-    strokeWidthFixed?: IScaleFixed;
+    strokeScaleFixed?: IScaleFixed;
+    set strokeWidthFixed(value: IScaleFixed);
+    get strokeWidthFixed(): IScaleFixed;
     strokeCap?: IStrokeCap;
     strokeJoin?: IStrokeJoin;
     dashPattern?: INumber[] | IDashPatternString;
@@ -92,6 +96,7 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     backgroundBlur?: INumber | IBlurEffect;
     grayscale?: INumber | IGrayscaleEffect;
     filter?: IFilter | IFilter[];
+    complex?: boolean;
     animation?: IAnimation | IAnimation[];
     animationOut?: IAnimation | IAnimation[];
     transition?: ITransition;
@@ -136,9 +141,10 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     findId(id: number | string): IUI | undefined;
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
     getPathString(curve?: boolean, pathForRender?: boolean, floatLength?: number): IPathString;
+    asPath(curve?: boolean, pathForRender?: boolean): void;
     load(): void;
     __onUpdateSize(): void;
-    __updateRenderPath(): void;
+    __updateRenderPath(updateCache?: boolean): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;
     __drawPath(canvas: ILeaferCanvas): void;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData, ignoreCornerRadius?: boolean): void;
@@ -213,6 +219,8 @@ declare class Leafer extends Group implements ILeafer {
     editor: IEditorBase;
     userConfig: ILeaferConfig;
     config: ILeaferConfig;
+    cacheId?: boolean;
+    cacheInnerId?: boolean;
     autoLayout?: IAutoBounds;
     lazyBounds: IBounds;
     get FPS(): number;
@@ -234,8 +242,8 @@ declare class Leafer extends Group implements ILeafer {
     set(data: IUIInputData, transition?: ITransition | 'temp'): void;
     start(): void;
     stop(): void;
-    unlockLayout(): void;
-    lockLayout(): void;
+    unlockLayout(updateLayout?: boolean): void;
+    lockLayout(updateLayout?: boolean): void;
     resize(size: IScreenSizeData): void;
     forceRender(bounds?: IBoundsData, sync?: boolean): void;
     requestRender(change?: boolean): void;