|
@@ -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,
|
|
|
};
|
|
|
});
|