From 1d7608ee40c27ce81e031947ed6c679cc8b04c77 Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Sat, 20 Mar 2021 17:06:16 +0800
Subject: [PATCH] fix(table): ensure that the height calculation is correct
 close #395

---
 CHANGELOG.zh_CN.md                            |  9 ++++
 build/vite/plugin/index.ts                    |  4 +-
 .../Table/src/hooks/useTableScroll.ts         |  4 +-
 src/components/Table/src/style/index.less     |  2 +-
 src/layouts/page/index.vue                    | 48 +++++++++----------
 5 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index e6fd83b2..71561d2b 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,5 +1,9 @@
 ## Wip
 
+### ✨ Features
+
+- 路由新增 hideChildrenInMenu 配置。用于隐藏子菜单
+
 ### ✨ Refactor
 
 - 重构路由多层模式,解决嵌套 keepalive 执行多次问题
@@ -8,6 +12,11 @@
 
 - 确保 CountDownInput 组件重置清空值
 - 修复分割模式下在小屏幕中显示问题
+- 修复表格高度计算问题
+- 修复后台路由获取不到组件问题
+- 修复 Modal 组件 loadingTip 配置不生效
+- 修复后台权限指令不生效
+- 确保 progress 进度条正确关闭
 
 ## 2.1.0 (2021-03-15)
 
diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts
index afb04bf9..d34cf049 100644
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@@ -17,7 +17,7 @@ import { configThemePlugin } from './theme';
 import { configImageminPlugin } from './imagemin';
 import { configWindiCssPlugin } from './windicss';
 import { configSvgIconsPlugin } from './svgSprite';
-// import { configHmrPlugin } from './hmr';
+import { configHmrPlugin } from './hmr';
 
 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   const { VITE_USE_IMAGEMIN, VITE_USE_MOCK, VITE_LEGACY, VITE_BUILD_COMPRESS } = viteEnv;
@@ -30,7 +30,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   ];
 
   // TODO
-  // !isBuild && vitePlugins.push(configHmrPlugin());
+  !isBuild && vitePlugins.push(configHmrPlugin());
 
   // @vitejs/plugin-legacy
   VITE_LEGACY && isBuild && vitePlugins.push(legacy());
diff --git a/src/components/Table/src/hooks/useTableScroll.ts b/src/components/Table/src/hooks/useTableScroll.ts
index 75e0f302..83974bb8 100644
--- a/src/components/Table/src/hooks/useTableScroll.ts
+++ b/src/components/Table/src/hooks/useTableScroll.ts
@@ -87,7 +87,6 @@ export function useTableScroll(
     // Table height from bottom height-custom offset
 
     const paddingHeight = 32;
-    const borderHeight = 0;
     // Pager height
     let paginationHeight = 2;
     if (!isBoolean(pagination)) {
@@ -99,6 +98,8 @@ export function useTableScroll(
         // TODO First fix 24
         paginationHeight += 24;
       }
+    } else {
+      paginationHeight = -8;
     }
 
     let footerHeight = 0;
@@ -120,7 +121,6 @@ export function useTableScroll(
       bottomIncludeBody -
       (resizeHeightOffset || 0) -
       paddingHeight -
-      borderHeight -
       paginationHeight -
       footerHeight -
       headerHeight;
diff --git a/src/components/Table/src/style/index.less b/src/components/Table/src/style/index.less
index 0b912093..73da9713 100644
--- a/src/components/Table/src/style/index.less
+++ b/src/components/Table/src/style/index.less
@@ -35,7 +35,7 @@
   }
 
   .ant-table-wrapper {
-    padding: 8px;
+    padding: 6px;
     background: #fff;
     border-radius: 2px;
 
diff --git a/src/layouts/page/index.vue b/src/layouts/page/index.vue
index 096d84da..6ae3c936 100644
--- a/src/layouts/page/index.vue
+++ b/src/layouts/page/index.vue
@@ -1,29 +1,27 @@
 <template>
-  <div>
-    <RouterView>
-      <template #default="{ Component, route }">
-        <transition
-          :name="
-            getTransitionName({
-              route,
-              openCache,
-              enableTransition: getEnableTransition,
-              cacheTabs: getCaches,
-              def: getBasicTransition,
-            })
-          "
-          mode="out-in"
-          appear
-        >
-          <keep-alive v-if="openCache" :include="getCaches">
-            <component :is="Component" :key="route.fullPath" />
-          </keep-alive>
-          <component v-else :is="Component" :key="route.fullPath" />
-        </transition>
-      </template>
-    </RouterView>
-    <FrameLayout v-if="getCanEmbedIFramePage" />
-  </div>
+  <RouterView>
+    <template #default="{ Component, route }">
+      <transition
+        :name="
+          getTransitionName({
+            route,
+            openCache,
+            enableTransition: getEnableTransition,
+            cacheTabs: getCaches,
+            def: getBasicTransition,
+          })
+        "
+        mode="out-in"
+        appear
+      >
+        <keep-alive v-if="openCache" :include="getCaches">
+          <component :is="Component" :key="route.fullPath" />
+        </keep-alive>
+        <component v-else :is="Component" :key="route.fullPath" />
+      </transition>
+    </template>
+  </RouterView>
+  <FrameLayout v-if="getCanEmbedIFramePage" />
 </template>
 
 <script lang="ts">