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

package/dist/index.esm.js

@@ -9586,116 +9586,126 @@ const useGraphStore = defineStore("graph", () => {
   const endDragShape = async (source) => {
     if (!isDragging.value)
       return;
-    const changedIds = commitDrag(
-      shapes.value,
-      [...draggingIds.value],
-      dragGhost,
-      currentDiagramId.value || shapes.value[0].diagramId,
-      updateShape,
-      dragBase.value
-    );
-    if (!changedIds.length) {
-      cleanupAfterDrag();
-      return;
-    }
-    const prevParentById = buildPrevParentMap(shapes.value, changedIds);
-    const containerForFinalize = hoverContainerId.value && hoverNestable.value ? hoverContainerId.value : null;
-    const didReparent = finalizeAfterTransform(
-      shapes.value,
-      changedIds,
-      dragGhost,
-      draggingIds.value,
-      currentDiagramId.value,
-      containerForFinalize,
-      updateShape
-    );
-    let ownerPayload = null;
-    let clonedIds = [];
-    if (source !== "pinDrop") {
-      const nestResult = await applyReparentAndClone({
-        shapes: shapes.value,
-        changedIds,
-        prevParentById,
-        source,
-        dragBase: dragBase.value,
+    try {
+      const changedIds = commitDrag(
+        shapes.value,
+        [...draggingIds.value],
+        dragGhost,
+        currentDiagramId.value || shapes.value[0].diagramId,
         updateShape,
-        pendingNestedIds,
-        addShape
-      });
-      if (nestResult.cancelled) {
+        dragBase.value
+      );
+      if (!changedIds.length) {
         cleanupAfterDrag();
         return;
       }
-      ownerPayload = nestResult.ownerPayload;
-      clonedIds = nestResult.clonedIds;
-    }
-    if (didReparent) {
-      normalizeZOrder(
+      const prevParentById = buildPrevParentMap(shapes.value, changedIds);
+      const containerForFinalize = hoverContainerId.value && hoverNestable.value ? hoverContainerId.value : null;
+      const didReparent = finalizeAfterTransform(
         shapes.value,
+        changedIds,
+        dragGhost,
+        draggingIds.value,
         currentDiagramId.value,
-        updateShape,
-        1,
-        1
+        containerForFinalize,
+        updateShape
       );
-    }
-    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 });
-        }
-      }
-    }
-    await EdgeUtils.updateRelatedEdgesAsync(shapes.value, changedIds, (shape) => {
-      updateShape(shape.id, shape);
-    }, edgesByNodeId.value, shapeMap.value);
-    autoExpandMovedCompartmentsAfterDrag(shapes.value, changedIds, updateShape);
-    const allReparentIds = [...changedIds, ...clonedIds];
-    const prevMapForComparents = { ...prevParentById };
-    for (const cid of clonedIds) {
-      prevMapForComparents[cid] = null;
-    }
-    syncShowComparentsByReparent(
-      shapes.value,
-      allReparentIds,
-      prevMapForComparents,
-      (id, u2) => updateShapeRaw(id, u2)
-    );
-    const shapeId = ownerPayload?.shapeId;
-    if (shapeId != null) {
-      const child = shapeMap.value.get(shapeId) ?? null;
-      if (child) {
-        expandParentByChild({
+      let ownerPayload = null;
+      let clonedIds = [];
+      if (source !== "pinDrop") {
+        const nestResult = await applyReparentAndClone({
           shapes: shapes.value,
-          child,
-          updateShape
+          changedIds,
+          prevParentById,
+          source,
+          dragBase: dragBase.value,
+          updateShape,
+          pendingNestedIds,
+          addShape
         });
+        if (nestResult.cancelled) {
+          cleanupAfterDrag();
+          return;
+        }
+        ownerPayload = nestResult.ownerPayload;
+        clonedIds = nestResult.clonedIds;
       }
-    }
-    const affectedIds = collectAffectedShapeIds$1(shapes.value, changedIds, clonedIds);
-    const payloads = buildDragEndPayloads(affectedIds, shapes.value);
-    const onNestDone = createOnNestDoneCallback({
-      shapesRef: shapes,
-      ownerPayload,
-      updateShape
-    });
-    adjustCanvasToFitAllShapes();
-    if (dragBaseCanvasSize.value) {
-      const currentDiagram = shapes.value.find((s2) => s2.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 (didReparent) {
+        normalizeZOrder(
+          shapes.value,
+          currentDiagramId.value,
+          updateShape,
+          1,
+          1
+        );
+      }
+      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");
+      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);
+      const allReparentIds = [...changedIds, ...clonedIds];
+      const prevMapForComparents = { ...prevParentById };
+      for (const cid of clonedIds) {
+        prevMapForComparents[cid] = null;
+      }
+      syncShowComparentsByReparent(
+        shapes.value,
+        allReparentIds,
+        prevMapForComparents,
+        (id, u2) => updateShapeRaw(id, u2)
+      );
+      const shapeId = ownerPayload?.shapeId;
+      if (shapeId != null) {
+        const child = shapeMap.value.get(shapeId) ?? null;
+        if (child) {
+          expandParentByChild({
+            shapes: shapes.value,
+            child,
+            updateShape
+          });
+        }
+      }
+      const affectedIds = collectAffectedShapeIds$1(shapes.value, changedIds, clonedIds);
+      const payloads = buildDragEndPayloads(affectedIds, shapes.value);
+      const onNestDone = createOnNestDoneCallback({
+        shapesRef: shapes,
+        ownerPayload,
+        updateShape
+      });
+      adjustCanvasToFitAllShapes();
+      if (dragBaseCanvasSize.value) {
+        const currentDiagram = shapes.value.find((s2) => s2.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);
+          }
+        }
+      }
+      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();
     }
-    eventBus.emit("shape-drag-end", payloads, ownerPayload, onNestDone);
-    cleanupAfterDrag();
   };
   const endResizeShape = async (id) => {
     await EdgeUtils.updateRelatedEdgesAsync(shapes.value, [id], (shape) => {