From b6be179a2c0921e2dea74fbe76aeb2ea9e6965b9 Mon Sep 17 00:00:00 2001
From: msidolphin <msidolphin@outlook.com>
Date: Fri, 11 Feb 2022 15:00:33 +0800
Subject: [PATCH] feat(components): [el-table] `maxHeight` support more units
 (#5904)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(components): [el-table] maxHeight support more formats (vh、calc...)

re #5888

* chore: optimize code

* fix: resolve import issue
---
 .../components/table/__tests__/table.spec.ts  |  9 ++++++
 .../table/src/table/style-helper.ts           | 31 ++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/packages/components/table/__tests__/table.spec.ts b/packages/components/table/__tests__/table.spec.ts
index 14bb11ebe7..9ee6bed890 100644
--- a/packages/components/table/__tests__/table.spec.ts
+++ b/packages/components/table/__tests__/table.spec.ts
@@ -167,6 +167,15 @@ describe('Table.vue', () => {
       wrapper.unmount()
     })
 
+    it('maxHeight uses special units', async () => {
+      const wrapper = createTable('max-height="60vh"')
+      await nextTick()
+      expect(
+        wrapper.find('.el-table__body-wrapper').attributes('style')
+      ).toContain('max-height: calc(60vh - 44px - 44px);')
+      wrapper.unmount()
+    })
+
     it('stripe', async () => {
       const wrapper = createTable('stripe')
       await nextTick()
diff --git a/packages/components/table/src/table/style-helper.ts b/packages/components/table/src/table/style-helper.ts
index 4c072f63ee..aa9f111628 100644
--- a/packages/components/table/src/table/style-helper.ts
+++ b/packages/components/table/src/table/style-helper.ts
@@ -13,6 +13,8 @@ import {
   removeResizeListener,
   on,
   off,
+  isNumber,
+  isString,
 } from '@element-plus/utils'
 import { useSize } from '@element-plus/hooks'
 import { parseHeight } from '../util'
@@ -224,6 +226,20 @@ function useStyle<T>(
     return props.tableLayout
   })
 
+  function calcMaxHeight(
+    maxHeight: string | number,
+    footerHeight: number,
+    headerHeight: number
+  ) {
+    const parsedMaxHeight = parseHeight(maxHeight)
+    const tableHeaderHeight = props.showHeader ? headerHeight : 0
+    if (parsedMaxHeight === null) return
+    if (isString(parsedMaxHeight)) {
+      return `calc(${parsedMaxHeight} - ${footerHeight}px - ${tableHeaderHeight}px)`
+    }
+    return parsedMaxHeight - footerHeight - tableHeaderHeight
+  }
+
   const height = computed(() => {
     const headerHeight = layout.headerHeight.value || 0
     const bodyHeight = layout.bodyHeight.value
@@ -231,8 +247,7 @@ function useStyle<T>(
     if (props.height) {
       return bodyHeight ? bodyHeight : undefined
     } else if (props.maxHeight) {
-      const maxHeight = parseHeight(props.maxHeight)
-      return maxHeight - footerHeight - (props.showHeader ? headerHeight : 0)
+      return calcMaxHeight(props.maxHeight, footerHeight, headerHeight)
     }
     return undefined
   })
@@ -246,12 +261,14 @@ function useStyle<T>(
         height: bodyHeight ? `${bodyHeight}px` : '',
       }
     } else if (props.maxHeight) {
-      const maxHeight = parseHeight(props.maxHeight)
-      if (typeof maxHeight === 'number') {
+      const maxHeight = calcMaxHeight(
+        props.maxHeight,
+        footerHeight,
+        headerHeight
+      )
+      if (maxHeight !== null) {
         return {
-          'max-height': `${
-            maxHeight - footerHeight - (props.showHeader ? headerHeight : 0)
-          }px`,
+          'max-height': `${maxHeight}${isNumber(maxHeight) ? 'px' : ''}`,
         }
       }
     }