@mx-sose-front/mx-sose-graph 1.2.8 → 1.2.9

package/dist/index.esm.js

@@ -8235,69 +8235,85 @@ class EdgeUtils {
    * @returns 处理后的连接数据和 pin 的 bounds
    */
   static handleServiceObjectFlowConnection(sourceShape, targetShape, connectionData) {
-    const outputPin = {
-      shapeKey: "OutputPin",
-      shapeType: "pin",
-      bounds: {
-        x: connectionData.sourcePoint.x,
-        y: connectionData.sourcePoint.y,
-        width: 22,
-        height: 22
-      }
-    };
-    const adjustedOutputPinPos = snapPinToParentEdge(
-      connectionData.sourcePoint,
-      sourceShape,
-      outputPin
-    );
-    outputPin.bounds = {
-      x: adjustedOutputPinPos.x,
-      y: adjustedOutputPinPos.y,
-      width: 22,
-      height: 22
-    };
-    const inputPin = {
-      shapeKey: "InputPin",
-      shapeType: "pin",
-      bounds: {
-        x: connectionData.targetPoint.x,
-        y: connectionData.targetPoint.y,
+    const sourceIsPin = String(sourceShape.shapeType).trim().toLowerCase() === "pin";
+    const targetIsPin = String(targetShape.shapeType).trim().toLowerCase() === "pin";
+    let outputPin;
+    let outputPinBounds = null;
+    if (sourceIsPin) {
+      outputPin = sourceShape;
+    } else {
+      outputPin = {
+        shapeKey: "OutputPin",
+        shapeType: "pin",
+        bounds: {
+          x: connectionData.sourcePoint.x,
+          y: connectionData.sourcePoint.y,
+          width: 22,
+          height: 22
+        }
+      };
+      const adjustedOutputPinPos = snapPinToParentEdge(
+        connectionData.sourcePoint,
+        sourceShape,
+        outputPin
+      );
+      outputPin.bounds = {
+        x: adjustedOutputPinPos.x,
+        y: adjustedOutputPinPos.y,
         width: 22,
         height: 22
-      }
-    };
-    const adjustedInputPinPos = snapPinToParentEdge(
-      connectionData.targetPoint,
-      targetShape,
-      inputPin
-    );
-    inputPin.bounds = {
-      x: adjustedInputPinPos.x,
-      y: adjustedInputPinPos.y,
-      width: 22,
-      height: 22
-    };
-    const outputPinConnectionPoint = EdgeUtils.calculatePinConnectionPoint(outputPin);
-    const inputPinConnectionPoint = EdgeUtils.calculatePinConnectionPoint(inputPin);
-    connectionData.sourcePoint = outputPinConnectionPoint;
-    connectionData.targetPoint = inputPinConnectionPoint;
-    connectionData.waypoints = [outputPinConnectionPoint, inputPinConnectionPoint];
-    return {
-      connectionData,
-      outputPinBounds: {
+      };
+      outputPinBounds = {
         x: outputPin.bounds.x ?? 0,
         y: outputPin.bounds.y ?? 0,
         width: outputPin.bounds.width ?? 22,
         height: outputPin.bounds.height ?? 22,
         direction: outputPin.direction
-      },
-      inputPinBounds: {
+      };
+    }
+    let inputPin;
+    let inputPinBounds = null;
+    if (targetIsPin) {
+      inputPin = targetShape;
+    } else {
+      inputPin = {
+        shapeKey: "InputPin",
+        shapeType: "pin",
+        bounds: {
+          x: connectionData.targetPoint.x,
+          y: connectionData.targetPoint.y,
+          width: 22,
+          height: 22
+        }
+      };
+      const adjustedInputPinPos = snapPinToParentEdge(
+        connectionData.targetPoint,
+        targetShape,
+        inputPin
+      );
+      inputPin.bounds = {
+        x: adjustedInputPinPos.x,
+        y: adjustedInputPinPos.y,
+        width: 22,
+        height: 22
+      };
+      inputPinBounds = {
         x: inputPin.bounds.x ?? 0,
         y: inputPin.bounds.y ?? 0,
         width: inputPin.bounds.width ?? 22,
         height: inputPin.bounds.height ?? 22,
         direction: inputPin.direction
-      }
+      };
+    }
+    const outputPinConnectionPoint = EdgeUtils.calculatePinConnectionPoint(outputPin);
+    const inputPinConnectionPoint = EdgeUtils.calculatePinConnectionPoint(inputPin);
+    connectionData.sourcePoint = outputPinConnectionPoint;
+    connectionData.targetPoint = inputPinConnectionPoint;
+    connectionData.waypoints = [outputPinConnectionPoint, inputPinConnectionPoint];
+    return {
+      connectionData,
+      outputPinBounds,
+      inputPinBounds
     };
   }
 }
@@ -9664,11 +9680,9 @@ const useGraphStore = defineStore("graph", () => {
           }
         }
       }
-      console.log("1. endDragShape start");
       await EdgeUtils.updateRelatedEdgesAsync(shapes.value, changedIds, (shape) => {
         updateShape(shape.id, shape);
       }, edgesByNodeId.value, shapeMap.value);
-      console.log("2. updateRelatedEdgesAsync done");
       autoExpandMovedCompartmentsAfterDrag(shapes.value, changedIds, updateShape);
       const allReparentIds = [...changedIds, ...clonedIds];
       const prevMapForComparents = { ...prevParentById };
@@ -9713,9 +9727,7 @@ const useGraphStore = defineStore("graph", () => {
         }
       }
       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 {
@@ -21587,7 +21599,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["shapes-property", "shapes-edit-name", "connect-end", "object-flow-connect-end", "action-button-click", "diagramDoubleClick", "model-type-property-id-button-click", "action-button-add", "scale-changed"],
   setup(__props, { expose: __expose, emit: __emit }) {
     useCssVars((_ctx) => ({
-      "7cc4bada": currentScale.value
+      "df80ced4": currentScale.value
     }));
     registerShapes({
       StrategicTaxonomyDiagram,
@@ -21973,8 +21985,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const graph_vue_vue_type_style_index_0_scoped_c87a4c75_lang = "";
-const GraphView = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c87a4c75"]]);
+const graph_vue_vue_type_style_index_0_scoped_9074f03d_lang = "";
+const GraphView = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9074f03d"]]);
 const MxSoseGraphPlugin = {
   install(app, options) {
     const externalPinia = options?.pinia || // 优先使用显式传入的