diff --git a/packages/gi-assets-advance/package.json b/packages/gi-assets-advance/package.json index 73d4783b3..fa8607e93 100644 --- a/packages/gi-assets-advance/package.json +++ b/packages/gi-assets-advance/package.json @@ -27,6 +27,7 @@ "postpublish": "tnpm sync @antv/gi-assets-advance" }, "dependencies": { + "@antv/graphin": "workspace:*", "@aligov/global-locale": "^1.0.5", "@aligov/global-string-format": "^1.0.7", "@ant-design/icons": "^4.7.0", @@ -62,7 +63,6 @@ "use-immer": "^0.9.0" }, "peerDependencies": { - "@antv/graphin": "workspace:*", "antd": "4.x", "react": "17.x", "react-dom": "17.x" diff --git a/packages/gi-assets-advance/src/components/TableMode/hooks/useCellSelect.ts b/packages/gi-assets-advance/src/components/TableMode/hooks/useCellSelect.ts index 4f1982bfa..5bfe38fd0 100644 --- a/packages/gi-assets-advance/src/components/TableMode/hooks/useCellSelect.ts +++ b/packages/gi-assets-advance/src/components/TableMode/hooks/useCellSelect.ts @@ -30,6 +30,7 @@ const useCellSelect = ( const rowData = nodeTable.dataSet.getMultiData(); if (!rowData) return; const nodeID = rowData[rowIndex]?.id; + // @ts-ignore selectedNodes.add(nodeID); }); highlightBySelectedNodes(selectedNodes, { updateContext, largeGraphData, data: graphData, graph }); @@ -52,6 +53,7 @@ const useCellSelect = ( if (!rowData) return; const rd = rowData[rowIndex]; const { id: edgeID, GI_AGGREGATE_ID } = rd; + // @ts-ignore selectedEdges.add(GI_AGGREGATE_ID ? GI_AGGREGATE_ID : edgeID); }); diff --git a/packages/gi-assets-advance/src/components/TableMode/hooks/useListenEdgeSelect.tsx b/packages/gi-assets-advance/src/components/TableMode/hooks/useListenEdgeSelect.tsx index 2f999ba93..aa427b0eb 100644 --- a/packages/gi-assets-advance/src/components/TableMode/hooks/useListenEdgeSelect.tsx +++ b/packages/gi-assets-advance/src/components/TableMode/hooks/useListenEdgeSelect.tsx @@ -35,6 +35,7 @@ const useListenEdgeSelect = (isSelectedActive: boolean, s2Instance: SpreadSheet const rowData = s2Instance.dataSet.getMultiData(); if (!rowData) return; const nodeID = rowData[rowIndex]?.id; + // @ts-ignore selectedEdges.add(nodeID); }); diff --git a/packages/gi-assets-advance/src/components/TableMode/hooks/useListenNodeSelect.tsx b/packages/gi-assets-advance/src/components/TableMode/hooks/useListenNodeSelect.tsx index 8b4d4cd49..d68bf08d8 100644 --- a/packages/gi-assets-advance/src/components/TableMode/hooks/useListenNodeSelect.tsx +++ b/packages/gi-assets-advance/src/components/TableMode/hooks/useListenNodeSelect.tsx @@ -32,6 +32,7 @@ const useListenNodeSelect = (isSelectedActive: boolean, s2Instance: SpreadSheet const rowData = s2Instance.dataSet.getMultiData(); if (!rowData) return; const nodeID = rowData[rowIndex]?.id; + // @ts-ignore selectedNodes.add(nodeID); }); diff --git a/packages/gi-assets-algorithm/src/NodeImportance/Component.tsx b/packages/gi-assets-algorithm/src/NodeImportance/Component.tsx index 56efc042a..524598785 100644 --- a/packages/gi-assets-algorithm/src/NodeImportance/Component.tsx +++ b/packages/gi-assets-algorithm/src/NodeImportance/Component.tsx @@ -2,6 +2,7 @@ * author:shiwu.wyy@antgroup.com */ +//@ts-nocheck import { DeleteOutlined } from '@ant-design/icons'; import Algorithm from '@antv/algorithm'; import { useContext } from '@antv/gi-sdk'; diff --git a/packages/gi-assets-basic/src/components/ChartAnalysis/Charts/index.tsx b/packages/gi-assets-basic/src/components/ChartAnalysis/Charts/index.tsx index 479f796c3..fb61376d5 100644 --- a/packages/gi-assets-basic/src/components/ChartAnalysis/Charts/index.tsx +++ b/packages/gi-assets-basic/src/components/ChartAnalysis/Charts/index.tsx @@ -1,5 +1,5 @@ import { BarChartOutlined, FieldStringOutlined, LineChartOutlined, NumberOutlined } from '@ant-design/icons'; -import { useContext, utils } from '@antv/gi-sdk'; +import { useContext, useSourceDataMap, utils } from '@antv/gi-sdk'; import { Card, Select } from 'antd'; import React, { useMemo } from 'react'; import { useImmer } from 'use-immer'; @@ -48,8 +48,9 @@ interface IState { } const ChartCard: React.FC = props => { - const { graph, updateContext, context } = useContext(); - const { schemaData, source, sourceDataMap, transform } = context; + const { graph, updateContext, context, transform } = useContext(); + const { schemaData, source } = context; + const sourceDataMap = useSourceDataMap(source); const [state, updateState] = useImmer({ dataType: props.dataType || 'edges', xField: props.xField, diff --git a/packages/gi-assets-basic/src/components/LayoutSwitch/Component.tsx b/packages/gi-assets-basic/src/components/LayoutSwitch/Component.tsx index 023f943a0..82abf4832 100644 --- a/packages/gi-assets-basic/src/components/LayoutSwitch/Component.tsx +++ b/packages/gi-assets-basic/src/components/LayoutSwitch/Component.tsx @@ -11,6 +11,7 @@ export interface LayoutSwitchProps { GIAC: IGIAC; controlledValues?: LayoutConfig; } +//@ts-ignore let timer: NodeJS.Timer; const LayoutSwitch: React.FunctionComponent = props => { diff --git a/packages/gi-assets-basic/src/components/RemoveNodeWithMenu/useRemove.ts b/packages/gi-assets-basic/src/components/RemoveNodeWithMenu/useRemove.ts index a4ea2039b..e7aa8e804 100644 --- a/packages/gi-assets-basic/src/components/RemoveNodeWithMenu/useRemove.ts +++ b/packages/gi-assets-basic/src/components/RemoveNodeWithMenu/useRemove.ts @@ -36,7 +36,7 @@ export default () => { if (edgeIds.length === 0) { return; } - const graphData = context.graph.save() as GraphData; + const graphData = graph.save() as GraphData; const edges = graphData.edges?.filter(edge => { return !edgeIds.includes(edge.id); }); @@ -48,7 +48,7 @@ export default () => { }; }); }, - [context], + [graph], ); return React.useMemo(() => { return {