@leafer-ui/display 2.1.6 → 2.1.7

package/package.json

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

package/src/Ellipse.ts

@@ -1,5 +1,5 @@
-import { INumber } from '@leafer/interface'
-import { PathCommandDataHelper, Platform, dataProcessor, pathType, registerUI } from '@leafer/core'
+import { INumber, IPointData } from '@leafer/interface'
+import { PathCommandDataHelper, Platform, dataProcessor, pathType, registerUI, PointHelper } from '@leafer/core'
 
 import { IEllipse, IEllipseInputData, IEllipseData } from '@leafer-ui/interface'
 import { EllipseData } from '@leafer-ui/data'
@@ -7,7 +7,7 @@ import { EllipseData } from '@leafer-ui/data'
 import { UI } from './UI'
 
 
-const { moveTo, closePath, ellipse } = PathCommandDataHelper
+const { moveTo, closePath, ellipse } = PathCommandDataHelper, { tempPoint, set, rotate } = PointHelper, { abs } = Math, tempCenter = {} as IPointData
 
 @registerUI()
 export class Ellipse<TInputData = IEllipseInputData> extends UI<TInputData> implements IEllipse {
@@ -29,31 +29,54 @@ export class Ellipse<TInputData = IEllipseInputData> extends UI<TInputData> impl
 
     public __updatePath(): void {
 
-        const data = this.__, { width, height, innerRadius, startAngle, endAngle } = data
+        const data = this.__, { width, height, innerRadius, startAngle, endAngle, closed } = data
         const rx = width / 2, ry = height / 2
 
         const path: number[] = data.path = []
-        let open: boolean
+        let open: boolean, hasAngle: boolean, closedAngle: boolean
+
+        if (startAngle || endAngle) hasAngle = true
+        if (hasAngle) closedAngle = abs(endAngle - startAngle) === 360
 
         if (innerRadius) {
 
-            if (startAngle || endAngle) {
-                if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false)
-                else open = true // 画弧线时，不能闭合路径
-                ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true)
+            const drawInnerEllipse = innerRadius < 1 || closed
+            let outerStartAngle = startAngle, outerEndAngle = endAngle, outerAnticlockwise: boolean
+
+            if (hasAngle) {
+                if (drawInnerEllipse) {
+                    ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle)
+                    if (closedAngle) {
+                        set(tempPoint, width, ry)
+                        set(tempCenter, rx, ry)
+                        rotate(tempPoint, endAngle, tempCenter, rx, ry)
+                        moveTo(path, tempPoint.x, tempPoint.y)
+                    }
+                    outerStartAngle = endAngle
+                    outerEndAngle = startAngle
+                    outerAnticlockwise = true
+                } else {
+                    if (!closedAngle) open = true // 画弧线
+                }
             } else {
-                if (innerRadius < 1) {
+                if (drawInnerEllipse) {
                     ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius)
+                    closePath(path)
                     moveTo(path, width, ry)
+                    outerStartAngle = 360
+                    outerAnticlockwise = true
+                } else {
+                    outerEndAngle = 360
                 }
-                ellipse(path, rx, ry, rx, ry, 0, 360, 0, true)
             }
 
+            ellipse(path, rx, ry, rx, ry, 0, outerStartAngle, outerEndAngle, outerAnticlockwise)
+
         } else {
 
-            if (startAngle || endAngle) {
-                moveTo(path, rx, ry)
-                ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle, false)
+            if (hasAngle) {
+                if (!closedAngle) moveTo(path, rx, ry)
+                ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle)
             } else {
                 ellipse(path, rx, ry, rx, ry)
             }

package/src/UI.ts

@@ -515,7 +515,7 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         return Plugin.need('animate')
     }
 
-    // create
+    public killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void { }
 
     // @leafer-in/export will rewrite
     public export(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): Promise<IExportResult> {
@@ -571,7 +571,4 @@ export interface UI {
     createProxyData(): IUIInputData
     clearProxyData(): void
 
-    // @leafer-in/animate rewrite
-    killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void
-
 }

package/types/index.d.ts

@@ -150,6 +150,7 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     __drawPathByBox(drawer: IPathDrawer, ignoreCornerRadius?: boolean): void;
     drawImagePlaceholder(_paint: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate;
+    killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void;
     export(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): Promise<IExportResult>;
     syncExport(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): IExportResult;
     clone(data?: IUIInputData): this;
@@ -165,7 +166,6 @@ interface UI {
     reset(data?: IUIInputData): void;
     createProxyData(): IUIInputData;
     clearProxyData(): void;
-    killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void;
 }
 
 declare class Group<TInputData = IGroupInputData> extends UI<TInputData> implements IGroup {