From 26502e78a50751357a26667db587a5a7d47b9f84 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Sat, 15 Jul 2023 17:52:15 +0800
Subject: [PATCH] fix: bug#16114

---
 src/components/Layout/FullPage.vue            | 14 +++++++++++++-
 src/views/system/Department/product/index.vue |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/Layout/FullPage.vue b/src/components/Layout/FullPage.vue
index 39ab0c7a..a083aa62 100644
--- a/src/components/Layout/FullPage.vue
+++ b/src/components/Layout/FullPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='full-page-warp' ref='fullPage' :style='{ minHeight: `calc(100vh - ${y + 24}px)`}'>
+  <div ref='fullPage' :style="{ minHeight: MinHeight}" class='full-page-warp' >
     <div class="full-page-warp-content">
       <slot></slot>
     </div>
@@ -9,9 +9,21 @@
 <script setup lang='ts' name='FullPage'>
 import { useElementBounding } from '@vueuse/core'
 
+const props = defineProps({
+  extraHeight: {
+    type: Number,
+    default: 0
+  }
+})
+
 const fullPage = ref(null)
 const { y } = useElementBounding(fullPage)
 
+const MinHeight = computed(() => {
+  const _y = (y.value < 0 ? 0 : y.value) + props.extraHeight
+  return `calc(100vh - ${_y + 24}px)`
+})
+
 </script>
 
 <style scoped lang="less">
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 6d471352..03d7e048 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -6,7 +6,7 @@
             @search="(params:any)=>queryParams = {...params}"
             style='margin-bottom: 0;'
         />
-        <FullPage>
+        <FullPage :extraHeight="24">
             <j-pro-table
                 ref="tableRef"
                 :request="table.requestFun"