From ef3b3c6314b2535b370d36387c09c659a4f633aa Mon Sep 17 00:00:00 2001
From: 2betop <2betop.cn@gmail.com>
Date: Wed, 14 Jun 2023 21:02:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=A1=A8=E6=A0=BC=E8=A1=A8=E5=A4=B4=E5=9B=BA?=
 =?UTF-8?q?=E9=A1=B6=E4=BD=8D=E7=BD=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20Close:=20#7153?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renderers/__snapshots__/CRUD.test.tsx.snap       |  2 --
 .../renderers/__snapshots__/Pagination.test.tsx.snap |  1 -
 .../renderers/__snapshots__/Table.test.tsx.snap      | 12 ------------
 packages/amis/src/renderers/Table/index.tsx          |  9 ++++++++-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/amis/__tests__/renderers/__snapshots__/CRUD.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/CRUD.test.tsx.snap
index c1143cfc3..19e07dfd4 100644
--- a/packages/amis/__tests__/renderers/__snapshots__/CRUD.test.tsx.snap
+++ b/packages/amis/__tests__/renderers/__snapshots__/CRUD.test.tsx.snap
@@ -1880,7 +1880,6 @@ exports[`Renderer: crud sortable & orderBy & orderDir & orderField 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-fixedLeft"
@@ -4543,7 +4542,6 @@ exports[`Renderer:crud source & alwaysShowPagination 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-fixedLeft"
diff --git a/packages/amis/__tests__/renderers/__snapshots__/Pagination.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/Pagination.test.tsx.snap
index 207e976df..b3793c933 100644
--- a/packages/amis/__tests__/renderers/__snapshots__/Pagination.test.tsx.snap
+++ b/packages/amis/__tests__/renderers/__snapshots__/Pagination.test.tsx.snap
@@ -243,7 +243,6 @@ exports[`Renderer:Pagination 1`] = `
         </div>
         <div
           class="cxd-Table-fixedTop"
-          style="top: 0px; width: 0px;"
         >
           <div
             class="cxd-Table-heading"
diff --git a/packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap
index 6b5c8e694..4aaa58387 100644
--- a/packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap
+++ b/packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap
@@ -356,7 +356,6 @@ exports[`Renderer:table 1`] = `
     </div>
     <div
       class="cxd-Table-fixedTop"
-      style="top: 0px; width: 0px;"
     >
       <div
         class="cxd-Table-heading"
@@ -818,7 +817,6 @@ exports[`Renderer:table align 1`] = `
     </div>
     <div
       class="cxd-Table-fixedTop"
-      style="top: 0px; width: 0px;"
     >
       <div
         class="cxd-Table-heading"
@@ -1469,7 +1467,6 @@ exports[`Renderer:table children 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-fixedLeft"
@@ -2021,7 +2018,6 @@ exports[`Renderer:table classNameExpr 1`] = `
     </div>
     <div
       class="cxd-Table-fixedTop"
-      style="top: 0px; width: 0px;"
     >
       <div
         class="cxd-Table-heading"
@@ -2653,7 +2649,6 @@ exports[`Renderer:table column head style className 1`] = `
     </div>
     <div
       class="cxd-Table-fixedTop"
-      style="top: 0px; width: 0px;"
     >
       <div
         class="cxd-Table-heading"
@@ -3316,7 +3311,6 @@ exports[`Renderer:table combine Renderer:table combineNum only 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-fixedLeft"
@@ -4089,7 +4083,6 @@ exports[`Renderer:table combine Renderer:table combineNum with fromIndex 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-fixedLeft"
@@ -4993,7 +4986,6 @@ exports[`Renderer:table groupName-default 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-toolbar cxd-Table-headToolbar"
@@ -5959,7 +5951,6 @@ exports[`Renderer:table groupName-middleNoGroupName 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-toolbar cxd-Table-headToolbar"
@@ -6920,7 +6911,6 @@ exports[`Renderer:table groupName-startNoGroupName 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-toolbar cxd-Table-headToolbar"
@@ -7877,7 +7867,6 @@ exports[`Renderer:table groupName-withTpl 1`] = `
               </div>
               <div
                 class="cxd-Table-fixedTop"
-                style="top: 0px; width: 0px;"
               >
                 <div
                   class="cxd-Table-toolbar cxd-Table-headToolbar"
@@ -8639,7 +8628,6 @@ exports[`Renderer:table isHead fixed 1`] = `
     </div>
     <div
       class="cxd-Table-fixedTop"
-      style="top: 0px; width: 0px;"
     >
       <div
         class="cxd-Table-heading"
diff --git a/packages/amis/src/renderers/Table/index.tsx b/packages/amis/src/renderers/Table/index.tsx
index 71501294e..89851c8ab 100644
--- a/packages/amis/src/renderers/Table/index.tsx
+++ b/packages/amis/src/renderers/Table/index.tsx
@@ -667,7 +667,7 @@ export default class Table extends React.Component<TableProps, object> {
       return;
     }
 
-    this.affixDetect();
+    requestAnimationFrame(this.affixDetect);
     parent.addEventListener('scroll', this.affixDetect);
     window.addEventListener('resize', this.affixDetect);
     this.updateAutoFillHeight();
@@ -1162,6 +1162,13 @@ export default class Table extends React.Component<TableProps, object> {
     const ns = this.props.classPrefix;
     const dom = findDOMNode(this) as HTMLElement;
     const clip = (this.table as HTMLElement).getBoundingClientRect();
+
+    // 还在动画中，跳过。过一会再试。
+    if (this.table.offsetWidth && clip.width / this.table.offsetWidth < 0.5) {
+      setTimeout(this.affixDetect, 200);
+      return;
+    }
+
     const offsetY =
       this.props.affixOffsetTop ?? this.props.env.affixOffsetTop ?? 0;
     const headingHeight =