Merge remote-tracking branch 'origin/main' into feat-v4

This commit is contained in:
tangjinzhou 2023-05-20 15:50:21 +08:00
commit d3d37f08a2

View File

@ -668,18 +668,18 @@ const Table = defineComponent({
customFilterDropdown?: any;
default: any;
}>,
setup(_props, { attrs, slots, expose }) {
setup(props, { attrs, slots, expose }) {
const table = ref();
expose({
table,
});
return () => {
const props = attrs as TableProps;
const columns = props.columns || convertChildrenToColumns(slots.default?.());
return (
<InteralTable
ref={table}
{...attrs}
{...props}
columns={columns || []}
expandedRowRender={slots.expandedRowRender}
contextSlots={{ ...slots }} // use new object, slot