@leafer-ui/data 2.0.9 → 2.1.1

package/package.json

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

package/src/CanvasData.ts

@@ -13,4 +13,5 @@ export class CanvasData extends RectData implements ICanvasData {
         data.url = (this.__leaf as ICanvas).canvas.toDataURL('image/png') as string
         return data
     }
+
 }

package/src/EllipseData.ts

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

package/src/ImageData.ts

@@ -32,4 +32,5 @@ export class ImageData extends RectData implements IImageData {
         if (data.url) delete data.fill
         return data
     }
+
 }

package/src/LeaferData.ts

@@ -11,4 +11,5 @@ export class LeaferData extends GroupData implements ILeaferData {
         canvasSizeAttrs.forEach(key => delete (data as IObject)[key])
         return data
     }
+
 }

package/src/PathData.ts

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

package/src/PolygonData.ts

@@ -1,8 +1,12 @@
 import { IPolygonData } from '@leafer-ui/interface'
 
-import { LineData } from './LineData'
+import { UIData } from "./UIData"
 
 
-export class PolygonData extends LineData implements IPolygonData {
+export class PolygonData extends UIData implements IPolygonData {
+
+    public get __usePathBox(): boolean {
+        return ((this as IPolygonData).points || (this as IPolygonData).__pathInputed) as any as boolean
+    }
 
 }

package/src/RectData.ts

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

package/src/StarData.ts

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

package/src/UIData.ts

@@ -22,7 +22,10 @@ export class UIData extends LeafData implements IUIData {
 
     public get __strokeWidth(): number { return this.__getRealStrokeWidth() }
 
-    public get __maxStrokeWidth(): number { const t = this as IUIData; return t.__hasMultiStrokeStyle ? Math.max(t.__hasMultiStrokeStyle, t.strokeWidth) : t.strokeWidth }
+    public get __maxStrokeWidth(): number {
+        const t = this as IUIData, strokeWidth = t.__hasStrokeSides || t.strokeWidth
+        return t.__hasMultiStrokeStyle ? Math.max(t.__hasMultiStrokeStyle, strokeWidth) : strokeWidth
+    }
 
     public __hasMultiStrokeStyle?: number // 是否存在多个不同的描述样式（同时存储多个描边样式中的最大宽度用于运算）
 
@@ -108,7 +111,7 @@ export class UIData extends LeafData implements IUIData {
         const isStr = isString(value)
         if (isStr || (value && isObject(value[0]))) {
             this.__setInput('path', value)
-            this._path = isStr ? parse(value) : objectToCanvasData(value as IPathCommandObject[])
+            this._path = isStr ? parse(value, (this as IUIData).__useArrow) : objectToCanvasData(value as IPathCommandObject[])
         } else {
             if (this.__input) this.__removeInput('path')
             this._path = value as IPathCommandData
@@ -154,6 +157,11 @@ export class UIData extends LeafData implements IUIData {
         return strokeWidth
     }
 
+    public __checkComplex(): void {
+        const t = this as IUIData
+        stintSet(t, '__complex', (t.__isFills || t.__isStrokes || t.cornerRadius || t.__useEffect) as boolean)
+    }
+
 
     public __setPaint(attrName: 'fill' | 'stroke', value: IValue): void {
         this.__setInput(attrName, value)

package/types/index.d.ts

@@ -42,6 +42,7 @@ declare class UIData extends LeafData implements IUIData {
     protected setFilter(value: IValue): void;
     __computePaint(): void;
     __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number;
+    __checkComplex(): void;
     __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
     __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
 }
@@ -74,7 +75,8 @@ declare class EllipseData extends UIData implements IEllipseData {
     get __boxStroke(): boolean;
 }
 
-declare class PolygonData extends LineData implements IPolygonData {
+declare class PolygonData extends UIData implements IPolygonData {
+    get __usePathBox(): boolean;
 }
 
 declare class StarData extends UIData implements IStarData {