From f73f128bacb69eb4611c706ac8e59b44bcc85135 Mon Sep 17 00:00:00 2001
From: "Jingwei.Zhang" <zhang.jingwei@99cloud.net>
Date: Mon, 5 Sep 2022 16:09:42 +0800
Subject: [PATCH] fix: fix the modal action disappear

1. Fix the modal disappeared when changing the window size
2. Optimized obtaining the table height

Change-Id: I629858f7c0174183345526bb46909df33ac9b4a2
---
 src/components/Tables/Base/index.jsx |  2 +-
 src/containers/List/index.jsx        | 39 +++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/components/Tables/Base/index.jsx b/src/components/Tables/Base/index.jsx
index 0dbd575c..d6eb7998 100644
--- a/src/components/Tables/Base/index.jsx
+++ b/src/components/Tables/Base/index.jsx
@@ -799,7 +799,7 @@ export class BaseTable extends React.Component {
 
   renderNormalTitle() {
     return (
-      <div className={styles['table-header']}>
+      <div className={styles['table-header']} id="sl-table-header-search">
         <div
           className={classnames(
             styles['table-header-btns'],
diff --git a/src/containers/List/index.jsx b/src/containers/List/index.jsx
index fddf0768..1531d740 100644
--- a/src/containers/List/index.jsx
+++ b/src/containers/List/index.jsx
@@ -36,10 +36,14 @@ import NotFound from 'components/Cards/NotFound';
 import { getPath, getLinkRender } from 'utils/route-map';
 import styles from './index.less';
 
-const tabOtherHeight = 326;
-const otherHeight = 272;
 const hintHeight = 50;
-const subTabHeight = 50;
+const navHeight = 40;
+const breadcrumbHeight = 50;
+const padding = 16;
+const tabHeight = 44;
+const footerHeight = 50;
+const defaultTableSearchHeight = 50;
+const defaultTableHeaderHeight = 51;
 
 export default class BaseList extends React.Component {
   constructor(props, options = {}) {
@@ -274,22 +278,36 @@ export default class BaseList extends React.Component {
   }
 
   get tableTopHeight() {
+    const tableSearchHeader = document.getElementById('sl-table-header-search');
+    const tableSearchHeight = tableSearchHeader
+      ? tableSearchHeader.scrollHeight
+      : defaultTableSearchHeight;
+    const topTotal = navHeight + breadcrumbHeight + tableSearchHeight + padding;
     if (this.hasSubTab) {
-      return tabOtherHeight + subTabHeight;
+      return topTotal + tabHeight * 2;
     }
     if (this.hasTab) {
-      return tabOtherHeight;
+      return topTotal + tabHeight;
     }
-    return otherHeight;
+    return topTotal;
   }
 
   getTableHeight() {
     const height = window.innerHeight;
-    const id = this.params && this.params.id;
-    if (id) {
+    if (this.inDetailPage) {
       return -1;
     }
-    return height - this.tableTopHeight - this.hintHeight;
+    const tableHeader = document.getElementsByClassName('ant-table-header')[0];
+    const tableHeaderHeight = tableHeader
+      ? tableHeader.offsetHeight
+      : defaultTableHeaderHeight;
+    const newHeight =
+      height -
+      this.tableTopHeight -
+      this.hintHeight -
+      footerHeight -
+      tableHeaderHeight;
+    return newHeight > 0 ? newHeight : 1;
   }
 
   get tableWidth() {
@@ -655,6 +673,9 @@ export default class BaseList extends React.Component {
   }
 
   setTableHeight() {
+    if (this.inAction) {
+      return;
+    }
     const currentTableHeight = this.getTableHeight();
     const { tableHeight } = this.state;
     if (currentTableHeight !== tableHeight) {