From 03d438a2a98b2b0606da78dcc7415b596ac57551 Mon Sep 17 00:00:00 2001
From: LCJ-MinYa <1049468118@qq.com>
Date: Wed, 8 Jan 2025 17:53:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E5=88=86=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AE=B9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoImport/BaseContainer/index.vue        | 19 +++++++++++--------
 src/router/modules/demo.ts                    |  3 ---
 src/views/template/layout/index.vue           |  2 ++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/AutoImport/BaseContainer/index.vue b/src/components/AutoImport/BaseContainer/index.vue
index e571602..6e19983 100644
--- a/src/components/AutoImport/BaseContainer/index.vue
+++ b/src/components/AutoImport/BaseContainer/index.vue
@@ -1,24 +1,27 @@
 <template>
-    <section class="base-container">
+    <section
+        class="base-container"
+        :style="{ height: hideTabs ? 'calc(100vh - 81px)' : 'calc(100vh - 48px)' }"
+    >
         <slot></slot>
     </section>
 </template>
 
 <script setup>
-// import { computed } from 'vue';
-// import { useGlobal } from '@pureadmin/utils';
-// const { $storage } = useGlobal();
+import { computed } from 'vue';
+import { useGlobal } from '@pureadmin/utils';
+const { $storage } = useGlobal();
 
-// const hideTabs = computed(() => {
-//     return $storage?.configure.hideTabs;
-// });
+const hideTabs = computed(() => {
+    return $storage?.configure.hideTabs;
+});
 </script>
 
 <style lang="scss">
 .base-container {
     overflow: auto;
     display: flex;
-    flex: 1;
+    // flex: 1; 父元素的flex不能设置1，必须设置具体的高度数值，否则内部table不能自身内部滚动
     flex-direction: column;
     height: calc(100vh - 81px);
 }
diff --git a/src/router/modules/demo.ts b/src/router/modules/demo.ts
index 0c83525..d783f8b 100644
--- a/src/router/modules/demo.ts
+++ b/src/router/modules/demo.ts
@@ -1,4 +1,3 @@
-const Layout = () => import('@/layout/index.vue');
 import { route } from '@/utils/tools';
 const titleArr = [
     {
@@ -78,8 +77,6 @@ const demoRoutes = Object.keys(components).map((path) => {
 
 export default {
     path: '/demo',
-    name: 'Demo',
-    component: Layout,
     redirect: '/demo/jsx',
     meta: {
         icon: 'ep:data-analysis',
diff --git a/src/views/template/layout/index.vue b/src/views/template/layout/index.vue
index 9249e6b..fd35d3f 100644
--- a/src/views/template/layout/index.vue
+++ b/src/views/template/layout/index.vue
@@ -1,11 +1,13 @@
 <template>
     <Base-Container>
+        <div class="flex">1</div>
         <pure-table
             class="base-main"
             :data="tableData"
             :columns="columns"
             size="large"
         />
+        <div class="flex">2</div>
     </Base-Container>
 </template>