Merge pull request #2207 from XiaoMi/hotfix/#2205

fix(table): fix scrollWidth not work
XiaoMi · Aug 16, 2022 · 6a72072 · 6a72072
2 parents 8fa7ddd + 1c298e4
commit 6a72072
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/ui/table/src/TableBody.tsx b/packages/ui/table/src/TableBody.tsx
@@ -28,6 +28,7 @@ export const TableBody = forwardRef<HTMLDivElement | null, TableBodyProps>(
       onTableBodyScroll,
       maxHeight,
       canScroll,
+      scrollWidth,
       hasAvgColumn,
       avgRow,
       hasSumColumn,
@@ -69,7 +70,10 @@ export const TableBody = forwardRef<HTMLDivElement | null, TableBodyProps>(
           overflowX: canScroll ? 'scroll' : undefined,
         }}
       >
-        <table ref={bodyTableRef} style={{ width: '100%' }}>
+        <table
+          ref={bodyTableRef}
+          style={{ width: canScroll && scrollWidth !== undefined ? scrollWidth : '100%' }}
+        >
           <colgroup>
             {leafColumns.map((col: any, idx) => {
               return (

diff --git a/packages/ui/table/src/use-table.ts b/packages/ui/table/src/use-table.ts
@@ -532,6 +532,7 @@ export const useTable = ({
 
   return {
     rootProps,
+    scrollWidth,
     activeSorterColumn,
     setActiveSorterColumn,
     activeSorterType,