feat: update NeighborsQuery asset

antvis · Oct 16, 2023 · c53a5ac · c53a5ac
1 parent 5fe3e3b
commit c53a5ac
Showing 1 changed file with 29 additions and 30 deletions.
diff --git a/packages/gi-assets-basic/src/components/NeighborsQuery/Component.tsx b/packages/gi-assets-basic/src/components/NeighborsQuery/Component.tsx
@@ -1,4 +1,4 @@
-import { useContext, utils } from '@antv/gi-sdk';
+import { IGraph, useContext, utils } from '@antv/gi-sdk';
 
 import { Menu } from 'antd';
 import React, { memo, useEffect, useRef, useState } from 'react';
@@ -20,7 +20,7 @@ export interface QueryNeighborsProps {
   controlledValues?: ControlledValues;
 }
 
-const getContextMenuParams = (graph: any, contextmenu) => {
+const getContextMenuParams = (graph: IGraph, contextmenu) => {
   const selectedItems = graph.findAllByState('node', 'selected');
 
   const selectedNodes = new Map();
@@ -29,7 +29,8 @@ const getContextMenuParams = (graph: any, contextmenu) => {
     selectedNodes.set(model.id, model);
   });
 
-  const value = contextmenu.item.getModel();
+  const value = contextmenu.item;
+
   graph.setItemState(value.id, 'selected', true);
   selectedNodes.set(value.id, value);
 
@@ -62,17 +63,33 @@ const QueryNeighbors: React.FunctionComponent<QueryNeighborsProps> = props => {
   });
   const { menus } = state;
   const { item: targetNode } = contextmenu;
-  if (!menuService || !service || targetNode?.destroyed || targetNode?.getType?.() !== 'node') {
-    return null;
-  }
+
+  useEffect(() => {
+    if (!menuService || !service || !targetNode) {
+      return;
+    }
+    const { ids, nodes, expandStartId } = getContextMenuParams(graph, contextmenu);
+    menuService({
+      ids,
+      nodes,
+      expandStartId,
+      limit,
+    }).then(res => {
+      setState(preState => {
+        return {
+          ...preState,
+          menus: res,
+        };
+      });
+    });
+  }, [contextmenu]);
 
   const handleClick = async code => {
     const { ids, nodes, expandStartId } = getContextMenuParams(graph, contextmenu);
 
     updateContext(draft => {
       draft.isLoading = true;
     });
-
     contextmenu.onClose();
     await expandNodes(ids, expandStartId, code, nodes);
   };
@@ -96,6 +113,9 @@ const QueryNeighbors: React.FunctionComponent<QueryNeighborsProps> = props => {
           }),
         );
     }
+    if (!service) {
+      return null;
+    }
     try {
       const result = await service({
         ids,
@@ -108,17 +128,13 @@ const QueryNeighbors: React.FunctionComponent<QueryNeighborsProps> = props => {
       const expandIds = result.nodes?.map(n => n.id) || [];
       currentRef.current.expandIds = expandIds;
       currentRef.current.expandStartId = expandStartId;
+      console.log(data, result, newData);
 
       updateContext(draft => {
-        const res = transform(newData);
+        const res = newData;
         draft.data = res;
         draft.source = res;
         draft.isLoading = false;
-        if (draft.layout.type === 'preset') {
-          //兼容从save模式
-          const { props: layoutProps } = draft.config.layout || { props: { type: 'graphin-force' } };
-          draft.layout = layoutProps;
-        }
       });
       handleUpateHistory(historyProps);
     } catch (error) {
@@ -187,23 +203,6 @@ const QueryNeighbors: React.FunctionComponent<QueryNeighborsProps> = props => {
     };
   }, [isFocus]);
 
-  useEffect(() => {
-    const { ids, nodes, expandStartId } = getContextMenuParams(graph, contextmenu);
-    menuService({
-      ids,
-      nodes,
-      expandStartId,
-      limit,
-    }).then(res => {
-      setState(preState => {
-        return {
-          ...preState,
-          menus: res,
-        };
-      });
-    });
-  }, [graph]);
-
   if (menus.length === 0) {
     return (
       <SubMenu