Merge pull request #11433 from ranwawa/fix/table-auto-fill-height

fix: 添加tableFillHeight属性控制表格高度，避免开启autoFillHeight后表格行高度异常的问题，以便向下兼容Closes #11419
baidu · Dec 27, 2024 · d384ef4 · d384ef4
2 parents 58974d7 + 8087c4e
commit d384ef4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/amis-ui/scss/components/_table.scss b/packages/amis-ui/scss/components/_table.scss
@@ -1020,7 +1020,10 @@
     > .#{$ns}Table-contentWrap {
       > .#{$ns}Table-content > table {
         border-top: none; // 不然会导致拖动时顶部露出内容
-        min-height: 100%; // 为了让表格占满高度
+
+        &.#{$ns}Table-table--tableFillHeight {
+          min-height: 100%; // 为了让表格占满高度
+        }
       }
 
       > .#{$ns}Table-content table thead {

diff --git a/packages/amis/src/renderers/Table/index.tsx b/packages/amis/src/renderers/Table/index.tsx
@@ -2806,6 +2806,7 @@ export default class Table<
     const {
       classnames: cx,
       tableClassName,
+      tableFillHeight,
       store,
       placeholder,
       render,
@@ -2846,7 +2847,8 @@ export default class Table<
               'Table-table--checkOnItemClick': checkOnItemClick,
               'Table-table--withCombine': store.combineNum > 0,
               'Table-table--affixHeader':
-                affixHeader && !autoFillHeight && store.columnWidthReady
+                affixHeader && !autoFillHeight && store.columnWidthReady,
+              'Table-table--tableFillHeight': autoFillHeight && tableFillHeight
             },
             tableClassName
           )}