fix: 修复Grid组件在渲染Selection和Expand时可能会出现的重复项问题 (#2064)

Co-authored-by: daitingyuan <[email protected]>
youzan · Jul 26, 2024 · f73b52c · f73b52c
1 parent 3cd59f5
commit f73b52c
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/packages/zent/src/grid/Grid.tsx b/packages/zent/src/grid/Grid.tsx
@@ -439,14 +439,16 @@ export class Grid<
       const selectionColumn = this.getSelectionColumn(props, columnsArg);
 
       if (selectionColumn) {
-        const maySelectionColumn = columns[0];
-        if (
-          maySelectionColumn &&
-          ['selection-column', 'selection-column-single'].indexOf(
-            maySelectionColumn.key
-          ) !== -1
-        ) {
-          columns[0] = { ...columns[0], ...selectionColumn };
+        const selectionIndex = columns.findIndex(
+          columns =>
+            columns.key === 'selection-column' ||
+            columns.key === 'selection-column-single'
+        );
+        if (selectionIndex !== -1) {
+          columns[selectionIndex] = {
+            ...columns[selectionIndex],
+            ...selectionColumn,
+          };
         } else {
           columns.unshift(selectionColumn);
         }
@@ -464,7 +466,17 @@ export class Grid<
       if (hasLeft) {
         expandColumn.fixed = 'left';
       }
-      columns.unshift(expandColumn);
+      const expandIndex = columns.findIndex(
+        columns => columns.key === expandColumn.key
+      );
+      if (expandIndex !== -1) {
+        columns[expandIndex] = {
+          ...columns[expandIndex],
+          ...expandColumn,
+        };
+      } else {
+        columns.unshift(expandColumn);
+      }
     }
 
     if (!isStoreColumns) {