mirror of
https://gitee.com/bootx/dax-pay-ui.git
synced 2025-09-09 05:29:32 +00:00
fix(table): ensure that the height calculation is correct close #395
This commit is contained in:
@@ -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;
|
||||
|
@@ -35,7 +35,7 @@
|
||||
}
|
||||
|
||||
.ant-table-wrapper {
|
||||
padding: 8px;
|
||||
padding: 6px;
|
||||
background: #fff;
|
||||
border-radius: 2px;
|
||||
|
||||
|
@@ -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">
|
||||
|
Reference in New Issue
Block a user