@leafer-in/arrow 1.9.4 → 1.9.6

package/src/PathArrowModule.ts

@@ -1,4 +1,4 @@
-import { IPathArrowModule, IUI, IPathCommandData, IPointData } from '@leafer-ui/interface'
+import { IPathArrowModule, IUI, IPathCommandData, IPointData, IPathDataArrow } from '@leafer-ui/interface'
 import { PathCommandMap as Command, PointHelper } from '@leafer-ui/draw'
 
 import { arrows, getArrowPath } from './data/arrows'
@@ -15,8 +15,10 @@ export const PathArrowModule: IPathArrowModule = {
 
     list: arrows,
 
-    addArrows(ui: IUI, changeRenderPath?: boolean): void {
-        const { startArrow, endArrow, strokeWidth, dashPattern, __pathForRender: data } = ui.__
+    addArrows(ui: IUI): void {
+        const { startArrow, endArrow, strokeWidth, dashPattern, __pathForRender: data, cornerRadius } = ui.__
+
+        const clonePathForArrow = !cornerRadius // cornerRadius会创建新的render路径，所以不用再clone
 
         let command: number, i = 0, len = data.length, count = 0, useStartArrow = startArrow && startArrow !== 'none'
 
@@ -34,11 +36,11 @@ export const PathArrowModule: IPathArrowModule = {
                     i += 3
                     break
                 case C:  // bezierCurveTo(x1, y1, x2, y2, x, y)
-                    if (count === 1 || i + 7 === len) copyPoints(data, last, now, i + 3)
+                    if (count === 1 || i + 7 >= len - 3) copyPoints(data, last, now, i + 3) // C 或 C + L结束
                     i += 7
                     break
                 case Q:  // quadraticCurveTo(x1, y1, x, y)
-                    if (count === 1 || i + 5 === len) copyPoints(data, last, now, i + 1)
+                    if (count === 1 || i + 5 >= len - 3) copyPoints(data, last, now, i + 1) // Q 或 Q + L结束
                     i += 5
                     break
                 case Z:  // closepath()
@@ -68,7 +70,13 @@ export const PathArrowModule: IPathArrowModule = {
                     i += 4
                     break
                 case U: // arcTo(x1, y1, x2, y2, radius)
-                    if (count === 1 || i + 6 === len) copyPoints(data, last, now, i + 1)
+                    if (count === 1 || i + 6 >= len - 3) { // U 或 U + L结束
+                        copyPoints(data, last, now, i + 1)
+                        if (i + 6 !== len) { // 避免与结束点重合
+                            now.x -= (now.x - last.x) / 10
+                            now.y -= (now.y - last.y) / 10
+                        }
+                    }
                     i += 6
                     break
             }
@@ -79,7 +87,7 @@ export const PathArrowModule: IPathArrowModule = {
             if (count === 2 && useStartArrow) copy(second, command === L ? now : last)
 
             if (i === len) {
-                const path = ui.__.__pathForRender = changeRenderPath ? [...data] : data
+                const path = ui.__.__pathForRender = clonePathForArrow ? [...data] : data
                 const pathForArrow: IPathCommandData = ui.__.__pathForArrow = []
 
                 if (useStartArrow) {
@@ -124,10 +132,20 @@ export const PathArrowModule: IPathArrowModule = {
         }
 
 
+    },
+
+    register(name: string, data: IPathDataArrow): void {
+        this.list[name] = data
+    },
+
+    get(name: string): IPathDataArrow {
+        return this.list[name]
     }
+
 }
 
 
+
 function copyPoints(data: IPathCommandData, from: IPointData, to: IPointData, startIndex: number): void {
     copyFrom(from, data[startIndex], data[startIndex + 1])
     copyFrom(to, data[startIndex + 2], data[startIndex + 3])

package/src/data/arrows.ts

@@ -1,4 +1,4 @@
-import { IArrowType, IPathDataArrow, IPathDataArrowMap, IUI, IPathCommandData, IPointData } from '@leafer-ui/interface'
+import { IArrowStyle, IArrowTypeData, IPathDataArrow, IPathDataArrowMap, IUI, IPathCommandData, IPointData } from '@leafer-ui/interface'
 import { DataHelper, PointHelper, isObject } from '@leafer-ui/draw'
 
 import { PathMatrixHelper } from '../PathMatrixHelper'
@@ -55,9 +55,21 @@ export const arrows: IPathDataArrowMap = {
 
 }
 
-export function getArrowPath(ui: IUI, arrow: IArrowType, from: IPointData, to: IPointData, scale: number, connectOffset: IPointData, hasDashPattern?: boolean): IPathCommandData {
+export function getArrowPath(ui: IUI, arrow: IArrowStyle, from: IPointData, to: IPointData, size: number, connectOffset: IPointData, hasDashPattern?: boolean): IPathCommandData {
+    let pathData: IPathDataArrow, scale: number
+
     const { strokeCap, strokeJoin } = ui.__
-    const { offset, connect, path, dashPath } = isObject(arrow) ? arrow : arrows[arrow]
+
+    if (isObject(arrow)) {
+        if ((arrow as IArrowTypeData).type) {
+            scale = (arrow as IArrowTypeData).scale
+            pathData = arrows[(arrow as IArrowTypeData).type]
+        } else pathData = arrow as IPathDataArrow
+    } else {
+        pathData = arrows[arrow]
+    }
+
+    const { offset, connect, path, dashPath } = pathData
 
     let connectX = connect ? connect.x : 0
     let offsetX = offset ? offset.x : 0
@@ -71,9 +83,12 @@ export function getArrowPath(ui: IUI, arrow: IArrowType, from: IPointData, to: I
         else if (strokeJoin === 'bevel' && offset.bevelJoin) offsetX += offset.bevelJoin
     }
 
+    if (scale) layout(data, 0, 0, scale, scale) // 预留箭头比例缩放功能
+
     if (offsetX) layout(data, offsetX, 0)
-    layout(data, to.x, to.y, scale, scale, getAngle(from, to))
 
-    connectOffset.x = (connectX + offsetX) * scale
+    layout(data, to.x, to.y, size, size, getAngle(from, to)) // scale rotate 先围绕 data 数据应用后，再加 to
+
+    connectOffset.x = (connectX + offsetX) * size
     return data
 }

package/types/index.d.ts

@@ -1,12 +1,13 @@
 import * as _leafer_ui_interface from '@leafer-ui/interface';
-import { IArrow, IArrowData, IArrowType, IArrowInputData, IPathArrowModule, IPathCommandData, IPointData, IValue } from '@leafer-ui/interface';
+import { IArrow, IArrowData, IArrowStyle, IArrowInputData, IPathDataArrow, IPathArrowModule, IPathCommandData, IPointData, IValue } from '@leafer-ui/interface';
 import { Line, LineData } from '@leafer-ui/draw';
 
 declare class Arrow extends Line implements IArrow {
     get __tag(): string;
     __: IArrowData;
-    endArrow?: IArrowType;
+    endArrow?: IArrowStyle;
     constructor(data?: IArrowInputData);
+    static registerArrow(name: string, data: IPathDataArrow): void;
 }
 
 declare class ArrowData extends LineData implements IArrowData {