@mx-sose-front/mx-sose-graph 1.1.2 → 1.1.4

package/src/store/graphStore.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { ref, computed, shallowReactive, type Ref } from 'vue'
+import { ref, computed, shallowReactive, nextTick, type Ref } from 'vue'
 import type { Shape, OwnerPayload, ShapeSizeUpdatePayload } from '../types'
 import { eventBus } from './eventBus'
 import { getPolicy, checkNestViaFront, } from '../utils/policy'
@@ -17,15 +17,20 @@ import {
   isShapeTypeNotInPackageTypes, removeChildShapeFromCompartment, addChildShapeToCompartment, hydrateComparentsFromJSON,
   rebuildAllCompartmentChildrenAsShapes,
   syncComparentShapesIntoRuntime,
+  syncShowComparentsByReparent,
 } from '../utils/compartment'
 import { EdgeUtils } from '../utils/edgeUtils'
 import { expandParentByChild } from '../utils/autoExpandParent'
+import { batchAutoExpandParents } from '../utils/batchAutoExpand'
 import { adjustCanvasToFitAllShapes } from '../utils/diagram'
 import { applyReparentAndClone, autoExpandMovedCompartmentsAfterDrag, buildDragEndPayloads, buildPrevParentMap, collectAffectedShapeIds, createOnNestDoneCallback } from '../utils/graphDragService'
+import { createShapeOperator, type ShapeOp, type ShapeId } from "../utils/shapeOps/shapeOps"
 type Rect = { x: number; y: number; width: number; height: number };
 export const useGraphStore = defineStore('graph', () => {
   // 状态
   const shapes = ref<Shape[]>([])
+  // 在 store 初始化时创建一次
+  const { applyShapeOp } = createShapeOperator<Shape>()
   // 缩放比例 - 按画布ID存储
   const scales = ref<Record<string, number>>({});
   const selectedShape = ref<Shape | null>(null)
@@ -63,12 +68,51 @@ export const useGraphStore = defineStore('graph', () => {
   const activeDiagramId = ref<string | null>(null);
   // 当前被选中的多个 id
   const selectedIds = ref<string[]>([])
-  const comparentsHydratedOnce = ref(false)
-  // 外部拖拽创建中的形状 id（用于隐藏实际形状，只显示 ghost）
+  // 外部拖拽创建中的形状 id(用于隐藏实际形状,只显示 ghost)
   const externalCreatingId = ref<string | null>(null)
+  // 剪切状态的图元 ID 集合（用于 SVG 遮盖层渲染）
+  const cutShapeIds = ref<Set<string>>(new Set())
+  // 剪贴板中图元的数量（用于工具栏按钮状态同步）
+  const copiedShapesCount = ref<number>(0)
+
   // 计算属性
   const shapeCount = computed(() => shapes.value.length)
   const hasSelectedShape = computed(() => selectedShape.value !== null)
+
+  /**
+   * 父子关系索引映射
+   * 用于快速查找某个图元的所有直接子图元
+   * key: 父图元 ID, value: 子图元 ID 数组
+   * 性能优化: O(n) 构建, O(1) 查询
+   */
+  const parentChildMap = computed(() => {
+    const map = new Map<string, string[]>();
+    shapes.value.forEach(shape => {
+      if (shape.parenShapeId) {
+        if (!map.has(shape.parenShapeId)) {
+          map.set(shape.parenShapeId, []);
+        }
+        map.get(shape.parenShapeId)!.push(shape.id);
+      }
+    });
+    return map;
+  })
+
+  /**
+   * 图元ID索引映射
+   * 用于快速通过ID查找图元对象
+   * key: 图元 ID, value: 图元对象
+   * 性能优化: O(n) 构建, O(1) 查询
+   * 解决嵌套图元场景下大量 find() 调用导致的性能问题
+   */
+  const shapeMap = computed(() => {
+    const map = new Map<string, Shape>();
+    shapes.value.forEach(shape => {
+      map.set(shape.id, shape);
+    });
+    return map;
+  })
+
   //图元shapeKey
   const taggedValueLabels = ref<string[]>([])   // 隔间组件的图元类型
   const packagesTypes = ref<string[]>([])           // 需要展示线的隔间组件的图元类型
@@ -83,9 +127,11 @@ export const useGraphStore = defineStore('graph', () => {
   /**
    * 添加图元
    * @param shape - The shape to add
+   * @param options - Optional configuration
+   * @param options.autoExpandParent - Whether to auto-expand parent container (default: true)
    */
   // 添加图元
-  const addShape = (shape: Shape) => {
+  const addShape = (shape: Shape, options?: { autoExpandParent?: boolean }) => {
     // 检查是否是边类型且已经存在相同类型、相同源和目标的边
     if (shape.shapeType === 'edge' && shape.sourceId && shape.targetId) {
       const existingEdge = shapes.value.find(
@@ -104,6 +150,15 @@ export const useGraphStore = defineStore('graph', () => {
     shapes.value.push(shape)
     // 通过事件总线发送事件
     eventBus.emit('shape-added', shape)
+
+    // 自动扩父逻辑：如果图元有父元素且需要自动扩父，触发扩父逻辑
+    const shouldAutoExpand = options?.autoExpandParent !== false // 默认为 true
+    if (shouldAutoExpand && shape.parenShapeId && shape.bounds) {
+      // 使用 nextTick 确保图元已经完全添加
+      nextTick(() => {
+        expandParentAndEmitSizeUpdateByChild(shape)
+      })
+    }
   }
   //移除图元 
   const removeShape = (shapeId: string) => {
@@ -113,12 +168,12 @@ export const useGraphStore = defineStore('graph', () => {
       // 通过事件总线发送事件
       // eventBus.emit('shape-removed', removedShape)
       // 若该图元有父，且父是隔间：从 comparents 里移除这个子 Shape
-      if (removedShape.parenShapeId) {
-        const parent = shapes.value.find(s => s.id == removedShape.parenShapeId)
-        if (parent && isShapeTypeNotInPackageTypes(parent)) {
-          removeChildShapeFromCompartment(parent, removedShape, updateShape)
-        }
-      }
+      // if (removedShape.parenShapeId) {
+      //   const parent = shapes.value.find(s => s.id == removedShape.parenShapeId)
+      //   if (parent && isShapeTypeNotInPackageTypes(parent)) {
+      //     removeChildShapeFromCompartment(parent, removedShape, updateShape)
+      //   }
+      // }
       // 如果删除的是当前选中的形状，清除选中状态
       if (selectedShape.value?.id === shapeId) {
         selectedShape.value = null
@@ -138,8 +193,8 @@ export const useGraphStore = defineStore('graph', () => {
   }
   function refreshChildSnapshotInCompartment(parent: Shape, child: Shape) {
     // 直接“先移后加”达到“替换快照”的效果（工具内部会用快照，避免 Proxy/循环）
-    removeChildShapeFromCompartment(parent, child, updateShapeRaw)
-    addChildShapeToCompartment(parent, child, updateShapeRaw)
+    // removeChildShapeFromCompartment(parent, child, updateShapeRaw)
+    // addChildShapeToCompartment(parent, child, updateShapeRaw)
   }
 
   // 用于画布渲染的可见图元列表
@@ -190,28 +245,28 @@ export const useGraphStore = defineStore('graph', () => {
 
     const newPid = after.parenShapeId ?? null
     // 父变了：从旧父移除、向新父添加（工具内部有去重/幂等）
-    if (oldPid !== newPid) {
-      if (oldPid) {
-        const oldP = shapes.value.find(s => s.id === oldPid)
-        if (oldP && isShapeTypeNotInPackageTypes(oldP)) {
-          removeChildShapeFromCompartment(oldP, after, updateShapeRaw)
-        }
-      }
-      if (newPid) {
-        const newP = shapes.value.find(s => s.id === newPid)
-        if (newP && isShapeTypeNotInPackageTypes(newP)) {
-          addChildShapeToCompartment(newP, after, updateShapeRaw)
-        }
-      }
-      return
-    }
+    // if (oldPid !== newPid) {
+    //   if (oldPid) {
+    //     const oldP = shapes.value.find(s => s.id === oldPid)
+    //     if (oldP && isShapeTypeNotInPackageTypes(oldP)) {
+    //       removeChildShapeFromCompartment(oldP, after, updateShapeRaw)
+    //     }
+    //   }
+    //   if (newPid) {
+    //     const newP = shapes.value.find(s => s.id === newPid)
+    //     if (newP && isShapeTypeNotInPackageTypes(newP)) {
+    //       // addChildShapeToCompartment(newP, after, updateShapeRaw)
+    //     }
+    //   }
+    //   return
+    // }
     //  父没变 & 在隔间里：刷新快照（属性变化时也要同步到 comparentShapes）
-    if (newPid) {
-      const p = shapes.value.find(s => s.id === newPid)
-      if (p && isShapeTypeNotInPackageTypes(p)) {
-        refreshChildSnapshotInCompartment(p, after)
-      }
-    }
+    // if (newPid) {
+    //   const p = shapes.value.find(s => s.id === newPid)
+    //   if (p && isShapeTypeNotInPackageTypes(p)) {
+    //     refreshChildSnapshotInCompartment(p, after)
+    //   }
+    // }
   }
   const sameId = (a?: string | null, b?: string | null) =>
     (a ?? null) === (b ?? null)
@@ -243,11 +298,13 @@ export const useGraphStore = defineStore('graph', () => {
       ? pendingNestedIds.value
       : []
     const pendingSet = new Set(pendingList)
+    // 用 shapeMap O(1) 查找原始图元，避免 find O(N)
+    const map = shapeMap.value
     for (const id in dragGhost) {
-      // 如果当前 id 在 pending 里，不生成 ghost
       if (pendingSet.has(id)) continue
-      const orig = shapes.value.find(x => x.id === id)
+      const orig = map.get(id)
       if (!orig) continue
+
       out.push({
         ...orig,
         bounds: { ...dragGhost[id] },
@@ -280,14 +337,36 @@ export const useGraphStore = defineStore('graph', () => {
     eventBus.emit('title-changed', title)
   }
 
-  // 批量操作
-  const updateShapes = (newShapes: Shape[]) => {
+
+  /**
+   * 批量操作图元（新增 / 修改 / 删除）
+   * @param payload - 新增/修改时传 Shape[]；删除时可传 Shape[]（只需要 id）或 id 数组
+   * @param op - 操作类型：add | update | delete | upsert（默认）
+   * @param options - 额外选项（保持你原来的 autoExpandParents）
+   */
+  const updateShapes = (
+    payload: Shape[] | Array<string | number>,
+    op: ShapeOp = "upsert",
+    options?: { autoExpandParents?: boolean }
+  ) => {
     // 先把 comparents[*].comparentShapes 铺平同步到运行时
-    const expanded = syncComparentShapesIntoRuntime(newShapes)
-    shapes.value = expanded
+    // const expanded = syncComparentShapesIntoRuntime(newShapes)
+    const { changedShapes } = applyShapeOp({
+      list: shapes.value,
+      payload: payload as any, // delete 时是 id[]，其余是 Shape[]
+      op,
+    })
     pendingNestedIds.value = []
-    eventBus.emit('shapes-updated', expanded)
-    hydrateAllComparents()
+    // eventBus.emit('shapes-updated', newShapes)
+    // hydrateAllComparents()
+
+    // 批量自动扩展父容器（默认启用）
+    const shouldAutoExpand = options?.autoExpandParents !== false
+    if (shouldAutoExpand && changedShapes.length > 0) {
+      nextTick(() => {
+        batchAutoExpandParents(changedShapes, updateShape)
+      })
+    }
   }
   // 获取当前图元数据
   const getShapes = () => {
@@ -303,27 +382,26 @@ export const useGraphStore = defineStore('graph', () => {
   }
 
   /** 把所有隔间父的 comparents 从 comparentsJSON 还原；若没有 JSON 就按 parenShapeId 兜底重建 */
-  const hydrateAllComparents = () => {
-    if (comparentsHydratedOnce.value) return
-    if (!shapes.value.length) return
-
-    let hadAnyJSON = false
-    for (const p of shapes.value) {
-      if (isShapeTypeNotInPackageTypes(p)) {
-        const any = p as any
-        if (typeof any.comparentsJSON === 'string' && any.comparentsJSON.length) {
-          hydrateComparentsFromJSON(p, updateShape)
-          hadAnyJSON = true
-        }
-      }
-    }
-    // 历史数据可能还没有 comparentsJSON：按父子关系兜底重建一次
-    if (!hadAnyJSON) {
-      rebuildAllCompartmentChildrenAsShapes(shapes.value, updateShape)
-    }
-
-    comparentsHydratedOnce.value = true
-  }
+  // const hydrateAllComparents = () => {
+  //   if (comparentsHydratedOnce.value) return
+  //   if (!shapes.value.length) return
+  //   let hadAnyJSON = false
+  //   for (const p of shapes.value) {
+  //     if (isShapeTypeNotInPackageTypes(p)) {
+  //       const any = p as any
+  //       if (typeof any.comparentsJSON === 'string' && any.comparentsJSON.length) {
+  //         hydrateComparentsFromJSON(p, updateShape)
+  //         hadAnyJSON = true
+  //       }
+  //     }
+  //   }
+  //   // 历史数据可能还没有 comparentsJSON：按父子关系兜底重建一次
+  //   if (!hadAnyJSON) {
+  //     rebuildAllCompartmentChildrenAsShapes(shapes.value, updateShape)
+  //   }
+
+  //   comparentsHydratedOnce.value = true
+  // }
   //拖动元素相关操作
   // 开始拖动已有元素（仅对 shape 生效）
   const byId = (id: string) => shapes.value.find(s => s.id === id) || null
@@ -468,7 +546,10 @@ export const useGraphStore = defineStore('graph', () => {
     }
   }
   //拖动过程中
-  const moveDraggedShape = async (pointer: { x: number; y: number }) => {
+  const moveDraggedShape = async (
+    pointer: { x: number; y: number },
+    options?: { hitPointer?: { x: number; y: number } }
+  ) => {
     if (!isDragging.value || draggingIds.value.length === 0) return
 
     if (draggingIds.value.length === 1) {
@@ -481,7 +562,8 @@ export const useGraphStore = defineStore('graph', () => {
         dragOffset.value,
         dragBase.value,
         currentDiagramId.value || s.diagramId,
-        getPolicy(s).constrainToDiagram
+        getPolicy(s).constrainToDiagram,
+        options?.hitPointer
       )
       // 就地写 shallowReactive，不再每帧解构新对象
       for (const k in ghost) dragGhost[k] = ghost[k]
@@ -589,6 +671,13 @@ export const useGraphStore = defineStore('graph', () => {
     })
     //对“本次直接拖动的隔间”做一次自动扩容检查
     autoExpandMovedCompartmentsAfterDrag(shapes.value, changedIds, updateShape)
+    //  处理comparents字段
+    syncShowComparentsByReparent(
+      shapes.value,
+      changedIds,
+      prevParentById,
+      (id, u) => updateShapeRaw(id, u)
+    )
     // 收集受影响的所有 shape（自身 + 父 + 子树 + 祖先）
     const affectedIds = collectAffectedShapeIds(shapes.value, changedIds, clonedIds)
     //组装 payloads（深拷贝），给更新接口用
@@ -616,7 +705,8 @@ export const useGraphStore = defineStore('graph', () => {
         }
       }
     }
-
+    console.log("drag end payloads:", payloads, ownerPayload);
+    
     //对外只暴露一个事件：shape-drag-end
     eventBus.emit('shape-drag-end', payloads, ownerPayload, onNestDone)
 
@@ -782,6 +872,29 @@ export const useGraphStore = defineStore('graph', () => {
     museInGraphView.value = isIn
   }
 
+  /**
+   * 设置剪切状态的图元 ID
+   * @param ids 要设置为剪切状态的图元 ID 数组
+   */
+  const setCutShapeIds = (ids: string[]) => {
+    cutShapeIds.value = new Set(ids)
+  }
+
+  /**
+   * 清除所有剪切状态
+   */
+  const clearCutShapeIds = () => {
+    cutShapeIds.value = new Set()
+  }
+
+  /**
+   * 设置剪贴板图元数量
+   * @param count 剪贴板中图元的数量
+   */
+  const setCopiedShapesCount = (count: number) => {
+    copiedShapesCount.value = count
+  }
+
   return {
     // 状态
     shapes,
@@ -796,6 +909,8 @@ export const useGraphStore = defineStore('graph', () => {
     currentDiagramId,
     canDropOnCanvas,
     canOperate,
+    cutShapeIds, // 剪切状态的图元 ID 集合
+    copiedShapesCount, // 剪贴板中图元的数量
     //图元shapeKey
     taggedValueLabels,
     packagesTypes,
@@ -806,6 +921,8 @@ export const useGraphStore = defineStore('graph', () => {
     // 计算属性
     shapeCount,
     hasSelectedShape,
+    parentChildMap, // 父子关系索引映射
+    shapeMap,       // 图元ID索引映射 (性能优化)
     marqueeShapes,
     ghostShadow,
     scales,
@@ -847,6 +964,9 @@ export const useGraphStore = defineStore('graph', () => {
     externalCreatingId,
     expandParentAndEmitSizeUpdateByChild,
     setIsMouseInGraphView,
+    setCutShapeIds,
+    clearCutShapeIds,
+    setCopiedShapesCount,
   }
 },
   //配置持久化

package/src/types/index.ts

@@ -104,7 +104,8 @@ export interface Shape {
   comparents?: CompartmentRecord[] // 隔间组件数组
   meta?: any; // 高亮信息
   scenarioMenus?: scenarioMenu[],
-  inert?: boolean | true  // 惰性可见（不可见/不渲染/不拾取）
+  inert?: boolean | true  // 惰性可见(不可见/不渲染/不拾取)
+  isCut?: boolean // 标记图元是否被剪切
   sourceModels?: string[] // 允许的源图元数组
   targetModels?: string[] // 允许的目标图元数组
   modelTypePropertyId: string // 设置类型
@@ -203,9 +204,10 @@ export interface ShapeSizeUpdatePayload {
 
 // 所在图表列表
 export interface locationChart {
-  modelCode: string //图表图标名称
+  modelCode: string
   treeId: string
   modelName: string //图表名称
+  modelIcon: string //图表图标
 }
 
 // InteractionLayer types

package/src/types/interactionLayer.ts

@@ -10,6 +10,7 @@ export interface InteractionLayerProps {
   taggedValueLabels?: string[];
   actionButtonShapeDataId?: string;
   edgeCheck?: boolean;
+  isTextareaDialogOpen?: boolean; // 对话框是否打开
 }
 
 export const InteractionLayerEmits = [

package/src/utils/batchAutoExpand.ts

@@ -0,0 +1,65 @@
+import type { Shape } from '@/types'
+import { ensureParentFitsChildren } from './containers'
+
+/**
+ * 批量自动扩展所有父容器以适应其子元素
+ * - 按深度从深到浅处理，确保嵌套关系正确
+ * - 只处理需要扩展的父容器，避免不必要的计算
+ * 
+ * @param shapes - 所有图元数据
+ * @param updateShape - 更新图元的函数
+ */
+export function batchAutoExpandParents(
+    shapes: Shape[],
+    updateShape: (id: string, updates: Partial<Shape>) => void
+): void {
+    // 1. 收集所有有子元素的父容器
+    const parentIds = new Set<string>()
+    shapes.forEach(shape => {
+        if (shape.parenShapeId) {
+            parentIds.add(shape.parenShapeId)
+        }
+    })
+
+    if (parentIds.size === 0) return
+
+    // 2. 按深度排序（深度大的先处理，从内到外）
+    const parentsWithDepth = Array.from(parentIds)
+        .map(id => ({
+            id,
+            depth: getDepth(shapes, id),
+            shape: shapes.find(s => s.id === id)
+        }))
+        .filter(p => p.shape)
+        .sort((a, b) => b.depth - a.depth) // 深度大的在前
+
+    // 3. 从最深的父容器开始，逐个扩展
+    parentsWithDepth.forEach(({ shape }) => {
+        if (shape) {
+            ensureParentFitsChildren(shapes, shape, updateShape)
+        }
+    })
+}
+
+/**
+ * 计算图元的嵌套深度
+ * @param shapes - 所有图元数据
+ * @param id - 要计算深度的图元 ID
+ * @returns 嵌套深度（0 表示顶层）
+ */
+function getDepth(shapes: Shape[], id: string): number {
+    let depth = 0
+    let current = shapes.find(s => s.id === id)
+
+    while (current?.parenShapeId) {
+        depth++
+        current = shapes.find(s => s.id === current!.parenShapeId)
+        // 防止循环引用导致无限循环
+        if (depth > 100) {
+            console.warn(`检测到可能的循环引用，图元 ID: ${id}`)
+            break
+        }
+    }
+
+    return depth
+}

package/src/utils/compartment.ts

@@ -2,6 +2,7 @@
 import type { Bounds, CompartmentRecord, Shape } from '@/types'
 import _ from 'lodash'
 import { toRaw } from 'vue';
+import { useGraphStore } from '../store/graphStore';
 
 export type Rect = { x: number; y: number; width: number; height: number }
 export type Zones = {
@@ -380,7 +381,8 @@ export function hydrateComparentsFromJSON(
   parent: Shape,
   updateShape: (id: string, u: Partial<Shape>) => void
 ) {
-  if (!isCompartment(parent)) return
+  debugger
+  // if (!isCompartment(parent)) return
   const json = ensureComparentsJSON(parent)
   const recs = parseComparentsJSONCompat(json, parent)
   // 运行时直接等于记录数组
@@ -452,18 +454,21 @@ export function removeChildShapeFromCompartment(
   writeComparentsJSONFromRuntime(parent, updateShape)
 }
 
-/** 兜底：按 parenShapeId 重建 comparents[0].comparentShapes（启动/恢复后） */
+/** 兜底:按 parenShapeId 重建 comparents[0].comparentShapes(启动/恢复后) */
 export function rebuildAllCompartmentChildrenAsShapes(
   shapes: Shape[],
   updateShape: (id: string, u: Partial<Shape>) => void
 ) {
+  const graphStore = useGraphStore();
+
   for (const p of shapes) {
     if (!isShapeTypeNotInPackageTypes(p)) continue
 
-    const children = shapes.filter(ch => ch.parenShapeId === p.id)
+    const childIds = graphStore.parentChildMap.get(p.id) || [];
+    const children = childIds.map(id => shapes.find(s => s.id === id)).filter(Boolean) as Shape[];
     const snaps = children.map(makePersistableSnapshot)
 
-    // 运行时：确保有记录，再覆盖其 comparentShapes
+    // 运行时:确保有记录,再覆盖其 comparentShapes
     const list = ensureComparentsArray(p)
     const rec = list[0] || emptyRecord(p)
     rec.modelId = ''
@@ -531,4 +536,73 @@ function calcShowComparentsFlag(parent: Shape): boolean {
   if (!Array.isArray(comps) || comps.length === 0) return false
   const rec = comps[0]
   return Array.isArray(rec?.comparentShapes) && rec.comparentShapes.length > 0
+}
+/**
+ * 仅在“嵌套/脱离父（parenShapeId 变化）”后调用：
+ * - changedIds：本次发生位移/可能换父的子 id 集合
+ * - prevParentById：拖拽前这些子对应的父 id 映射（oldPid）
+ * - update：建议传 updateShapeRaw（更轻，不触发边更新）
+ *
+ * 性能：只遍历 shapes 一次 O(N)，且只更新少量父节点 O(K)
+ */
+export function syncShowComparentsByReparent(
+  shapes: Shape[],
+  changedIds: string[],
+  prevParentById: Record<string, string | null | undefined>,
+  update: (id: string, updates: Partial<Shape>) => void,
+  options?: {
+    /** 是否忽略 edge/diagram 作为子元素（默认 true） */
+    ignoreEdgeAndDiagram?: boolean;
+  }
+) {
+  const ignoreEdgeAndDiagram = options?.ignoreEdgeAndDiagram !== false;
+
+  //  收集“父发生变化”的 oldPid/newPid（去重）
+  const parents = new Set<string>();
+
+  for (const id of changedIds) {
+    const oldPid = (prevParentById[id] ?? "") as string;
+    const cur = shapes.find((s) => s.id === id);
+    const newPid = ((cur as any)?.parenShapeId ?? "") as string;
+
+    // 只有父变化才触发（满足你“不是每次都触发”）
+    if (oldPid === newPid) continue;
+
+    if (oldPid) parents.add(oldPid);
+    if (newPid) parents.add(newPid);
+  }
+
+  if (parents.size === 0) return;
+
+  // 统计这些父各自是否还有子（只扫 shapes 一次）
+  const childCount = new Map<string, number>();
+  parents.forEach((pid) => childCount.set(pid, 0));
+
+  for (const s of shapes) {
+    const pid = ((s as any).parenShapeId ?? "") as string;
+    if (!pid || !parents.has(pid)) continue;
+
+    if (ignoreEdgeAndDiagram) {
+      const st = String((s as any).shapeType || "").toLowerCase();
+      if (st === "edge" || st === "diagram") continue;
+    }
+
+    // 防御：不把自己算作自己的子
+    if (s.id === pid) continue;
+
+    childCount.set(pid, (childCount.get(pid) || 0) + 1);
+  }
+
+  // 批量回写 showComparents（只更新受影响的父）
+  for (const pid of parents) {
+    const parent = shapes.find((x) => x.id === pid);
+    if (!parent) continue;
+
+    const shouldShow = (childCount.get(pid) || 0) > 0;
+
+    // 避免重复写入导致多余渲染
+    if ((parent as any).showComparents === shouldShow) continue;
+
+    update(pid, { showComparents: shouldShow } as any);
+  }
 }