Skip to content

fix(data-table): allow rowSpan and colSpan on selection column type #7349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c01dwave wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(data-table): allow rowSpan and colSpan on selection column type #7349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b97b00
fix(data-table): allow rowSpan and colSpan on selection column type
Dec 4, 2025
4d0eaf3
fix(data-table): allow rowSpan and colSpan on selection column type
Dec 4, 2025
0a0e6f9
fix(data-table): allow rowSpan and colSpan on selection column type
Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## NEXT_VERSION

`NEXT_VERSION`

### Fixes

- Fix `n-data-table` `TableSelectionColumn` type definition not allowing `rowSpan` and `colSpan` properties, closes [#7347](https://github.com/tusen-ai/naive-ui/issues/7347) by [@pstrh](https://github.com/pstrh).

## 2.43.2

### Fixes
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.zh-CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## NEXT_VERSION

`NEXT_VERSION`

### Fixes

- 修复 `n-data-table` 的 `TableSelectionColumn` 类型定义不允许 `rowSpan` 和 `colSpan` 属性的问题，关闭 [#7347](https://github.com/tusen-ai/naive-ui/issues/7347) by [@pstrh](https://github.com/pstrh)

## 2.43.2

### Fixes
Expand Down
4 changes: 2 additions & 2 deletions src/data-table/src/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ export type TableSelectionColumn<T = InternalRowData> = {
filterOptions?: never
filterOptionValues?: never
filterOptionValue?: never
colSpan?: never
rowSpan?: never
colSpan?: (rowData: T, rowIndex: number) => number
rowSpan?: (rowData: T, rowIndex: number) => number
} & CommonColumnInfo<T>

export type RenderExpand<T = InternalRowData> = (
Expand Down