Skip to content

Commit d3d37f0

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat-v4
2 parents d490820 + 1e0cefa commit d3d37f0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

components/table/Table.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,18 +668,18 @@ const Table = defineComponent({
668668
customFilterDropdown?: any;
669669
default: any;
670670
}>,
671-
setup(_props, { attrs, slots, expose }) {
671+
setup(props, { attrs, slots, expose }) {
672672
const table = ref();
673673
expose({
674674
table,
675675
});
676676
return () => {
677-
const props = attrs as TableProps;
678677
const columns = props.columns || convertChildrenToColumns(slots.default?.());
679678
return (
680679
<InteralTable
681680
ref={table}
682681
{...attrs}
682+
{...props}
683683
columns={columns || []}
684684
expandedRowRender={slots.expandedRowRender}
685685
contextSlots={{ ...slots }} // use new object, 否则slot热更新失效,原因需进一步探究

0 commit comments

Comments
 (0)