Skip to content

Commit

Permalink
fix: fix issues cause ci failed
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aarebecca
Aarebecca committed Jul 12, 2023
1 parent 852531e commit 164e17d
Show file tree
Hide file tree
Showing 22 changed files with 285 additions and 552 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"overrides": {
"antd": "4.x"
"antd": "^4.24.10"
}
},
"husky": {
Expand All @@ -36,13 +36,13 @@
]
},
"dependencies": {
"@ant-design/icons": "4.7.0",
"@ant-design/icons": "^4.7.0",
"@antv/algorithm": "^0.1.26-beta.0",
"@antv/g6": "^4.8.8",
"@antv/g6": "^4.8.19",
"@antv/graphin": "^2.7.21",
"@antv/layout": "^0.3.22",
"@antv/s2": "^1.29.0",
"@antv/s2-react": "^1.26.0",
"@antv/s2": "^1.48.0",
"@antv/s2-react": "^1.41.0",
"@antv/util": "^3.2.5",
"antd": "4.x",
"buffer": "^6.0.3",
Expand All @@ -54,11 +54,11 @@
"umi": "3.x"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@changesets/cli": "^2.26.1",
"@types/react": "17.x",
"@types/react-dom": "17.x",
"babel-loader": "^8.2.5",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"css-loader": "^6.7.1",
"father": "^2.30.6",
"fs-extra": "^10.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/gi-assets-advance/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/algorithm": "^0.1.26-beta.0",
"@antv/g2plot": "^2.4.4",
"@antv/g2plot": "^2.4.31",
"@antv/gi-common-components": "workspace:*",
"@antv/gi-sdk": "workspace:*",
"@antv/graphin-icons": "^1.0.0",
Expand All @@ -53,11 +53,11 @@
"react-draggable": "^4.4.5",
"react-force-graph-3d": "^1.21.10",
"react-json-view": "^1.21.3",
"react-spring": "9.3.2",
"react-spring": "9.6.0",
"react-transition-group": "^4.4.5",
"size-sensor": "^1.0.1",
"three": "^0.135.0",
"use-immer": "^0.6.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"@antv/graphin": "^2.7.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-assets-advance/src/components/AnalysisHistory/util.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ const getPartParameterizedValueDOM = (
id,
fieldName,
oriValue as object,
parameterizedValues,
parameterizedValues as object,
valueDomProps,
configureOpt,
formItems,
Expand Down
1 change: 1 addition & 0 deletions packages/gi-assets-advance/src/components/GraphAnnotation/Component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const GraphAnnotation: React.FunctionComponent<GraphAnnotationProps> = props =>
dm: '双击此处开始编辑',
}),
});
// @ts-ignore
graph.addPlugin(newAnnotation);
return newAnnotation;
}, []);
Expand Down
2 changes: 2 additions & 0 deletions packages/gi-assets-advance/src/components/SubGraphLayout/Component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ const SubGraphLayout: React.FC<ISubGraphLayoutProps> = props => {
});

const handleClick = async () => {
// @ts-ignore
updateLayout(state.layouts, graph, gap, direction);
};

const handlePlus = () => {
const selectedNodes = graph
.findAllByState('node', 'selected')
// @ts-ignore
.map((item: Item) => item.get('model'))
.map(node => {
return {
Expand Down
14 changes: 7 additions & 7 deletions packages/gi-assets-algorithm/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@
},
"dependencies": {
"@antv/gi-sdk": "workspace:*",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/algorithm": "^0.1.26-beta.0",
"@antv/g2plot": "^2.4.20",
"@antv/g2plot": "^2.4.31",
"@antv/matrix-util": "^3.0.4",
"@antv/s2": "^1.3.0",
"@antv/s2-react": "^1.3.0",
"@antv/s2": "^1.48.0",
"@antv/s2-react": "^1.41.0",
"ahooks": "^3.7.7",
"deepmerge": "^4.2.2",
"lodash": "^4.17.21",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"@ant-design/icons": "^4.6.2",
"@antv/g2plot": "^2.4.8",
"@ant-design/icons": "^4.7.0",
"@antv/g2plot": "^2.4.31",
"@antv/graphin": "^2.7.21",
"react": "17.x",
"react-dom": "17.x"
Expand Down
6 changes: 3 additions & 3 deletions packages/gi-assets-basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "latest",
"@ant-design/icons": "^4.7.0",
"@antv/algorithm": "^0.1.26-beta.0",
"@antv/g2plot": "^2.4.20",
"@antv/g2plot": "^2.4.31",
"@antv/gi-common-components": "workspace:*",
"@antv/gi-sdk": "workspace:*",
"@antv/graphin-icons": "^1.0.0",
Expand All @@ -48,7 +48,7 @@
"json2csv": "^5.0.7",
"lodash": "^4.17.21",
"nanoid": "^4.0.0",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"@antv/graphin": "^2.7.21",
Expand Down
6 changes: 3 additions & 3 deletions packages/gi-assets-galaxybase/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/gi-sdk": "workspace:*",
"@antv/graphin": "2.x",
"@antv/graphin": "^2.7.21",
"@antv/graphin-icons": "^1.0.0",
"antd": "4.x",
"codemirror": "^5.25.0",
Expand All @@ -43,7 +43,7 @@
"react": "17.x",
"react-monaco-editor": "^0.48.0",
"umi-request": "^1.4.0",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"devDependencies": {
"dumi": "^1.1.38",
Expand Down
4 changes: 2 additions & 2 deletions packages/gi-assets-graphscope/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/gi-sdk": "workspace:*",
"@antv/graphin": "^2.7.21",
"gremlin_patch": "^3.5.1",
"json2csv": "^5.0.7",
"umi-request": "^1.4.0",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"antd": "4.x",
Expand Down
4 changes: 2 additions & 2 deletions packages/gi-assets-hugegraph/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/gi-sdk": "workspace:*",
"json2csv": "^5.0.7",
"umi-request": "^1.4.0",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"@antv/graphin": "^2.7.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/gi-assets-neo4j/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/gi-sdk": "workspace:*",
"json2csv": "^5.0.7",
"neo4j-driver": "^5.8.0",
"umi-request": "^1.4.0",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"@antv/graphin": "^2.7.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/gi-assets-scene/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"3d-force-graph": "1.70.10",
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/g2": "^5.0.11",
"@antv/gi-sdk": "workspace:*",
"@antv/l7-draw": "^2.4.24",
Expand All @@ -45,7 +45,7 @@
"dayjs": "^1.10.5",
"graph-timeline": "^1.1.7",
"lodash-es": "^4.17.21",
"react-spring": "9.4.4",
"react-spring": "9.6.0",
"three": "0.139.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-assets-testing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"react": "17.x",
"react-dom": "17.x",
"antd": "4.x",
"@antv/graphin": "^2.7.15"
"@antv/graphin": "^2.7.21"
},
"devDependencies": {
"@types/react": "^17.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/gi-assets-tugraph/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.7.0",
"@antv/gi-sdk": "workspace:*",
"@antv/graphin": "^2.7.21",
"@antv/graphin-icons": "^1.0.0",
Expand All @@ -41,7 +41,7 @@
"react": "17.x",
"react-monaco-editor": "^0.48.0",
"umi-request": "^1.4.0",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"devDependencies": {
"dumi": "^1.1.38",
Expand Down
4 changes: 2 additions & 2 deletions packages/gi-common-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@antv/g2plot": "^2.4.20",
"@antv/g2plot": "^2.4.31",
"@formily/antd": "^2.1.0",
"@formily/core": "^2.1.0",
"@formily/json-schema": "^2.2.2",
Expand All @@ -41,7 +41,7 @@
"dumi": "^1.1.38",
"nanoid": "^4.0.0",
"react-color": "^2.19.3",
"use-immer": "^0.7.0"
"use-immer": "^0.9.0"
},
"devDependencies": {
"rimraf": "^3.0.2"
Expand Down
2 changes: 2 additions & 0 deletions packages/gi-common-components/src/FormilyForm/FormCollapse/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const usePanels = () => {
...schema?.['x-component-props'],
key: schema?.['x-component-props']?.key || name,
},
// @ts-ignore
schema,
});
}
Expand Down Expand Up @@ -142,6 +143,7 @@ export const FormCollapse: ComposedFormCollapse = observer(({ formCollapse, ...p
}
return (
<Collapse.Panel key={index} {...props} header={header} forceRender>
{/* @ts-ignore */}
<RecursionField schema={schema} name={name} />
</Collapse.Panel>
);
Expand Down
4 changes: 3 additions & 1 deletion packages/gi-portal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
"react": "17.x",
"react-dom": "17.x"
},
"devDependencies": {
"@react-spring/types": "9.6.0"
},
"dependencies": {
"@aligov/global-locale": "^1.0.5",
"@aligov/global-string-format": "^1.0.7",
"@react-spring/types": "9.6.0",
"react-spring": "9.6.0"
},
"author": "AntV",
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"lodash-es": "^4.17.21",
"react-intl": "^6.4.4",
"size-sensor": "^1.0.1",
"use-immer": "^0.6.0"
"use-immer": "^0.9.0"
},
"peerDependencies": {
"@antv/graphin": "^2.7.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-sdk/src/GISDK.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ const GISDK = (props: Props) => {
}, [data]);

return (
<IntlProvider locale={language as string} messages={localeMessages}>
<IntlProvider locale={language as string} messages={localeMessages as any}>
{/* @ts-ignore */}
<GraphInsightContext.Provider value={ContextValue}>
<GICC_LAYOUT_COMPONENT {...GICC_LAYOUT_PROPS}>
Expand Down
6 changes: 3 additions & 3 deletions packages/gi-site/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@aligov/global-string-format": "^1.0.7",
"@ant-design/charts": "^1.0.21",
"@ant-design/compatible": "^1.0.2",
"@ant-design/icons": "^4.0.6",
"@ant-design/icons": "^4.7.0",
"@ant-design/pro-components": "2.3.57",
"@ant-design/pro-table": "2.66.4",
"@antv/dw-analyzer": "^1.1.5",
Expand All @@ -49,7 +49,7 @@
"@types/node": "^7.0.12",
"@types/systemjs": "latest",
"@umijs/preset-react": "^1.8.12",
"ahooks": "^2.10.9",
"ahooks": "^3.7.7",
"classnames": "^2.2.6",
"d3-scale": "^4.0.0",
"dayjs": "^1.10.5",
Expand All @@ -69,7 +69,7 @@
"systemjs": "^6.11.0",
"umi": "^3.5.18",
"umi-request": "^1.3.9",
"use-immer": "^0.7.0",
"use-immer": "^0.9.0",
"xlsx2js": "^1.3.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gi-theme-antd/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"author": "pomelo.lcw",
"license": "ISC",
"devDependencies": {
"@ant-design/icons": "^4.6.3",
"@ant-design/icons": "^4.7.0",
"antd": "^4.x",
"css-loader": "^6.2.0",
"dumi": "^1.1.25",
Expand Down
Loading

0 comments on commit 164e17d

Please sign in to comment.