Skip to content
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

Jump to bottom

[Table] fix expandOnRowClick and selectOnRowClick can not control reaction alone #2452

Merged
merged 1 commit into from
Aug 20, 2023
Merged

[Table] fix expandOnRowClick and selectOnRowClick can not control reaction alone #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/table/PrimaryTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,13 @@ const PrimaryTable = forwardRef<PrimaryTableRef, TPrimaryTableProps>((props, ref
}
};

const onInnerRowClick: TdPrimaryTableProps['onRowClick'] = (context) => {
onInnerExpandRowClick(context);
onInnerSelectRowClick(context);
const onInnerRowClick: TdPrimaryTableProps['onRowClick'] = (params) => {
if (props.expandOnRowClick) {
onInnerExpandRowClick(params);
}
if (props.selectOnRowClick) {
onInnerSelectRowClick(params);
}
};

function formatNode(api: string, renderInnerNode: Function, condition: boolean, extra?: { reverse?: boolean }) {
Expand Down
2 changes: 1 addition & 1 deletion src/table/hooks/useColumnResize.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function useColumnResize(params: {
// 只在表头显示拖拽图标
const onColumnMouseover = (e: MouseEvent, col: BaseTableCol<TableRowData>) => {
// calculate mouse cursor before drag start
if (!resizeLineRef.current || resizeLineParams.isDragging) return;
if (!resizeLineRef.current || resizeLineParams.isDragging || !e.target) return;
const target = (e.target as HTMLElement).closest('th');
if (!target) return;
// 判断是否为叶子阶段，仅叶子结点允许拖拽
Expand Down
Loading