@leafer-ui/data 1.0.5 → 1.0.6

package/package.json

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

package/src/BoxData.ts

@@ -4,5 +4,12 @@ import { GroupData } from "./GroupData"
 
 
 export class BoxData extends GroupData implements IBoxData {
-    get __boxStroke(): boolean { return !this.__pathInputed }
+
+    public get __boxStroke(): boolean { return !(this as IBoxData).__pathInputed }
+
+    // 路径与圆角直接当溢出处理
+    public get __drawAfterFill(): boolean { return (this as IBoxData).overflow === 'hide' && this.__clipAfterFill && this.__leaf.children.length as unknown as boolean }
+
+    public get __clipAfterFill(): boolean { return this.__leaf.isOverflow || super.__clipAfterFill }
+
 }

package/src/CanvasData.ts

@@ -1,12 +1,15 @@
-import { ICanvas, ICanvasData, ICanvasInputData, IObject } from '@leafer-ui/interface'
+import { ICanvas, ICanvasData, ICanvasInputData, IObject, IJSONOptions } from '@leafer-ui/interface'
 
 import { RectData } from './RectData'
 
 
 export class CanvasData extends RectData implements ICanvasData {
 
-    public __getInputData(): IObject {
-        const data: ICanvasInputData = super.__getInputData()
+    public get __isCanvas(): boolean { return true }
+    public get __drawAfterFill(): boolean { return true }
+
+    public __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject {
+        const data: ICanvasInputData = super.__getInputData(names, options)
         data.url = (this.__leaf as ICanvas).canvas.toDataURL('image/png') as string
         return data
     }

package/src/EllipseData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class EllipseData extends UIData implements IEllipseData {
-    get __boxStroke(): boolean { return !this.__pathInputed }
+    get __boxStroke(): boolean { return !(this as IEllipseData).__pathInputed }
 }

package/src/ImageData.ts

@@ -1,4 +1,4 @@
-import { IImageData, IImageInputData, IImage, IObject } from '@leafer-ui/interface'
+import { IImageData, IImageInputData, IImage, IObject, IJSONOptions } from '@leafer-ui/interface'
 
 import { RectData } from './RectData'
 
@@ -25,8 +25,8 @@ export class ImageData extends RectData implements IImageData {
         return data
     }
 
-    public __getInputData(): IObject {
-        const data = super.__getInputData()
+    public __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject {
+        const data = super.__getInputData(names, options)
         delete data.fill
         return data
     }

package/src/LeaferData.ts

@@ -1,13 +1,13 @@
 import { canvasSizeAttrs } from '@leafer/core'
 
-import { ILeaferData, IObject } from '@leafer-ui/interface'
+import { ILeaferData, IObject, IJSONOptions } from '@leafer-ui/interface'
 
 import { GroupData } from './GroupData'
 
 export class LeaferData extends GroupData implements ILeaferData {
 
-    public __getInputData(): IObject {
-        const data = super.__getInputData()
+    public __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject {
+        const data = super.__getInputData(names, options)
         canvasSizeAttrs.forEach(key => delete (data as IObject)[key])
         return data
     }

package/src/PathData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class PathData extends UIData implements IPathData {
-
+    public get __pathInputed(): number { return 2 }
 }

package/src/RectData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class RectData extends UIData implements IRectData {
-    get __boxStroke(): boolean { return !this.__pathInputed }
+    get __boxStroke(): boolean { return !(this as IRectData).__pathInputed }
 }

package/src/UIData.ts

@@ -1,11 +1,11 @@
-import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData } from '@leafer/interface'
+import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData, IPathCommandObject } from '@leafer/interface'
 import { PathConvert, LeafData, Debug } from '@leafer/core'
 
-import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
+import { IShadowEffect, IUI, IUIData, ILeafPaint } from '@leafer-ui/interface'
 import { Paint, PaintImage } from '@leafer-ui/external'
 
 
-const { parse } = PathConvert
+const { parse, objectToCanvasData } = PathConvert
 const emptyPaint: ILeafPaint = {}
 const debug = Debug.get('UIData')
 export class UIData extends LeafData implements IUIData {
@@ -26,14 +26,16 @@ export class UIData extends LeafData implements IUIData {
             let { scaleX } = ui.__nowWorld || ui.__world
             if (scaleX < 0) scaleX = -scaleX
             return scaleX > 1 ? strokeWidth / scaleX : strokeWidth
-        } else {
-            return strokeWidth
-        }
+        } else return strokeWidth
     }
 
+    public get __hasStroke(): boolean { return (this as IUIData).stroke && (this as IUIData).strokeWidth as unknown as boolean }
+
     public __pixelFill?: boolean // png / svg / webp
     public __pixelStroke?: boolean
 
+    public get __clipAfterFill(): boolean { return ((this as IUIData).cornerRadius || (this as IUIData).__pathInputed) as unknown as boolean } // 用于 __drawAfterFill()
+
     public __needComputePaint: boolean
 
     protected _visible?: IBoolean
@@ -67,9 +69,7 @@ export class UIData extends LeafData implements IUIData {
             this._width = -value
             this.__leaf.scaleX *= -1
             debug.warn('width < 0, instead -scaleX ', this)
-        } else {
-            this._width = value
-        }
+        } else this._width = value
     }
 
     protected setHeight(value: INumber) {
@@ -77,9 +77,7 @@ export class UIData extends LeafData implements IUIData {
             this._height = -value
             this.__leaf.scaleY *= -1
             debug.warn('height < 0, instead -scaleY', this)
-        } else {
-            this._height = value
-        }
+        } else this._height = value
     }
 
 
@@ -119,13 +117,14 @@ export class UIData extends LeafData implements IUIData {
     }
 
 
-    protected setPath(value: IPathCommandData | IPathString) {
-        if (typeof value === 'string') {
+    protected setPath(value: IPathCommandData | IPathCommandObject[] | IPathString) {
+        const isString = typeof value === 'string'
+        if (isString || (value && typeof value[0] === 'object')) {
             this.__setInput('path', value)
-            this._path = parse(value)
+            this._path = isString ? parse(value) : objectToCanvasData(value as IPathCommandObject[])
         } else {
             if (this.__input) this.__removeInput('path')
-            this._path = value
+            this._path = value as IPathCommandData
         }
     }
 
@@ -135,11 +134,7 @@ export class UIData extends LeafData implements IUIData {
         if (value instanceof Array) {
             if (value.some((item: IShadowEffect) => item.visible === false)) value = value.filter((item: IShadowEffect) => item.visible !== false)
             this._shadow = value.length ? value : null
-        } else if (value) {
-            this._shadow = (value as IShadowEffect).visible === false ? null : [value]
-        } else {
-            this._shadow = null
-        }
+        } else this._shadow = value && (value as IShadowEffect).visible !== false ? [value] : null
     }
 
     protected setInnerShadow(value: IValue) {
@@ -147,11 +142,7 @@ export class UIData extends LeafData implements IUIData {
         if (value instanceof Array) {
             if (value.some((item: IShadowEffect) => item.visible === false)) value = value.filter((item: IShadowEffect) => item.visible !== false)
             this._innerShadow = value.length ? value : null
-        } else if (value) {
-            this._innerShadow = (value as IShadowEffect).visible === false ? null : [value]
-        } else {
-            this._innerShadow = null
-        }
+        } else this._innerShadow = value && (value as IShadowEffect).visible !== false ? [value] : null
     }
 
     // custom
@@ -163,14 +154,4 @@ export class UIData extends LeafData implements IUIData {
         this.__needComputePaint = false
     }
 
-}
-
-
-export const UnitConvert = {
-
-    number(value: number | IUnitData, percentRefer?: number): number {
-        if (typeof value === 'object') return value.type === 'percent' ? value.value * percentRefer : value.value
-        return value
-    }
-
-} 
+}

package/src/index.ts

@@ -1,4 +1,4 @@
-export { UIData, UnitConvert } from './UIData'
+export { UIData } from './UIData'
 export { GroupData } from './GroupData'
 export { BoxData } from './BoxData'
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { INumber, IPointData, IBoolean, IValue, IPathCommandData, IPathString } from '@leafer/interface';
+import { INumber, IPointData, IBoolean, IValue, IPathCommandData, IPathCommandObject, IPathString } from '@leafer/interface';
 import { LeafData } from '@leafer/core';
-import { IUIData, IUI, IUnitData, IGroupData, IBoxData, ILeaferData, IObject, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IFontWeight, IImageData, IImage, ICanvasData } from '@leafer-ui/interface';
+import { IUIData, IUI, IGroupData, IBoxData, ILeaferData, IObject, IJSONOptions, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IFontWeight, IImageData, IImage, ICanvasData } from '@leafer-ui/interface';
 
 declare class UIData extends LeafData implements IUIData {
     __leaf: IUI;
@@ -9,8 +9,10 @@ declare class UIData extends LeafData implements IUIData {
     __isFills?: boolean;
     __isStrokes?: boolean;
     get __strokeWidth(): number;
+    get __hasStroke(): boolean;
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
+    get __clipAfterFill(): boolean;
     __needComputePaint: boolean;
     protected _visible?: IBoolean;
     protected _width?: INumber;
@@ -29,24 +31,23 @@ declare class UIData extends LeafData implements IUIData {
     protected setHeight(value: INumber): void;
     protected setFill(value: IValue): void;
     protected setStroke(value: IValue): void;
-    protected setPath(value: IPathCommandData | IPathString): void;
+    protected setPath(value: IPathCommandData | IPathCommandObject[] | IPathString): void;
     protected setShadow(value: IValue): void;
     protected setInnerShadow(value: IValue): void;
     __computePaint(): void;
 }
-declare const UnitConvert: {
-    number(value: number | IUnitData, percentRefer?: number): number;
-};
 
 declare class GroupData extends UIData implements IGroupData {
 }
 
 declare class BoxData extends GroupData implements IBoxData {
     get __boxStroke(): boolean;
+    get __drawAfterFill(): boolean;
+    get __clipAfterFill(): boolean;
 }
 
 declare class LeaferData extends GroupData implements ILeaferData {
-    __getInputData(): IObject;
+    __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject;
 }
 
 declare class FrameData extends BoxData implements IFrameData {
@@ -70,6 +71,7 @@ declare class StarData extends UIData implements IStarData {
 }
 
 declare class PathData extends UIData implements IPathData {
+    get __pathInputed(): number;
 }
 
 declare class PenData extends GroupData implements IPenData {
@@ -87,11 +89,13 @@ declare class ImageData extends RectData implements IImageData {
     protected setUrl(value: string): void;
     __setImageFill(value: string): void;
     __getData(): IObject;
-    __getInputData(): IObject;
+    __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject;
 }
 
 declare class CanvasData extends RectData implements ICanvasData {
-    __getInputData(): IObject;
+    get __isCanvas(): boolean;
+    get __drawAfterFill(): boolean;
+    __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject;
 }
 
-export { BoxData, CanvasData, EllipseData, FrameData, GroupData, ImageData, LeaferData, LineData, PathData, PenData, PolygonData, RectData, StarData, TextData, UIData, UnitConvert };
+export { BoxData, CanvasData, EllipseData, FrameData, GroupData, ImageData, LeaferData, LineData, PathData, PenData, PolygonData, RectData, StarData, TextData, UIData };