feat: 自由设置不可拖动列，支持最后一列可拖动

README.md

@@ -16,8 +16,7 @@ yarn add use-antd-resizable-header
 
 - **columns 为常量时，提到组件外，或使用 `React.useMemo`, `React.Ref` 包裹常量**
 - **默认拖动颜色为`#000`，可通过`global`或设置css变量`--atrh-color`设置颜色**
-- **最后一列不能拖动，[请保持最后一列的自适应](https://ant-design.gitee.io/components/table-cn/#components-table-demo-fixed-columns)，若最后一列传入宽度，会把传入的宽度作为最小宽度（默认 120）**
-- **行合并暂未找到合适方案**
+- **至少一列不能拖动（width不设置即可），[请保持最后至少一列的自适应](https://ant-design.gitee.io/components/table-cn/#components-table-demo-fixed-columns)**
 
 ## Example
 

src/ResizableHeader.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ThHTMLAttributes } from 'react';
 import { Resizable, ResizeCallbackData } from 'react-resizable';
 import classnames from 'classnames';
 
@@ -7,13 +7,12 @@ import './index.css';
 type ComponentProp = {
   onResize: (width: number) => void;
   onMount: (width: number) => void;
-  isLast: boolean;
   triggerRender: number;
   width: number;
   minWidth: number;
   maxWidth: number;
   titleTip?: string;
-} & Record<string, any>;
+} & ThHTMLAttributes<HTMLTableCellElement>;
 
 const ResizableHeader: React.FC<ComponentProp> = (props) => {
   const {
@@ -22,7 +21,6 @@ const ResizableHeader: React.FC<ComponentProp> = (props) => {
     maxWidth,
     onResize,
     onMount,
-    isLast,
     triggerRender,
     className,
     style,
@@ -39,19 +37,19 @@ const ResizableHeader: React.FC<ComponentProp> = (props) => {
   const [resizeWidth, setResizeWidth] = React.useState<number>(0);
 
   React.useEffect(() => {
-    if (width && !isLast) {
+    if (width) {
       setResizeWidth(width);
       onMount?.(width);
     }
   }, [triggerRender]);
 
   React.useEffect(() => {
-    if (width && !isLast) {
+    if (width) {
       setResizeWidth(width);
     }
   }, [width]);
 
-  if (!width || Number.isNaN(Number(width)) || isLast) {
+  if (!width || Number.isNaN(Number(width))) {
     return (
       <th
         {...rest}

src/index.tsx

@@ -106,8 +106,7 @@ function useTableResizableHeader<ColumnType extends Record<string, any>>(
     (list: ColumnType[]) => {
       const c = list
         ?.filter((item) => !isEmpty(item))
-        .map((col, index) => {
-          const isLast = index === list.length - 1;
+        .map((col) => {
           return {
             ...col,
             children: col?.children?.length ? getColumns(col.children) : undefined,
@@ -120,13 +119,9 @@ function useTableResizableHeader<ColumnType extends Record<string, any>>(
                 minWidth: minConstraints,
                 maxWidth: maxConstraints,
                 triggerRender,
-                isLast,
               };
             },
-            width:
-              isLast && !col?.fixed
-                ? undefined
-                : widthCache.current?.get(col[getKey])?.width || col?.width,
+            width: widthCache.current?.get(col[getKey])?.width || col?.width,
             [getKey]: col[getKey] || uniqueId,
           };
         }) as ColumnType[];