fix: defaultWidth not work

hemengke1997 · Jan 6, 2023 · 886899f · 886899f
1 parent feb06f3
commit 886899f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -5,7 +5,7 @@ import './App.css'
 import { useAntdResizableHeader } from '@minko-fe/use-antd-resizable-header'
 import '@minko-fe/use-antd-resizable-header/dist/style.css'
 
-const tcls = [
+const tcls: any[] = [
   {
     title: '333',
     dataIndex: 'name',
@@ -149,7 +149,7 @@ function App() {
       {
         title: 'test render',
         dataIndex: 'testRender',
-        width: 333,
+        width: 111,
         render: () => {
           return <div onClick={() => setX()}>{x}</div>
         },
@@ -173,6 +173,7 @@ function App() {
     tableWidth: tp,
   } = useAntdResizableHeader({
     columns: proColumns,
+    defaultWidth: 444,
     columnsState: {
       persistenceType: 'localStorage',
       persistenceKey: 'fds',

diff --git a/example/tsconfig.json b/example/tsconfig.json
@@ -16,5 +16,5 @@
     "jsx": "react",
     "noImplicitAny": false
   },
-  "include": ["./src", "./vite.config.ts"],
+  "include": ["./src", "./vite.config.ts"]
 }
diff --git a/src/ResizableHeader.tsx b/src/ResizableHeader.tsx
@@ -97,7 +97,10 @@ const ResizableHeader: FC<ComponentProp> = (props) => {
 
   const isSimpleChildren = () => {
     if (Array.isArray(children)) {
-      return isString(children[children.length - 1])
+      const lastChild = children[children.length - 1]
+      if (lastChild) {
+        return isString(lastChild) || lastChild.props?.ellipsis || isString(lastChild.props?.label)
+      }
     }
     return false
   }

diff --git a/src/useAntdResizableHeader.tsx b/src/useAntdResizableHeader.tsx
@@ -201,7 +201,7 @@ function useAntdResizableHeader<ColumnType extends ColumnOriginType<ColumnType>>
           loop(cls[i].children as ColumnType[])
         } else {
           if (!cls[i].hideInTable) {
-            width += Number(cls[i].width) || Number(columns?.[columns.length - 1].width) || defaultWidth
+            width += Number(cls[i].width) || defaultWidth
           }
         }
       }