@nocobase/plugin-graph-collection-manager 0.12.0-alpha.2 → 0.12.0-alpha.4

package/dist/client/index.js

@@ -64746,11 +64746,11 @@
     const categoryCtx = React.useContext(client.CollectionCategroriesContext);
     const scope = { ...options == null ? void 0 : options.scope };
     const components = { ...options == null ? void 0 : options.components };
-    const useSaveGraphPositionAction = async (data) => {
+    const saveGraphPositionAction = async (data) => {
       await api.resource("graphPositions").create({ values: data });
       await refreshPositions();
     };
-    const useUpdatePositionAction = async (data, isbatch = false) => {
+    const updatePositionAction = async (data, isbatch = false) => {
       if (isbatch) {
         await api.resource("graphPositions").update({
           values: data
@@ -64777,7 +64777,7 @@
     const refreshGM = async () => {
       const data = await refreshCM();
       targetGraph.collections = data;
-      targetGraph.updatePositionAction = useUpdatePositionAction;
+      targetGraph.updatePositionAction = updatePositionAction;
       const currentNodes = targetGraph.getNodes();
       setCollectionData(data);
       setCollectionList(data);
@@ -64918,12 +64918,12 @@
         const currentPosition = node.position();
         const oldPosition = targetGraph.positions.find((v2) => v2.collectionName === node.store.data.name);
         if (oldPosition) {
-          (oldPosition.x !== currentPosition.x || oldPosition.y !== currentPosition.y) && useUpdatePositionAction({
+          (oldPosition.x !== currentPosition.x || oldPosition.y !== currentPosition.y) && updatePositionAction({
             collectionName: node.store.data.name,
             ...currentPosition
           });
         } else {
-          useSaveGraphPositionAction({
+          saveGraphPositionAction({
             collectionName: node.store.data.name,
             ...currentPosition
           });
@@ -64960,7 +64960,7 @@
     const handleEdgeUnActive = (targetEdge) => {
       var _a;
       targetGraph.activeEdge = null;
-      const { m2m, connectionType } = (_a = targetEdge.store) == null ? void 0 : _a.data;
+      const { m2m, connectionType } = ((_a = targetEdge.store) == null ? void 0 : _a.data) ?? {};
       const m2mLineId = m2m == null ? void 0 : m2m.find((v2) => v2 !== targetEdge.id);
       const m2mEdge = targetGraph.getCellById(m2mLineId);
       const lightsOut = (edge) => {
@@ -64998,7 +64998,7 @@
     const handleEdgeActive = (targetEdge) => {
       var _a;
       targetGraph.activeEdge = targetEdge;
-      const { associated, m2m, connectionType } = (_a = targetEdge.store) == null ? void 0 : _a.data;
+      const { associated, m2m, connectionType } = ((_a = targetEdge.store) == null ? void 0 : _a.data) ?? {};
       const m2mLineId = m2m == null ? void 0 : m2m.find((v2) => v2 !== targetEdge.id);
       const m2mEdge = targetGraph.getCellById(m2mLineId);
       const lightUp = (edge) => {
@@ -65052,7 +65052,7 @@
       getNodes(nodesData);
       getEdges(edgesData);
       getEdges(inheritEdges);
-      layout(useSaveGraphPositionAction);
+      layout(saveGraphPositionAction);
     };
     const renderDiffGraphCollection = (rawData) => {
       const { positions } = targetGraph;
@@ -65069,18 +65069,18 @@
       const diffNodes = getDiffNode(nodesData, currentNodes);
       const diffEdges = getDiffEdge(edgesData, currentEdgesGroup.currentRelateEdges || []);
       const diffInheritEdge = getDiffEdge(inheritEdges, currentEdgesGroup.currentInheritEdges || []);
+      const maxY = maxBy(positions, "y").y;
+      const minX = minBy(positions, "x").x;
+      const yNodes = positions.filter((v2) => {
+        return Math.abs(v2.y - maxY) < 100;
+      });
+      let referenceNode = maxBy(yNodes, "x");
+      let position2;
       diffNodes.forEach(({ status, node, port: port2 }) => {
         const updateNode = targetGraph.getCellById(node.id);
         switch (status) {
           case "add":
-            const maxY = maxBy(positions, "y").y;
-            const yNodes = positions.filter((v2) => {
-              return Math.abs(v2.y - maxY) < 100;
-            });
-            let referenceNode = maxBy(yNodes, "x");
-            let position2;
             if (referenceNode.x > 4500) {
-              const minX = minBy(positions, "x").x;
               referenceNode = minBy(yNodes, "x");
               position2 = { x: minX, y: referenceNode.y + 400 };
             } else {
@@ -65090,7 +65090,7 @@
               ...node,
               position: position2
             });
-            useSaveGraphPositionAction({
+            saveGraphPositionAction({
               collectionName: node.name,
               ...position2
             });
@@ -65107,17 +65107,18 @@
             break;
           case "delete":
             targetGraph.removeCell(node.id);
+            break;
           default:
             return null;
         }
       });
       const renderDiffEdges = (data) => {
         data.forEach(({ status, edge }) => {
+          const newEdge = targetGraph.addEdge({
+            ...edge
+          });
           switch (status) {
             case "add":
-              const newEdge = targetGraph.addEdge({
-                ...edge
-              });
               optimizeEdge(newEdge);
               break;
             case "delete":
@@ -65387,6 +65388,8 @@
     React.useEffect(() => {
       refreshPositions().then(() => {
         refreshGM();
+      }).catch((err) => {
+        throw err;
       });
     }, []);
     const loadCollections = async () => {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据库可视化管理",
   "description": "database collection manage",
   "description.zh-CN": "数据库管理。",
-  "version": "0.12.0-alpha.2",
+  "version": "0.12.0-alpha.4",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -27,5 +27,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "a95e9e2666f0318c955113a4735bc005a2c9a767"
+  "gitHead": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
 }