Merge pull request #2226 from XiaoMi/perf/table

Perf/table
XiaoMi · Sep 9, 2022 · 2985f53 · 2985f53
2 parents ffbc936 + 00f0eb8
commit 2985f53
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/packages/ui/table/src/TableEmbedRow.tsx b/packages/ui/table/src/TableEmbedRow.tsx
@@ -21,6 +21,7 @@ export const TableEmbedRow = ({
     getEmbedPanelById,
     isEmbedLoadingId,
     onEmbedSwitch,
+    scrollBodyElementRef,
   } = useTableContext()
 
   const loading = isEmbedLoadingId(rowData.id)

diff --git a/packages/ui/table/src/styles/table.scss b/packages/ui/table/src/styles/table.scss
@@ -138,10 +138,11 @@ $prefix: '#{$component-prefix}-table' !default;
         height: 100%;
         bottom: 0;
         right: 0;
+        border-left: 2px solid use-color('gray', 50);
         cursor: col-resize;
         z-index: 1;
 
-        &:hover {
+        .#{$prefix}-header__resizable:hover & {
           background-color: use-color-mode('primary');
         }
       }

diff --git a/packages/ui/table/src/use-table.ts b/packages/ui/table/src/use-table.ts
@@ -250,6 +250,16 @@ export const useTable = ({
         nextColumns,
         scrollWidth ? scrollWidth / lastColumns.length : 100
       )
+
+      if (colWidths) {
+        // colWidths 记录的是最新的列宽，当它有值时，重置一下列宽，否则会导致冻结列动态调整宽度后定位不准
+        nextColumns = nextColumns.map((item, index) => {
+          return {
+            ...item,
+            width: colWidths[index],
+          }
+        })
+      }
     }
 
     let leftColumns = [] as any[]

diff --git a/packages/ui/table/stories/async-expanded-render.stories.tsx b/packages/ui/table/stories/async-expanded-render.stories.tsx
@@ -9,12 +9,12 @@ export const AsyncExpandedRender = () => {
     {
       title: '商品名',
       dataKey: 'name',
-      width: 120,
+      width: 150,
     },
     {
       title: '品类',
       dataKey: 'type',
-      width: 80,
+      width: 150,
     },
     {
       title: '规格',