From 778ebe1f44bc4929f34fad41b5fec13e9270b517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=97=E5=A4=A7?= <ufo025174@gmail.com>
Date: Wed, 24 Jan 2024 09:03:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(PageWrapper):=20=E4=BF=AE=E5=A4=8DheaderSti?=
 =?UTF-8?q?cky=E6=A0=B7=E5=BC=8F=20(#3569)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Page/src/PageWrapper.vue | 21 ++++++++++-----------
 src/views/demo/page/desc/high/index.vue |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/Page/src/PageWrapper.vue b/src/components/Page/src/PageWrapper.vue
index 48ced6fb..0d39b6ec 100644
--- a/src/components/Page/src/PageWrapper.vue
+++ b/src/components/Page/src/PageWrapper.vue
@@ -34,25 +34,24 @@
   </div>
 </template>
 <script lang="ts" setup>
+  import { PageWrapperFixedHeightKey } from '@/enums/pageEnum';
+  import { useContentHeight } from '@/hooks/web/useContentHeight';
+  import { useDesign } from '@/hooks/web/useDesign';
+  import { propTypes } from '@/utils/propTypes';
+  import { PageHeader } from 'ant-design-vue';
+  import { omit } from 'lodash-es';
   import {
     CSSProperties,
     PropType,
-    provide,
     computed,
-    watch,
+    provide,
     ref,
     unref,
     useAttrs,
     useSlots,
+    watch,
   } from 'vue';
   import PageFooter from './PageFooter.vue';
-  import { useDesign } from '@/hooks/web/useDesign';
-  import { propTypes } from '@/utils/propTypes';
-  import { omit } from 'lodash-es';
-  import { PageHeader } from 'ant-design-vue';
-  import { useContentHeight } from '@/hooks/web/useContentHeight';
-  import { useLayoutHeight } from '@/layouts/default/content/useContentViewHeight';
-  import { PageWrapperFixedHeightKey } from '@/enums/pageEnum';
 
   defineOptions({
     name: 'PageWrapper',
@@ -114,7 +113,6 @@
     ];
   });
 
-  const { headerHeightRef } = useLayoutHeight();
   const getHeaderStyle = computed((): CSSProperties => {
     const { headerSticky } = props;
     if (!headerSticky) {
@@ -123,7 +121,8 @@
 
     return {
       position: 'sticky',
-      top: `${unref(headerHeightRef)}px`,
+      top: 0,
+      zIndex: 99,
       ...props.headerStyle,
     };
   });
diff --git a/src/views/demo/page/desc/high/index.vue b/src/views/demo/page/desc/high/index.vue
index 91a0fca2..bdc395cb 100644
--- a/src/views/demo/page/desc/high/index.vue
+++ b/src/views/demo/page/desc/high/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <PageWrapper title="单号：234231029431" contentBackground>
+  <PageWrapper title="单号：234231029431" contentBackground headerSticky>
     <template #extra>
       <a-button> 操作一 </a-button>
       <a-button> 操作二 </a-button>