fix: fix issues cause ci failed

antvis · Jul 12, 2023 · e2f0f79 · e2f0f79
1 parent 852531e
commit e2f0f79
Show file tree

Hide file tree

Showing 12 changed files with 160 additions and 368 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
       }
     },
     "overrides": {
-      "antd": "4.x"
+      "antd": "^4.24.10"
     }
   },
   "husky": {
@@ -36,9 +36,9 @@
     ]
   },
   "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",
@@ -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",

diff --git a/packages/gi-assets-advance/package.json b/packages/gi-assets-advance/package.json
@@ -53,7 +53,7 @@
     "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",

diff --git a/packages/gi-assets-advance/src/components/AnalysisHistory/util.tsx b/packages/gi-assets-advance/src/components/AnalysisHistory/util.tsx
@@ -269,7 +269,7 @@ const getPartParameterizedValueDOM = (
       id,
       fieldName,
       oriValue as object,
-      parameterizedValues,
+      parameterizedValues as object,
       valueDomProps,
       configureOpt,
       formItems,

diff --git a/packages/gi-assets-advance/src/components/GraphAnnotation/Component.tsx b/packages/gi-assets-advance/src/components/GraphAnnotation/Component.tsx
@@ -99,6 +99,7 @@ const GraphAnnotation: React.FunctionComponent<GraphAnnotationProps> = props =>
           dm: '双击此处开始编辑',
         }),
     });
+    // @ts-ignore
     graph.addPlugin(newAnnotation);
     return newAnnotation;
   }, []);

diff --git a/packages/gi-assets-advance/src/components/SubGraphLayout/Component.tsx b/packages/gi-assets-advance/src/components/SubGraphLayout/Component.tsx
@@ -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 {

diff --git a/packages/gi-assets-basic/package.json b/packages/gi-assets-basic/package.json
@@ -35,7 +35,7 @@
   "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/gi-common-components": "workspace:*",

diff --git a/packages/gi-assets-galaxybase/package.json b/packages/gi-assets-galaxybase/package.json
@@ -33,7 +33,7 @@
     "@aligov/global-string-format": "^1.0.7",
     "@ant-design/icons": "^4.6.2",
     "@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",

diff --git a/packages/gi-assets-scene/package.json b/packages/gi-assets-scene/package.json
@@ -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": {

diff --git a/packages/gi-assets-testing/package.json b/packages/gi-assets-testing/package.json
@@ -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",

diff --git a/packages/gi-common-components/src/FormilyForm/FormCollapse/index.tsx b/packages/gi-common-components/src/FormilyForm/FormCollapse/index.tsx
@@ -45,6 +45,7 @@ const usePanels = () => {
           ...schema?.['x-component-props'],
           key: schema?.['x-component-props']?.key || name,
         },
+        // @ts-ignore
         schema,
       });
     }
@@ -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>
         );

diff --git a/packages/gi-portal/package.json b/packages/gi-portal/package.json
@@ -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",