From 9d86d4d329776ee47cfcb16035c96b9aedad814c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 02:43:34 +0000
Subject: [PATCH 1/4] chore(deps-dev): bump @types/react from 17.0.53 to
 18.0.28

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 17.0.53 to 18.0.28.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7c133995d..5ed0c36ee 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@testing-library/react": "^12.1.5",
     "@types/enzyme": "^3.10.5",
     "@types/jest": "^28.1.2",
-    "@types/react": "^17.0.35",
+    "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.5",
     "@types/responselike": "^1.0.0",
     "@umijs/fabric": "^3.0.0",

From 4110d67d8ce01124b978aca3c74feb2eafe00dbd Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Sun, 26 Nov 2023 00:21:21 +0800
Subject: [PATCH 2/4] Update package.json

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index acc9db87b..26d3191ae 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
     "@types/enzyme": "^3.10.5",
-    "@types/jest": "^28.1.2",
     "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.5",
     "@types/responselike": "^1.0.0",

From 0e49551a89730641db7184e2a9fcf60c3b016b44 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Sun, 26 Nov 2023 09:10:15 +0800
Subject: [PATCH 3/4] Update useCellRender.ts

---
 src/Cell/useCellRender.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cell/useCellRender.ts b/src/Cell/useCellRender.ts
index 825e6c343..d181a25a9 100644
--- a/src/Cell/useCellRender.ts
+++ b/src/Cell/useCellRender.ts
@@ -40,7 +40,7 @@ export default function useCellRender<RecordType>(
           ? dataIndex
           : [dataIndex];
 
-      const value: Record<string, unknown> | React.ReactNode = getValue(record, path);
+      const value: React.ReactNode = getValue(record, path);
 
       // Customize render node
       let returnChildNode = value;

From c2ef3121eed3113b34c3cce8b2921608ac1ddf89 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Sun, 26 Nov 2023 09:11:25 +0800
Subject: [PATCH 4/4] Update valueUtil.tsx

---
 src/utils/valueUtil.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/valueUtil.tsx b/src/utils/valueUtil.tsx
index 90b298e0b..a70abe290 100644
--- a/src/utils/valueUtil.tsx
+++ b/src/utils/valueUtil.tsx
@@ -16,16 +16,16 @@ interface GetColumnKeyColumn {
 
 export function getColumnsKey(columns: readonly GetColumnKeyColumn[]) {
   const columnKeys: React.Key[] = [];
-  const keys: Record<React.Key, boolean> = {};
+  const keys: Record<PropertyKey, boolean> = {};
 
   columns.forEach(column => {
     const { key, dataIndex } = column || {};
 
     let mergedKey = key || toArray(dataIndex).join('-') || INTERNAL_KEY_PREFIX;
-    while (keys[mergedKey]) {
+    while (keys[mergedKey as string]) {
       mergedKey = `${mergedKey}_next`;
     }
-    keys[mergedKey] = true;
+    keys[mergedKey as string] = true;
 
     columnKeys.push(mergedKey);
   });