fix(table): expandOnRowClick and selectOnRowClick conflict (#2452)

Tencent · Aug 20, 2023 · 99d2251 · 99d2251
1 parent 723acae
commit 99d2251
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/table/PrimaryTable.tsx b/src/table/PrimaryTable.tsx
@@ -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 }) {

diff --git a/src/table/hooks/useColumnResize.tsx b/src/table/hooks/useColumnResize.tsx
@@ -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;
     // 判断是否为叶子阶段，仅叶子结点允许拖拽