aldehyde 0.2.493 → 0.2.495

package/src/aldehyde/draw-canvas-edit/components/render/tools/z-index-tool.ts

@@ -1,225 +1,225 @@
-import Konva from 'konva';
-import { Render } from '../index';
-import { GraphDraw, LinkDraw, RulerDraw, PreviewDraw } from '../draws';
-
-// 层接工具
-
-export class ZIndexTool {
-
-  private render: Render;
-  constructor(render: Render) {
-    this.render = render;
-  }
-
-  // 获取移动节点
-  getNodes(nodes: Konva.Node[]) {
-    const targets: Konva.Node[] = [];
-    for (const node of nodes) {
-      if (node instanceof Konva.Transformer) {
-        // 已选择的节点
-        targets.push(...this.render.selectionTool.selectingNodes);
-      } else {
-        // 未选择的节点
-        targets.push(node);
-      }
-    }
-    return targets;
-  }
-
-  // 最大 zIndex
-  getMaxZIndex() {
-    return Math.max(
-      ...this.render.layer
-        .getChildren((node) => !this.render.ignore(node))
-        .map((o) => o.zIndex())
-    );
-  }
-
-  // 最小 zIndex
-  getMinZIndex() {
-    return Math.min(
-      ...this.render.layer
-        .getChildren((node) => !this.render.ignore(node))
-        .map((o) => o.zIndex())
-    );
-  }
-
-  // 记录选择期间的 zIndex
-  updateSelectingZIndex(nodes: Konva.Node[]) {
-    for (const node of nodes) {
-      node.setAttrs({
-        selectingZIndex: node.zIndex()
-      });
-    }
-  }
-
-  // 恢复选择期间的 zIndex
-  resetSelectingZIndex(nodes: Konva.Node[]) {
-    nodes.sort((a, b) => a.zIndex() - b.zIndex());
-    for (const node of nodes) {
-      node.zIndex(node.attrs.selectingZIndex);
-    }
-  }
-
-  // 更新 zIndex 缓存
-  updateLastZindex(nodes: Konva.Node[]) {
-    for (const node of nodes) {
-      node.setAttrs({ lastZIndex: node.zIndex() });
-    }
-  }
-
-  // 上移
-  up(nodes: Konva.Node[]) {
-    // 最大zIndex
-    const maxZIndex = this.getMaxZIndex();
-    const sorted = this.getNodes(nodes).sort((a, b) => b.zIndex() - a.zIndex());
-    // 上移
-    let lastNode: Konva.Node | null = null;
-    if (this.render.selectionTool.selectingNodes.length > 0) {
-      this.updateSelectingZIndex(sorted);
-      for (const node of sorted) {
-        if (
-          node.attrs.lastZIndex < maxZIndex &&
-          (lastNode === null || node.attrs.lastZIndex < lastNode.attrs.lastZIndex - 1)
-        ) {
-          node.setAttrs({
-            lastZIndex: node.attrs.lastZIndex + 1
-          });
-        }
-        lastNode = node;
-      }
-      this.resetSelectingZIndex(sorted);
-    } else {
-      // 直接调整
-      for (const node of sorted) {
-        if (
-          node.zIndex() < maxZIndex &&
-          (lastNode === null || node.zIndex() < lastNode.zIndex() - 1)
-        ) {
-          node.zIndex(node.zIndex() + 1);
-        }
-        lastNode = node;
-      }
-
-      this.updateLastZindex(sorted);
-      // 更新历史
-      this.render.updateHistory();
-      // 重绘
-      this.render.redraw([
-        GraphDraw.NAME,
-        LinkDraw.NAME,
-        RulerDraw.NAME,
-        PreviewDraw.NAME
-      ]);
-    }
-  }
-
-  // 下移
-  down(nodes: Konva.Node[]) {
-    // 最小 zIndex
-    const minZIndex = this.getMinZIndex();
-    const sorted = this.getNodes(nodes).sort((a, b) => a.zIndex() - b.zIndex());
-    // 下移
-    let lastNode: Konva.Node | null = null;
-
-    if (this.render.selectionTool.selectingNodes.length > 0) {
-      this.updateSelectingZIndex(sorted);
-
-      for (const node of sorted) {
-        if (
-          node.attrs.lastZIndex > minZIndex &&
-          (lastNode === null || node.attrs.lastZIndex > lastNode.attrs.lastZIndex + 1)
-        ) {
-          node.setAttrs({ lastZIndex: node.attrs.lastZIndex - 1 });
-        }
-        lastNode = node;
-      }
-      this.resetSelectingZIndex(sorted);
-    } else {
-      // 直接调整
-      for (const node of sorted) {
-        if (
-          node.zIndex() > minZIndex &&
-          (lastNode === null || node.zIndex() > lastNode.zIndex() + 1)
-        ) {
-          node.zIndex(node.zIndex() - 1);
-        }
-        lastNode = node;
-      }
-      this.updateLastZindex(sorted);
-      // 更新历史
-      this.render.updateHistory();
-      // 重绘
-      this.render.redraw([
-        GraphDraw.NAME,
-        LinkDraw.NAME,
-        RulerDraw.NAME,
-        PreviewDraw.NAME
-      ]);
-    }
-  }
-
-  // 置顶
-  top(nodes: Konva.Node[]) {
-    // 最大 zIndex
-    let maxZIndex = this.getMaxZIndex();
-    const sorted = this.getNodes(nodes).sort((a, b) => b.zIndex() - a.zIndex());
-    if (this.render.selectionTool.selectingNodes.length > 0) {
-      // 先选中再调整
-      this.updateSelectingZIndex(sorted);
-      // 置顶
-      for (const node of sorted) {
-        node.setAttrs({ lastZIndex: maxZIndex-- });
-      }
-      this.resetSelectingZIndex(sorted);
-    } else {
-      // 直接调整
-      for (const node of sorted) {
-        node.zIndex(maxZIndex);
-      }
-      this.updateLastZindex(sorted);
-      // 更新历史
-      this.render.updateHistory();
-      // 重绘
-      this.render.redraw([
-        GraphDraw.NAME,
-        LinkDraw.NAME,
-        RulerDraw.NAME,
-        PreviewDraw.NAME
-      ]);
-    }
-  }
-
-  // 置底
-  bottom(nodes: Konva.Node[]) {
-    // 最小 zIndex
-    let minZIndex = this.getMinZIndex();
-    const sorted = this.getNodes(nodes).sort((a, b) => a.zIndex() - b.zIndex());
-    if (this.render.selectionTool.selectingNodes.length > 0) {
-      // 先选中再调整
-      this.updateSelectingZIndex(sorted);
-      // 置底
-      for (const node of sorted) {
-        node.setAttrs({
-          lastZIndex: minZIndex++
-        });
-      }
-      this.resetSelectingZIndex(sorted);
-    } else {
-      // 直接调整
-      for (const node of sorted) {
-        node.zIndex(minZIndex);
-      }
-      this.updateLastZindex(sorted);
-      // 更新历史
-      this.render.updateHistory();
-      // 重绘
-      this.render.redraw([
-        GraphDraw.NAME,
-        LinkDraw.NAME,
-        RulerDraw.NAME,
-        PreviewDraw.NAME
-      ]);
-    }
-  }
+import Konva from 'konva';
+import { Render } from '../index';
+import { GraphDraw, LinkDraw, RulerDraw, PreviewDraw } from '../draws';
+
+// 层接工具
+
+export class ZIndexTool {
+
+  private render: Render;
+  constructor(render: Render) {
+    this.render = render;
+  }
+
+  // 获取移动节点
+  getNodes(nodes: Konva.Node[]) {
+    const targets: Konva.Node[] = [];
+    for (const node of nodes) {
+      if (node instanceof Konva.Transformer) {
+        // 已选择的节点
+        targets.push(...this.render.selectionTool.selectingNodes);
+      } else {
+        // 未选择的节点
+        targets.push(node);
+      }
+    }
+    return targets;
+  }
+
+  // 最大 zIndex
+  getMaxZIndex() {
+    return Math.max(
+      ...this.render.layer
+        .getChildren((node) => !this.render.ignore(node))
+        .map((o) => o.zIndex())
+    );
+  }
+
+  // 最小 zIndex
+  getMinZIndex() {
+    return Math.min(
+      ...this.render.layer
+        .getChildren((node) => !this.render.ignore(node))
+        .map((o) => o.zIndex())
+    );
+  }
+
+  // 记录选择期间的 zIndex
+  updateSelectingZIndex(nodes: Konva.Node[]) {
+    for (const node of nodes) {
+      node.setAttrs({
+        selectingZIndex: node.zIndex()
+      });
+    }
+  }
+
+  // 恢复选择期间的 zIndex
+  resetSelectingZIndex(nodes: Konva.Node[]) {
+    nodes.sort((a, b) => a.zIndex() - b.zIndex());
+    for (const node of nodes) {
+      node.zIndex(node.attrs.selectingZIndex);
+    }
+  }
+
+  // 更新 zIndex 缓存
+  updateLastZindex(nodes: Konva.Node[]) {
+    for (const node of nodes) {
+      node.setAttrs({ lastZIndex: node.zIndex() });
+    }
+  }
+
+  // 上移
+  up(nodes: Konva.Node[]) {
+    // 最大zIndex
+    const maxZIndex = this.getMaxZIndex();
+    const sorted = this.getNodes(nodes).sort((a, b) => b.zIndex() - a.zIndex());
+    // 上移
+    let lastNode: Konva.Node | null = null;
+    if (this.render.selectionTool.selectingNodes.length > 0) {
+      this.updateSelectingZIndex(sorted);
+      for (const node of sorted) {
+        if (
+          node.attrs.lastZIndex < maxZIndex &&
+          (lastNode === null || node.attrs.lastZIndex < lastNode.attrs.lastZIndex - 1)
+        ) {
+          node.setAttrs({
+            lastZIndex: node.attrs.lastZIndex + 1
+          });
+        }
+        lastNode = node;
+      }
+      this.resetSelectingZIndex(sorted);
+    } else {
+      // 直接调整
+      for (const node of sorted) {
+        if (
+          node.zIndex() < maxZIndex &&
+          (lastNode === null || node.zIndex() < lastNode.zIndex() - 1)
+        ) {
+          node.zIndex(node.zIndex() + 1);
+        }
+        lastNode = node;
+      }
+
+      this.updateLastZindex(sorted);
+      // 更新历史
+      this.render.updateHistory();
+      // 重绘
+      this.render.redraw([
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
+      ]);
+    }
+  }
+
+  // 下移
+  down(nodes: Konva.Node[]) {
+    // 最小 zIndex
+    const minZIndex = this.getMinZIndex();
+    const sorted = this.getNodes(nodes).sort((a, b) => a.zIndex() - b.zIndex());
+    // 下移
+    let lastNode: Konva.Node | null = null;
+
+    if (this.render.selectionTool.selectingNodes.length > 0) {
+      this.updateSelectingZIndex(sorted);
+
+      for (const node of sorted) {
+        if (
+          node.attrs.lastZIndex > minZIndex &&
+          (lastNode === null || node.attrs.lastZIndex > lastNode.attrs.lastZIndex + 1)
+        ) {
+          node.setAttrs({ lastZIndex: node.attrs.lastZIndex - 1 });
+        }
+        lastNode = node;
+      }
+      this.resetSelectingZIndex(sorted);
+    } else {
+      // 直接调整
+      for (const node of sorted) {
+        if (
+          node.zIndex() > minZIndex &&
+          (lastNode === null || node.zIndex() > lastNode.zIndex() + 1)
+        ) {
+          node.zIndex(node.zIndex() - 1);
+        }
+        lastNode = node;
+      }
+      this.updateLastZindex(sorted);
+      // 更新历史
+      this.render.updateHistory();
+      // 重绘
+      this.render.redraw([
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
+      ]);
+    }
+  }
+
+  // 置顶
+  top(nodes: Konva.Node[]) {
+    // 最大 zIndex
+    let maxZIndex = this.getMaxZIndex();
+    const sorted = this.getNodes(nodes).sort((a, b) => b.zIndex() - a.zIndex());
+    if (this.render.selectionTool.selectingNodes.length > 0) {
+      // 先选中再调整
+      this.updateSelectingZIndex(sorted);
+      // 置顶
+      for (const node of sorted) {
+        node.setAttrs({ lastZIndex: maxZIndex-- });
+      }
+      this.resetSelectingZIndex(sorted);
+    } else {
+      // 直接调整
+      for (const node of sorted) {
+        node.zIndex(maxZIndex);
+      }
+      this.updateLastZindex(sorted);
+      // 更新历史
+      this.render.updateHistory();
+      // 重绘
+      this.render.redraw([
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
+      ]);
+    }
+  }
+
+  // 置底
+  bottom(nodes: Konva.Node[]) {
+    // 最小 zIndex
+    let minZIndex = this.getMinZIndex();
+    const sorted = this.getNodes(nodes).sort((a, b) => a.zIndex() - b.zIndex());
+    if (this.render.selectionTool.selectingNodes.length > 0) {
+      // 先选中再调整
+      this.updateSelectingZIndex(sorted);
+      // 置底
+      for (const node of sorted) {
+        node.setAttrs({
+          lastZIndex: minZIndex++
+        });
+      }
+      this.resetSelectingZIndex(sorted);
+    } else {
+      // 直接调整
+      for (const node of sorted) {
+        node.zIndex(minZIndex);
+      }
+      this.updateLastZindex(sorted);
+      // 更新历史
+      this.render.updateHistory();
+      // 重绘
+      this.render.redraw([
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
+      ]);
+    }
+  }
 }

package/src/aldehyde/draw-canvas-edit/components/render/utils/a-star.ts

@@ -1,116 +1,116 @@
-export interface Node {
-  x: number;
-  y: number;
-  cost?: number; // 代价
-  parent?: Node; // 上一步
-}
-
-export default function aStar(config: {
-  from: Node; // 起点
-  to: Node; // 终点
-  matrix: number[][]; // 矩阵
-  maxCost: number // 作为墙的值
-}): Node[] {
-  const { from, to, matrix, maxCost = 1 } = config;
-  const grid: Node[][] = matrixToGrid(matrix);
-  const start = grid[from.y][from.x];
-  const goal = grid[to.y][to.x];
-  // 初始化 open 和 closed 列表
-  const open: Node[] = [start];
-  const closed = new Set<Node>();
-  // 初始化每个节点的 f, g, h 值
-  const f = new Map<Node, number>();
-  const g = new Map<Node, number>();
-  const h = new Map<Node, number>();
-  g.set(start, 0);
-  h.set(start, manhattanDistance(start, goal));
-  f.set(start, g.get(start)! + h.get(start)!);
-  // A* 算法主循环
-  while (open.length > 0) {
-    // 从 open 列表中找到 f 值最小的节点
-    const current = open.reduce((a, b) => (f.get(a)! < f.get(b)! ? a : b));
-    // 如果当前节点是目标节点，返回路径
-    if (current === goal) {
-      return reconstructPath(goal);
-    }
-    // 将当前节点从 open 列表中移除，并加入 closed 列表
-    open.splice(open.indexOf(current), 1);
-    closed.add(current);
-    // 遍历当前节点的邻居
-    for (const neighbor of getNeighbors(current, grid)) {
-      // 如果邻居节点已经在 closed 列表中，跳过
-      if (closed.has(neighbor)) {
-        continue;
-      }
-      // 计算从起点到邻居节点的距离（转弯距离增加）
-      const tentativeG =
-        g.get(current)! + // 累计距离
-        (neighbor.cost ?? 1) + // 下一步距离
-        ((current.x === current.parent?.x && current.x !== neighbor.x) ||
-          (current.y === current.parent?.y && current.y !== neighbor.y)
-          ? grid.length + grid[0].length
-          : 0);
-      // 如果邻居节点不在 open 列表中，或者新的 g 值更小，更新邻居节点的 g, h, f 值，并将其加入 open 列表
-      if (!open.includes(neighbor) || tentativeG < g.get(neighbor)!) {
-        g.set(neighbor, tentativeG);
-        h.set(neighbor, manhattanDistance(neighbor, goal));
-        f.set(neighbor, g.get(neighbor)! + h.get(neighbor)!);
-        neighbor.parent = current;
-        if (!open.includes(neighbor)) {
-          open.push(neighbor);
-        }
-      }
-    }
-  }
-
-  // 如果 open 列表为空，表示无法到达目标节点，返回 null
-  return [];
-
-  // 数据转换
-  function matrixToGrid(matrix: number[][]) {
-    const mt: Node[][] = [];
-    for (let y = 0; y < matrix.length; y++) {
-      if (mt[y] === void 0) {
-        mt[y] = [];
-      }
-      for (let x = 0; x < matrix[y].length; x++) {
-        mt[y].push({ x, y, cost: matrix[y][x] });
-      }
-    }
-    return mt;
-  }
-
-  // 从目标节点开始，沿着 parent 指针重构路径
-  function reconstructPath(node: Node): Node[] {
-    const path = [node];
-    while (node.parent) {
-      path.push(node.parent);
-      node = node.parent;
-    }
-    return path.reverse();
-  }
-
-  // 计算曼哈顿距离
-  function manhattanDistance(a: Node, b: Node): number {
-    return Math.abs(a.x - b.x) + Math.abs(a.y - b.y);
-  }
-
-  // 获取当前节点的邻居
-  function getNeighbors(node: Node, grid: Node[][]): Node[] {
-    const neighbors = [];
-    const { x, y } = node;
-    if (x > 0 && (grid[y][x - 1].cost ?? 0) < maxCost) {
-      neighbors.push(grid[y][x - 1]);
-    }
-    if (x < grid[0].length - 1 && (grid[y][x + 1].cost ?? 0) < maxCost) {
-      neighbors.push(grid[y][x + 1]);
-    }
-    if (y > 0 && (grid[y - 1][x].cost ?? 0) < maxCost) {
-      neighbors.push(grid[y - 1][x]);
-    }
-    if (y < grid.length - 1 && (grid[y + 1][x].cost ?? 0) < maxCost) {
-      neighbors.push(grid[y + 1][x]);
-    }
-    return neighbors;
-  }
-}
+export interface Node {
+  x: number;
+  y: number;
+  cost?: number; // 代价
+  parent?: Node; // 上一步
+}
+
+export default function aStar(config: {
+  from: Node; // 起点
+  to: Node; // 终点
+  matrix: number[][]; // 矩阵
+  maxCost: number // 作为墙的值
+}): Node[] {
+  const { from, to, matrix, maxCost = 1 } = config;
+  const grid: Node[][] = matrixToGrid(matrix);
+  const start = grid[from.y][from.x];
+  const goal = grid[to.y][to.x];
+  // 初始化 open 和 closed 列表
+  const open: Node[] = [start];
+  const closed = new Set<Node>();
+  // 初始化每个节点的 f, g, h 值
+  const f = new Map<Node, number>();
+  const g = new Map<Node, number>();
+  const h = new Map<Node, number>();
+  g.set(start, 0);
+  h.set(start, manhattanDistance(start, goal));
+  f.set(start, g.get(start)! + h.get(start)!);
+  // A* 算法主循环
+  while (open.length > 0) {
+    // 从 open 列表中找到 f 值最小的节点
+    const current = open.reduce((a, b) => (f.get(a)! < f.get(b)! ? a : b));
+    // 如果当前节点是目标节点，返回路径
+    if (current === goal) {
+      return reconstructPath(goal);
+    }
+    // 将当前节点从 open 列表中移除，并加入 closed 列表
+    open.splice(open.indexOf(current), 1);
+    closed.add(current);
+    // 遍历当前节点的邻居
+    for (const neighbor of getNeighbors(current, grid)) {
+      // 如果邻居节点已经在 closed 列表中，跳过
+      if (closed.has(neighbor)) {
+        continue;
+      }
+      // 计算从起点到邻居节点的距离（转弯距离增加）
+      const tentativeG =
+        g.get(current)! + // 累计距离
+        (neighbor.cost ?? 1) + // 下一步距离
+        ((current.x === current.parent?.x && current.x !== neighbor.x) ||
+          (current.y === current.parent?.y && current.y !== neighbor.y)
+          ? grid.length + grid[0].length
+          : 0);
+      // 如果邻居节点不在 open 列表中，或者新的 g 值更小，更新邻居节点的 g, h, f 值，并将其加入 open 列表
+      if (!open.includes(neighbor) || tentativeG < g.get(neighbor)!) {
+        g.set(neighbor, tentativeG);
+        h.set(neighbor, manhattanDistance(neighbor, goal));
+        f.set(neighbor, g.get(neighbor)! + h.get(neighbor)!);
+        neighbor.parent = current;
+        if (!open.includes(neighbor)) {
+          open.push(neighbor);
+        }
+      }
+    }
+  }
+
+  // 如果 open 列表为空，表示无法到达目标节点，返回 null
+  return [];
+
+  // 数据转换
+  function matrixToGrid(matrix: number[][]) {
+    const mt: Node[][] = [];
+    for (let y = 0; y < matrix.length; y++) {
+      if (mt[y] === void 0) {
+        mt[y] = [];
+      }
+      for (let x = 0; x < matrix[y].length; x++) {
+        mt[y].push({ x, y, cost: matrix[y][x] });
+      }
+    }
+    return mt;
+  }
+
+  // 从目标节点开始，沿着 parent 指针重构路径
+  function reconstructPath(node: Node): Node[] {
+    const path = [node];
+    while (node.parent) {
+      path.push(node.parent);
+      node = node.parent;
+    }
+    return path.reverse();
+  }
+
+  // 计算曼哈顿距离
+  function manhattanDistance(a: Node, b: Node): number {
+    return Math.abs(a.x - b.x) + Math.abs(a.y - b.y);
+  }
+
+  // 获取当前节点的邻居
+  function getNeighbors(node: Node, grid: Node[][]): Node[] {
+    const neighbors = [];
+    const { x, y } = node;
+    if (x > 0 && (grid[y][x - 1].cost ?? 0) < maxCost) {
+      neighbors.push(grid[y][x - 1]);
+    }
+    if (x < grid[0].length - 1 && (grid[y][x + 1].cost ?? 0) < maxCost) {
+      neighbors.push(grid[y][x + 1]);
+    }
+    if (y > 0 && (grid[y - 1][x].cost ?? 0) < maxCost) {
+      neighbors.push(grid[y - 1][x]);
+    }
+    if (y < grid.length - 1 && (grid[y + 1][x].cost ?? 0) < maxCost) {
+      neighbors.push(grid[y + 1][x]);
+    }
+    return neighbors;
+  }
+}