@mx-sose-front/mx-sose-graph 1.2.4 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-sose-front/mx-sose-graph",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "A Vue3 graph visualization plugin library",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

package/src/store/graphStore.ts

@@ -725,142 +725,151 @@ export const useGraphStore = defineStore('graph', () => {
   const endDragShape = async (source?: string) => {
     // 防并发：同一次拖拽只允许进入一次
     if (!isDragging.value) return
-    // 提交拖动几何（commitDrag 只是“位置/大小”的更新）
-    const changedIds = commitDrag(
-      shapes.value,
-      [...draggingIds.value],
-      dragGhost,
-      currentDiagramId.value || shapes.value[0].diagramId,
-      updateShape,
-      dragBase.value
-    )
-    if (!changedIds.length) {
-      cleanupAfterDrag()
-      return
-    }
-    // 记录拖动前的父 id，用于嵌套回滚 & 业务上报
-    const prevParentById = buildPrevParentMap(shapes.value, changedIds)
-    const containerForFinalize =
-      hoverContainerId.value && hoverNestable.value ? hoverContainerId.value : null
-
-    // finalizeAfterTransform：决定“最终 parent + bounds”
-    const didReparent = finalizeAfterTransform(
-      shapes.value,
-      changedIds,
-      dragGhost,
-      draggingIds.value,
-      currentDiagramId.value,
-      containerForFinalize,
-      updateShape,
-    )
-    //嵌套 / 克隆 / comparents 业务处理（pinDrop 场景跳过）
-    let ownerPayload: OwnerPayload | null = null
-    let clonedIds: string[] = []
-    if (source !== 'pinDrop') {
-      const nestResult = await applyReparentAndClone({
-        shapes: shapes.value,
-        changedIds,
-        prevParentById,
-        source,
-        dragBase: dragBase.value,
+    try {
+      // 提交拖动几何（commitDrag 只是“位置/大小”的更新）
+      const changedIds = commitDrag(
+        shapes.value,
+        [...draggingIds.value],
+        dragGhost,
+        currentDiagramId.value || shapes.value[0].diagramId,
         updateShape,
-        pendingNestedIds,
-        addShape,
-      })
-      if (nestResult.cancelled) {
-        // 嵌套校验失败，已经在 graphDragService 里回滚了位置/父级，这里只需要收尾
+        dragBase.value
+      )
+      if (!changedIds.length) {
         cleanupAfterDrag()
         return
       }
+      // 记录拖动前的父 id，用于嵌套回滚 & 业务上报
+      const prevParentById = buildPrevParentMap(shapes.value, changedIds)
+      const containerForFinalize =
+        hoverContainerId.value && hoverNestable.value ? hoverContainerId.value : null
 
-      ownerPayload = nestResult.ownerPayload
-      clonedIds = nestResult.clonedIds
-    }
-    // 如果真的发生了“换父”，整理一下 zIndex（保持绘制顺序）
-    if (didReparent) {
-      normalizeZOrder(
+      // finalizeAfterTransform：决定“最终 parent + bounds”
+      const didReparent = finalizeAfterTransform(
         shapes.value,
+        changedIds,
+        dragGhost,
+        draggingIds.value,
         currentDiagramId.value,
+        containerForFinalize,
         updateShape,
-        1,
-        1,
       )
-    }
-    // —— Pin 终极兜底：不允许在本次拖拽后变成“无父” ——
-    for (const id of changedIds) {
-      const node = shapeMap.value.get(id) ?? null
-      if (node?.shapeType === 'pin') {
-        const prevPid = prevParentById[id]
-        const nowPid = node.parenShapeId ?? null
-        if ((!nowPid || nowPid === '') && prevPid) {
-          updateShape(id, { parenShapeId: prevPid })
-        }
-      }
-    }
-
-    // 更新相关 edge 的 waypoints
-    await EdgeUtils.updateRelatedEdgesAsync(shapes.value, changedIds, (shape) => {
-      updateShape(shape.id, shape)
-    }, edgesByNodeId.value, shapeMap.value)
-    //对“本次直接拖动的隔间”做一次自动扩容检查
-    autoExpandMovedCompartmentsAfterDrag(shapes.value, changedIds, updateShape)
-    // 把 clone 也并入“需要同步 comparents 的变更集合”
-    const allReparentIds = [...changedIds, ...clonedIds]
-    // prevParentById 要补齐 clone 的“拖动前父”，因为 clone 之前不存在
-    const prevMapForComparents = { ...prevParentById }
-    for (const cid of clonedIds) {
-      // clone 之前不存在 => 认为 beforePid = null / ''
-      prevMapForComparents[cid] = null
-    }
-    //  处理comparents字段
-    syncShowComparentsByReparent(
-      shapes.value,
-      allReparentIds,
-      prevMapForComparents,
-      (id, u) => updateShapeRaw(id, u)
-    )
-    // 在生成 payloads 之前，把父扩容先做掉
-    const shapeId = ownerPayload?.shapeId
-    if (shapeId != null) {
-      const child = shapeMap.value.get(shapeId) ?? null
-      if (child) {
-        expandParentByChild({
+      //嵌套 / 克隆 / comparents 业务处理（pinDrop 场景跳过）
+      let ownerPayload: OwnerPayload | null = null
+      let clonedIds: string[] = []
+      if (source !== 'pinDrop') {
+        const nestResult = await applyReparentAndClone({
           shapes: shapes.value,
-          child,
+          changedIds,
+          prevParentById,
+          source,
+          dragBase: dragBase.value,
           updateShape,
+          pendingNestedIds,
+          addShape,
         })
+        if (nestResult.cancelled) {
+          // 嵌套校验失败，已经在 graphDragService 里回滚了位置/父级，这里只需要收尾
+          cleanupAfterDrag()
+          return
+        }
+
+        ownerPayload = nestResult.ownerPayload
+        clonedIds = nestResult.clonedIds
       }
-    }
-    // 收集受影响的所有 shape（自身 + 父 + 子树 + 祖先）
-    const affectedIds = collectAffectedShapeIds(shapes.value, changedIds, clonedIds)
-    //组装 payloads（深拷贝），给更新接口用
-    const payloads = buildDragEndPayloads(affectedIds, shapes.value)
-    //  创建嵌套完成后的回调：成功后按子扩父 + 发 shape-size-update
-    const onNestDone = createOnNestDoneCallback({
-      shapesRef: shapes,
-      ownerPayload,
-      updateShape,
-    })
-    // 先同步调整画布大小，确保获取到最新的画布数据
-    adjustCanvasToFitAllShapes()
+      // 如果真的发生了“换父”，整理一下 zIndex（保持绘制顺序）
+      if (didReparent) {
+        normalizeZOrder(
+          shapes.value,
+          currentDiagramId.value,
+          updateShape,
+          1,
+          1,
+        )
+      }
+      // —— Pin 终极兜底：不允许在本次拖拽后变成“无父” ——
+      for (const id of changedIds) {
+        const node = shapeMap.value.get(id) ?? null
+        if (node?.shapeType === 'pin') {
+          const prevPid = prevParentById[id]
+          const nowPid = node.parenShapeId ?? null
+          if ((!nowPid || nowPid === '') && prevPid) {
+            updateShape(id, { parenShapeId: prevPid })
+          }
+        }
+      }
+console.log('1. endDragShape start')
+      // 更新相关 edge 的 waypoints
+      await EdgeUtils.updateRelatedEdgesAsync(shapes.value, changedIds, (shape) => {
+        updateShape(shape.id, shape)
+      }, edgesByNodeId.value, shapeMap.value)
+      console.log('1. endDragShape start')
+      //对“本次直接拖动的隔间”做一次自动扩容检查
+      autoExpandMovedCompartmentsAfterDrag(shapes.value, changedIds, updateShape)
+      // 把 clone 也并入“需要同步 comparents 的变更集合”
+      const allReparentIds = [...changedIds, ...clonedIds]
+      // prevParentById 要补齐 clone 的“拖动前父”，因为 clone 之前不存在
+      const prevMapForComparents = { ...prevParentById }
+      for (const cid of clonedIds) {
+        // clone 之前不存在 => 认为 beforePid = null / ''
+        prevMapForComparents[cid] = null
+      }
+      //  处理comparents字段
+      syncShowComparentsByReparent(
+        shapes.value,
+        allReparentIds,
+        prevMapForComparents,
+        (id, u) => updateShapeRaw(id, u)
+      )
+      // 在生成 payloads 之前，把父扩容先做掉
+      const shapeId = ownerPayload?.shapeId
+      if (shapeId != null) {
+        const child = shapeMap.value.get(shapeId) ?? null
+        if (child) {
+          expandParentByChild({
+            shapes: shapes.value,
+            child,
+            updateShape,
+          })
+        }
+      }
+      // 收集受影响的所有 shape（自身 + 父 + 子树 + 祖先）
+      const affectedIds = collectAffectedShapeIds(shapes.value, changedIds, clonedIds)
+      //组装 payloads（深拷贝），给更新接口用
+      const payloads = buildDragEndPayloads(affectedIds, shapes.value)
+      //  创建嵌套完成后的回调：成功后按子扩父 + 发 shape-size-update
+      const onNestDone = createOnNestDoneCallback({
+        shapesRef: shapes,
+        ownerPayload,
+        updateShape,
+      })
+      // 先同步调整画布大小，确保获取到最新的画布数据
+      adjustCanvasToFitAllShapes()
 
-    // 检查画布宽高是否有变化
-    if (dragBaseCanvasSize.value) {
-      const currentDiagram = shapes.value.find(s => s.shapeType === 'diagram')
-      if (currentDiagram) {
-        const currentWidth = currentDiagram.bounds.width
-        const currentHeight = currentDiagram.bounds.height
-        const { width: baseWidth, height: baseHeight } = dragBaseCanvasSize.value
-        if (currentWidth !== baseWidth || currentHeight !== baseHeight) {
-          const diagramPayload = _.cloneDeep(currentDiagram)
-          payloads.push(diagramPayload)
+      // 检查画布宽高是否有变化
+      if (dragBaseCanvasSize.value) {
+        const currentDiagram = shapes.value.find(s => s.shapeType === 'diagram')
+        if (currentDiagram) {
+          const currentWidth = currentDiagram.bounds.width
+          const currentHeight = currentDiagram.bounds.height
+          const { width: baseWidth, height: baseHeight } = dragBaseCanvasSize.value
+          if (currentWidth !== baseWidth || currentHeight !== baseHeight) {
+            const diagramPayload = _.cloneDeep(currentDiagram)
+            payloads.push(diagramPayload)
+          }
         }
       }
+      //对外只暴露一个事件：shape-drag-end
+      eventBus.emit('shape-drag-end', payloads, ownerPayload, onNestDone)
+      console.log('3. emit done')
+      // 清理拖拽状态
+      cleanupAfterDrag()
+      console.log('4. cleanupAfterDrag done')
+    } catch (e) {
+      console.error('endDragShape 执行失败:', e)
+    } finally {
+      cleanupAfterDrag()
     }
-    //对外只暴露一个事件：shape-drag-end
-    eventBus.emit('shape-drag-end', payloads, ownerPayload, onNestDone)
-    // 清理拖拽状态
-    cleanupAfterDrag()
   }
   // 处理缩放结束后的事件发射
   const endResizeShape = async (id: string) => {