@logicflow/extension 2.2.0-alpha.5 → 2.2.0-alpha.6

package/es/components/control/index.js

@@ -132,14 +132,14 @@ var Control = /** @class */ (function () {
             else {
                 itemContainer.append(icon);
             }
-            switch (item.text) {
-                case '上一步':
+            switch (item.key) {
+                case 'undo':
                     _this.lf.on('history:change', function (_a) {
                         var undoAble = _a.data.undoAble;
                         itemContainer.className = undoAble ? NORMAL : DISABLED;
                     });
                     break;
-                case '下一步':
+                case 'redo':
                     _this.lf.on('history:change', function (_a) {
                         var redoAble = _a.data.redoAble;
                         itemContainer.className = redoAble ? NORMAL : DISABLED;

package/es/materials/curved-edge/index.js

@@ -127,38 +127,54 @@ function getMidPoints(cur, key, orientation, radius) {
             return [];
     }
 }
-function getPartialPath(prev, cur, next, radius) {
+/**
+ * 生成局部路径片段（包含圆角）
+ * - 输入为上一个顶点、当前拐点、下一个顶点，计算方向组合并选择圆弧象限
+ * - 将圆角半径限制在相邻两段长度的一半以内，避免过度弯曲
+ * @param prevPoint 上一个顶点
+ * @param cornerPoint 当前拐点（圆角所在拐点）
+ * @param nextPoint 下一个顶点
+ * @param cornerRadius 圆角半径上限
+ * @returns 局部 path 字符串（包含 L/Q 操作）
+ */
+function getPartialPath(prevPoint, cornerPoint, nextPoint, cornerRadius) {
     var _a;
-    // 定义误差容错变量
-    var tolerance = 1;
-    var dir1 = '';
-    var dir2 = '';
-    if (Math.abs(prev[0] - cur[0]) <= tolerance) {
-        // 垂直方向
-        dir1 = prev[1] > cur[1] ? 't' : 'b';
-    }
-    else if (Math.abs(prev[1] - cur[1]) <= tolerance) {
-        // 水平方向
-        dir1 = prev[0] > cur[0] ? 'l' : 'r';
-    }
-    if (Math.abs(cur[0] - next[0]) <= tolerance) {
-        dir2 = cur[1] > next[1] ? 't' : 'b';
-    }
-    else if (Math.abs(cur[1] - next[1]) <= tolerance) {
-        dir2 = cur[0] > next[0] ? 'l' : 'r';
-    }
-    var r = Math.min(Math.hypot(cur[0] - prev[0], cur[1] - prev[1]) / 2, Math.hypot(next[0] - cur[0], next[1] - cur[1]) / 2, radius) || (1 / 5) * radius;
+    // 轴对齐容差（像素），用于消除微小误差
+    var epsilon = 1;
+    var resolveDir = function (a, b) {
+        var dx = b[0] - a[0];
+        var dy = b[1] - a[1];
+        var adx = Math.abs(dx);
+        var ady = Math.abs(dy);
+        if (ady <= epsilon && adx > epsilon) {
+            return dx < 0 ? 'l' : 'r';
+        }
+        if (adx <= epsilon && ady > epsilon) {
+            return dy < 0 ? 't' : 'b';
+        }
+        if (adx <= epsilon && ady <= epsilon) {
+            return '';
+        }
+        // 非严格对齐时，选择更接近的轴
+        return adx < ady ? (dx < 0 ? 'l' : 'r') : dy < 0 ? 't' : 'b';
+    };
+    var dir1 = resolveDir(prevPoint, cornerPoint);
+    var dir2 = resolveDir(cornerPoint, nextPoint);
+    var r = Math.min(Math.hypot(cornerPoint[0] - prevPoint[0], cornerPoint[1] - prevPoint[1]) /
+        2, Math.hypot(nextPoint[0] - cornerPoint[0], nextPoint[1] - cornerPoint[1]) /
+        2, cornerRadius) || (1 / 5) * cornerRadius;
     var key = "".concat(dir1).concat(dir2);
     var orientation = directionMap[key] || '-';
-    var path = "L ".concat(prev[0], " ").concat(prev[1]);
+    var path = '';
     if (orientation === '-') {
-        path += "L ".concat(cur[0], " ").concat(cur[1], " L ").concat(next[0], " ").concat(next[1]);
+        // 仅移动到当前拐点，由下一次迭代决定如何从拐点继续（直线或圆角）
+        path += "L ".concat(cornerPoint[0], " ").concat(cornerPoint[1]);
     }
     else {
-        var _b = __read(getMidPoints(cur, key, orientation, r), 2), mid1 = _b[0], mid2 = _b[1];
+        var _b = __read(getMidPoints(cornerPoint, key, orientation, r), 2), mid1 = _b[0], mid2 = _b[1];
         if (mid1 && mid2) {
-            path += "L ".concat(mid1[0], " ").concat(mid1[1], " Q ").concat(cur[0], " ").concat(cur[1], " ").concat(mid2[0], " ").concat(mid2[1]);
-            _a = __read(mid2, 2), cur[0] = _a[0], cur[1] = _a[1];
+            path += "L ".concat(mid1[0], " ").concat(mid1[1], " Q ").concat(cornerPoint[0], " ").concat(cornerPoint[1], " ").concat(mid2[0], " ").concat(mid2[1]);
+            _a = __read(mid2, 2), cornerPoint[0] = _a[0], cornerPoint[1] = _a[1];
         }
     }
     return path;

package/lib/components/control/index.js

@@ -135,14 +135,14 @@ var Control = /** @class */ (function () {
             else {
                 itemContainer.append(icon);
             }
-            switch (item.text) {
-                case '上一步':
+            switch (item.key) {
+                case 'undo':
                     _this.lf.on('history:change', function (_a) {
                         var undoAble = _a.data.undoAble;
                         itemContainer.className = undoAble ? NORMAL : DISABLED;
                     });
                     break;
-                case '下一步':
+                case 'redo':
                     _this.lf.on('history:change', function (_a) {
                         var redoAble = _a.data.redoAble;
                         itemContainer.className = redoAble ? NORMAL : DISABLED;

package/lib/materials/curved-edge/index.js

@@ -130,38 +130,54 @@ function getMidPoints(cur, key, orientation, radius) {
             return [];
     }
 }
-function getPartialPath(prev, cur, next, radius) {
+/**
+ * 生成局部路径片段（包含圆角）
+ * - 输入为上一个顶点、当前拐点、下一个顶点，计算方向组合并选择圆弧象限
+ * - 将圆角半径限制在相邻两段长度的一半以内，避免过度弯曲
+ * @param prevPoint 上一个顶点
+ * @param cornerPoint 当前拐点（圆角所在拐点）
+ * @param nextPoint 下一个顶点
+ * @param cornerRadius 圆角半径上限
+ * @returns 局部 path 字符串（包含 L/Q 操作）
+ */
+function getPartialPath(prevPoint, cornerPoint, nextPoint, cornerRadius) {
     var _a;
-    // 定义误差容错变量
-    var tolerance = 1;
-    var dir1 = '';
-    var dir2 = '';
-    if (Math.abs(prev[0] - cur[0]) <= tolerance) {
-        // 垂直方向
-        dir1 = prev[1] > cur[1] ? 't' : 'b';
-    }
-    else if (Math.abs(prev[1] - cur[1]) <= tolerance) {
-        // 水平方向
-        dir1 = prev[0] > cur[0] ? 'l' : 'r';
-    }
-    if (Math.abs(cur[0] - next[0]) <= tolerance) {
-        dir2 = cur[1] > next[1] ? 't' : 'b';
-    }
-    else if (Math.abs(cur[1] - next[1]) <= tolerance) {
-        dir2 = cur[0] > next[0] ? 'l' : 'r';
-    }
-    var r = Math.min(Math.hypot(cur[0] - prev[0], cur[1] - prev[1]) / 2, Math.hypot(next[0] - cur[0], next[1] - cur[1]) / 2, radius) || (1 / 5) * radius;
+    // 轴对齐容差（像素），用于消除微小误差
+    var epsilon = 1;
+    var resolveDir = function (a, b) {
+        var dx = b[0] - a[0];
+        var dy = b[1] - a[1];
+        var adx = Math.abs(dx);
+        var ady = Math.abs(dy);
+        if (ady <= epsilon && adx > epsilon) {
+            return dx < 0 ? 'l' : 'r';
+        }
+        if (adx <= epsilon && ady > epsilon) {
+            return dy < 0 ? 't' : 'b';
+        }
+        if (adx <= epsilon && ady <= epsilon) {
+            return '';
+        }
+        // 非严格对齐时，选择更接近的轴
+        return adx < ady ? (dx < 0 ? 'l' : 'r') : dy < 0 ? 't' : 'b';
+    };
+    var dir1 = resolveDir(prevPoint, cornerPoint);
+    var dir2 = resolveDir(cornerPoint, nextPoint);
+    var r = Math.min(Math.hypot(cornerPoint[0] - prevPoint[0], cornerPoint[1] - prevPoint[1]) /
+        2, Math.hypot(nextPoint[0] - cornerPoint[0], nextPoint[1] - cornerPoint[1]) /
+        2, cornerRadius) || (1 / 5) * cornerRadius;
     var key = "".concat(dir1).concat(dir2);
     var orientation = directionMap[key] || '-';
-    var path = "L ".concat(prev[0], " ").concat(prev[1]);
+    var path = '';
     if (orientation === '-') {
-        path += "L ".concat(cur[0], " ").concat(cur[1], " L ").concat(next[0], " ").concat(next[1]);
+        // 仅移动到当前拐点，由下一次迭代决定如何从拐点继续（直线或圆角）
+        path += "L ".concat(cornerPoint[0], " ").concat(cornerPoint[1]);
     }
     else {
-        var _b = __read(getMidPoints(cur, key, orientation, r), 2), mid1 = _b[0], mid2 = _b[1];
+        var _b = __read(getMidPoints(cornerPoint, key, orientation, r), 2), mid1 = _b[0], mid2 = _b[1];
         if (mid1 && mid2) {
-            path += "L ".concat(mid1[0], " ").concat(mid1[1], " Q ").concat(cur[0], " ").concat(cur[1], " ").concat(mid2[0], " ").concat(mid2[1]);
-            _a = __read(mid2, 2), cur[0] = _a[0], cur[1] = _a[1];
+            path += "L ".concat(mid1[0], " ").concat(mid1[1], " Q ").concat(cornerPoint[0], " ").concat(cornerPoint[1], " ").concat(mid2[0], " ").concat(mid2[1]);
+            _a = __read(mid2, 2), cornerPoint[0] = _a[0], cornerPoint[1] = _a[1];
         }
     }
     return path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/extension",
-  "version": "2.2.0-alpha.5",
+  "version": "2.2.0-alpha.6",
   "description": "LogicFlow Extensions",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -20,8 +20,8 @@
   "author": "Logicflow-Team",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@logicflow/core": "2.2.0-alpha.5",
-    "@logicflow/vue-node-registry": "1.2.0-alpha.5"
+    "@logicflow/core": "2.2.0-alpha.6",
+    "@logicflow/vue-node-registry": "1.2.0-alpha.6"
   },
   "dependencies": {
     "@antv/hierarchy": "^0.6.11",
@@ -32,8 +32,8 @@
     "preact": "^10.17.1",
     "rangy": "^1.3.1",
     "vanilla-picker": "^2.12.3",
-    "@logicflow/core": "2.2.0-alpha.5",
-    "@logicflow/vue-node-registry": "1.2.0-alpha.5"
+    "@logicflow/core": "2.2.0-alpha.6",
+    "@logicflow/vue-node-registry": "1.2.0-alpha.6"
   },
   "devDependencies": {
     "less": "^4.1.1",

package/src/components/control/index.ts

@@ -130,13 +130,13 @@ export class Control {
       } else {
         itemContainer.append(icon)
       }
-      switch (item.text) {
-        case '上一步':
+      switch (item.key) {
+        case 'undo':
           this.lf.on('history:change', ({ data: { undoAble } }: any) => {
             itemContainer.className = undoAble ? NORMAL : DISABLED
           })
           break
-        case '下一步':
+        case 'redo':
           this.lf.on('history:change', ({ data: { redoAble } }: any) => {
             itemContainer.className = redoAble ? NORMAL : DISABLED
           })

package/src/materials/curved-edge/index.ts

@@ -97,50 +97,67 @@ function getMidPoints(
   }
 }
 
+/**
+ * 生成局部路径片段（包含圆角）
+ * - 输入为上一个顶点、当前拐点、下一个顶点，计算方向组合并选择圆弧象限
+ * - 将圆角半径限制在相邻两段长度的一半以内，避免过度弯曲
+ * @param prevPoint 上一个顶点
+ * @param cornerPoint 当前拐点（圆角所在拐点）
+ * @param nextPoint 下一个顶点
+ * @param cornerRadius 圆角半径上限
+ * @returns 局部 path 字符串（包含 L/Q 操作）
+ */
 function getPartialPath(
-  prev: PointTuple,
-  cur: PointTuple,
-  next: PointTuple,
-  radius: number,
+  prevPoint: PointTuple,
+  cornerPoint: PointTuple,
+  nextPoint: PointTuple,
+  cornerRadius: number,
 ): string {
-  // 定义误差容错变量
-  const tolerance = 1
-
-  let dir1: DirectionType = ''
-  let dir2: DirectionType = ''
-
-  if (Math.abs(prev[0] - cur[0]) <= tolerance) {
-    // 垂直方向
-    dir1 = prev[1] > cur[1] ? 't' : 'b'
-  } else if (Math.abs(prev[1] - cur[1]) <= tolerance) {
-    // 水平方向
-    dir1 = prev[0] > cur[0] ? 'l' : 'r'
+  // 轴对齐容差（像素），用于消除微小误差
+  const epsilon = 1
+
+  const resolveDir = (a: PointTuple, b: PointTuple): DirectionType => {
+    const dx = b[0] - a[0]
+    const dy = b[1] - a[1]
+    const adx = Math.abs(dx)
+    const ady = Math.abs(dy)
+    if (ady <= epsilon && adx > epsilon) {
+      return dx < 0 ? 'l' : 'r'
+    }
+    if (adx <= epsilon && ady > epsilon) {
+      return dy < 0 ? 't' : 'b'
+    }
+    if (adx <= epsilon && ady <= epsilon) {
+      return ''
+    }
+    // 非严格对齐时，选择更接近的轴
+    return adx < ady ? (dx < 0 ? 'l' : 'r') : dy < 0 ? 't' : 'b'
   }
 
-  if (Math.abs(cur[0] - next[0]) <= tolerance) {
-    dir2 = cur[1] > next[1] ? 't' : 'b'
-  } else if (Math.abs(cur[1] - next[1]) <= tolerance) {
-    dir2 = cur[0] > next[0] ? 'l' : 'r'
-  }
+  const dir1: DirectionType = resolveDir(prevPoint, cornerPoint)
+  const dir2: DirectionType = resolveDir(cornerPoint, nextPoint)
 
   const r =
     Math.min(
-      Math.hypot(cur[0] - prev[0], cur[1] - prev[1]) / 2,
-      Math.hypot(next[0] - cur[0], next[1] - cur[1]) / 2,
-      radius,
-    ) || (1 / 5) * radius
+      Math.hypot(cornerPoint[0] - prevPoint[0], cornerPoint[1] - prevPoint[1]) /
+        2,
+      Math.hypot(nextPoint[0] - cornerPoint[0], nextPoint[1] - cornerPoint[1]) /
+        2,
+      cornerRadius,
+    ) || (1 / 5) * cornerRadius
 
   const key = `${dir1}${dir2}`
   const orientation: ArcQuadrantType = directionMap[key] || '-'
-  let path = `L ${prev[0]} ${prev[1]}`
+  let path = ''
 
   if (orientation === '-') {
-    path += `L ${cur[0]} ${cur[1]} L ${next[0]} ${next[1]}`
+    // 仅移动到当前拐点，由下一次迭代决定如何从拐点继续（直线或圆角）
+    path += `L ${cornerPoint[0]} ${cornerPoint[1]}`
   } else {
-    const [mid1, mid2] = getMidPoints(cur, key, orientation, r)
+    const [mid1, mid2] = getMidPoints(cornerPoint, key, orientation, r)
     if (mid1 && mid2) {
-      path += `L ${mid1[0]} ${mid1[1]} Q ${cur[0]} ${cur[1]} ${mid2[0]} ${mid2[1]}`
-      ;[cur[0], cur[1]] = mid2
+      path += `L ${mid1[0]} ${mid1[1]} Q ${cornerPoint[0]} ${cornerPoint[1]} ${mid2[0]} ${mid2[1]}`
+      ;[cornerPoint[0], cornerPoint[1]] = mid2
     }
   }
   return path