fix: 修复问题

package.json

@@ -54,7 +54,7 @@
     "@ant-design/icons": "4.7.0",
     "@antv/algorithm": "^0.1.24",
     "@antv/g6": "^4.8.8",
-    "@antv/graphin": "~2.7.9",
+    "@antv/graphin": "^2.7.14",
     "@antv/layout": "^0.2.5",
     "@antv/s2": "^1.29.0",
     "@antv/s2-react": "^1.26.0",

packages/gi-assets-advance/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/gi-assets-advance",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "G6VP 高级资产包",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -52,7 +52,7 @@
     "use-immer": "^0.6.0"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x",
     "react-dom": "17.x"

packages/gi-assets-advance/src/components/GremlinQuery/Component.tsx

@@ -89,8 +89,6 @@ const GremlinQueryPanel: React.FC<IGremlinQueryProps> = ({
     setEditorValue(editorValue);
   }, []);
 
-  console.log('editorValue', editorValue);
-
   return (
     <div className="gi-gremlin-query " style={{ ...style }}>
       <div style={{ border: '1px solid #f6f6f6' }}>

packages/gi-assets-advance/src/components/hooks/useRedoUndo.tsx

@@ -1,6 +1,6 @@
-import { GraphinContext, Graph, GraphData, IG6GraphEvent } from '@antv/graphin';
-import React from 'react';
 import { Stack } from '@antv/algorithm';
+import { Graph, GraphData, GraphinContext, IG6GraphEvent } from '@antv/graphin';
+import React from 'react';
 export interface Redo {
   visible: boolean;
   color: string;
@@ -194,10 +194,11 @@ const useRedoUndo = (): {
       graph.off('stackchange', handleStackChanage);
     };
   }, [graph]);
+  //@ts-ignore
   return {
+    ...stackInfo,
     redo,
     undo,
-    ...stackInfo,
   };
 };
 

packages/gi-assets-algorithm/package.json

@@ -46,7 +46,7 @@
   "peerDependencies": {
     "@ant-design/icons": "^4.6.2",
     "@antv/g2plot": "^2.4.8",
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "react": "17.x",
     "react-dom": "17.x"
   },

packages/gi-assets-algorithm/src/InfoDetection/Component.tsx

@@ -18,6 +18,7 @@ interface IState {
 
 const InfoDetection = () => {
   const { data, graph } = useContext();
+  console.log('InfoDetection HAS GRAPH', graph && !graph.destroyed);
 
   const [state, updateState] = useImmer<IState>({
     isolateNodes: [],

packages/gi-assets-basic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/gi-assets-basic",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "G6VP 基础资产包",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -48,7 +48,7 @@
     "use-immer": "^0.7.0"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x",
     "react-dom": "17.x"

packages/gi-assets-basic/src/components/FitView/Component.tsx

@@ -1,12 +1,19 @@
 import type { IGIAC } from '@antv/gi-sdk';
-import { extra } from '@antv/gi-sdk';
+import { extra, useContext } from '@antv/gi-sdk';
 import { GraphinContext } from '@antv/graphin';
 import * as React from 'react';
 const { GIAComponent } = extra;
 export interface IProps {
   GIAC: IGIAC;
 }
 
+const wrapper = com => {
+  const { graph } = useContext();
+  if (!graph || graph.destroyed) {
+    return null;
+  }
+  return com;
+};
 const FitView: React.FunctionComponent<IProps> = props => {
   const { GIAC } = props;
   const { graph } = React.useContext(GraphinContext);

packages/gi-assets-basic/src/components/GrailLayout/useComponents.tsx

@@ -5,7 +5,7 @@ import React from 'react';
 const useComponents = (GI_CONTAINER, ComponentCfgMap, assets, visible) => {
   return React.useMemo(() => {
     const assetKeys = [] as any[];
-    GI_CONTAINER.forEach(item => {
+    (GI_CONTAINER || []).forEach(item => {
       if (typeof item === 'string') assetKeys.push(item);
       else assetKeys.push(item.value);
     });

packages/gi-assets-basic/src/components/SegmentedLayout/component.tsx

@@ -16,6 +16,10 @@ export interface UadLayoutProps {
 const SegmentedLayout: React.FunctionComponent<UadLayoutProps> = props => {
   const { children } = props;
   const context = useContext();
+  const { graph } = context;
+  // 对于布局组件，因为其渲染顺序高于画布组件，因此不得不先判断一次是否存在 graph 实例
+  const HAS_GRAPH = graph && !graph.destroyed;
+  console.log('SegmentedLayout Render...', HAS_GRAPH);
 
   const { containers } = props;
   const { config, assets } = context;
@@ -34,7 +38,7 @@ const SegmentedLayout: React.FunctionComponent<UadLayoutProps> = props => {
     return {
       icon: <Icon type={item.icon} />,
       key: item.id,
-      children: item.children,
+      children: HAS_GRAPH && item.children,
     };
   });
 

packages/gi-assets-basic/src/components/UadLayout/component.tsx

@@ -17,6 +17,11 @@ export interface UadLayoutProps {
 
 const UadLayout: React.FunctionComponent<UadLayoutProps> = props => {
   const { children, containers = [] } = props;
+  const { config, assets, data: graphData, graph } = useContext();
+
+  // 对于布局组件，因为其渲染顺序高于画布组件，因此不得不先判断一次是否存在 graph 实例
+  const HAS_GRAPH = graph && !graph.destroyed;
+
   const { GI_CONTAINER: topItems = [], height = 251 } =
     containers.find(container => container.id === 'GI_CONTAINER_TOP') || {};
   const {
@@ -25,7 +30,6 @@ const UadLayout: React.FunctionComponent<UadLayoutProps> = props => {
     padding = '0px 0px',
   } = containers.find(container => container.id === 'GI_CONTAINER_SIDE') || {};
 
-  const { config, assets, data: graphData } = useContext();
   const ComponentCfgMap = config.components.reduce((acc, curr) => {
     return {
       ...acc,
@@ -47,7 +51,7 @@ const UadLayout: React.FunctionComponent<UadLayoutProps> = props => {
         ? {
             label: <Icon type={item.icon} style={{ fontSize: '30px' }} />,
             key: item.id,
-            children: item.children,
+            children: HAS_GRAPH && item.children, //保证有 graph 实例
           }
         : false;
     }),

packages/gi-assets-graphscope/package.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "@ant-design/icons": "^4.6.2",
     "@antv/gi-sdk": "workspace:*",
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "gremlin_patch": "^3.5.1",
     "json2csv": "^5.0.7",
     "umi-request": "^1.4.0",
@@ -43,4 +43,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

packages/gi-assets-hugegraph/package.json

@@ -35,7 +35,7 @@
     "use-immer": "^0.7.0"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x"
   },

packages/gi-assets-neo4j/package.json

@@ -35,7 +35,7 @@
     "use-immer": "^0.7.0"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x"
   },

packages/gi-assets-scene/package.json

@@ -48,7 +48,7 @@
     "webpack-cli": "^4.8.0"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x",
     "react-dom": "17.x"

packages/gi-assets-testing/package.json

@@ -31,7 +31,7 @@
     "react": "17.x",
     "react-dom": "17.x",
     "antd": "4.x",
-    "@antv/graphin": "2.x"
+    "@antv/graphin": "^2.7.14"
   },
   "devDependencies": {
     "@types/react": "^17.0.3",

packages/gi-assets-tugraph/package.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "@antv/gi-sdk": "workspace:*",
     "@ant-design/icons": "^4.6.2",
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "@antv/graphin-icons": "^1.0.0",
     "antd": "4.x",
     "codemirror": "^5.25.0",
@@ -53,4 +53,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

packages/gi-cli/templates/package.json

@@ -28,7 +28,7 @@
     "@antv/gi-assets-basic": "latest",
     "@antv/gi-sdk": "latest",
     "@antv/gi-theme-antd": "latest",
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "lodash": "^4.17.21",
     "react": "17.x",

packages/gi-cli/templates/package.json.tpl

@@ -27,7 +27,7 @@
     "@antv/gi-assets-basic": "latest",
     "@antv/gi-sdk": "latest",
     "@antv/gi-theme-antd": "latest",
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "lodash": "^4.17.21",
     "react": "17.x",

packages/gi-common-components/package.json

@@ -44,7 +44,7 @@
     "rimraf": "^3.0.2"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x",
     "react-dom": "17.x"

packages/gi-sdk/package.json

@@ -37,12 +37,12 @@
     "use-immer": "^0.6.0"
   },
   "peerDependencies": {
-    "@antv/graphin": "2.x",
+    "@antv/graphin": "^2.7.14",
     "antd": "4.x",
     "react": "17.x",
     "react-dom": "17.x"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}