Merge pull request #2840 from XiaoMi/hotfix/table/2836

fix(table): 修复同时设置 fieldKey 和 rowSelection 时 onChange 回调参数异常问题 (#2836)
XiaoMi · May 28, 2024 · 512c825 · 512c825
2 parents d4076c4 + c2afbaf
commit 512c825
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.changeset/nervous-scissors-care.md b/.changeset/nervous-scissors-care.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+fix(table): 修复同时设置 fieldKey 和 rowSelection 时 onChange 回调参数异常问题
diff --git a/.changeset/purple-laws-check.md b/.changeset/purple-laws-check.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/table": patch
+---
+
+fix: 修复同时设置 fieldKey 和 rowSelection 时 onChange 回调参数异常问题
diff --git a/packages/ui/table/src/hooks/use-check.ts b/packages/ui/table/src/hooks/use-check.ts
@@ -31,10 +31,10 @@ export const useTableCheck = ({
   )
 
   useEffect(() => {
-    checkedRowDataItemsRef.current = checkedRowDataItemsRef.current.filter(({ key }) =>
-      checkedRowKeys?.includes(key)
+    checkedRowDataItemsRef.current = checkedRowDataItemsRef.current.filter((item) =>
+      checkedRowKeys?.includes(item[fieldKey])
     )
-  }, [checkedRowKeys])
+  }, [checkedRowKeys, fieldKey])
 
   // 已选中的行数据集合
   const checkedRowDataItemsRef = React.useRef<Record<string, any>[]>([])
@@ -53,8 +53,8 @@ export const useTableCheck = ({
   const onCheckedRowKeysChange = React.useCallback(
     (rowItem: Record<string, any>, checked: boolean) => {
       // 记录选中的行数据集合
-      const nextCheckedDataItems = checkedRowDataItems.filter(({ key }) =>
-        checkedRowKeys.includes(key)
+      const nextCheckedDataItems = checkedRowDataItems.filter((item) =>
+        checkedRowKeys.includes(item[fieldKey])
       )
 
       if (checked) {
@@ -110,7 +110,7 @@ export const useTableCheck = ({
 
     if (checkedAll) {
       checkedRowDataItemsRef.current = checkedRowDataItemsRef.current.filter(
-        ({ key }) => !checkedRowKeysSet.has(key)
+        (item) => !checkedRowKeysSet.has(item[fieldKey])
       )
 
       // 移除当前页所有行 ids
@@ -125,7 +125,7 @@ export const useTableCheck = ({
     }
 
     checkedRowDataItemsRef.current = targetRowItems.concat(
-      checkedRowDataItemsRef.current.filter((item) => !checkedRowKeysSet.has(item.key))
+      checkedRowDataItemsRef.current.filter((item) => !checkedRowKeysSet.has(item[fieldKey]))
     )
 
     trySetCheckedRowKeys(