style: 调整授权到期导致页面滚动条调整和高度调整

This commit is contained in:
xinxin.wu 2024-04-26 14:17:03 +08:00 committed by 刘瑞斌
parent e46d26da57
commit 287cc34535
5 changed files with 20 additions and 8 deletions

View File

@ -147,7 +147,7 @@
// TODO
const cardOverHeight = computed(() => {
const contentPadding = 32; // 16+16
const navbarHeight = 56; //
const navbarHeight = 54; //
const layoutContentPaddingBottom = 16; //
if (isFullScreen.value) {
return 106;

View File

@ -41,7 +41,7 @@
</a-drawer>
<a-layout class="layout-content" :style="paddingStyle">
<a-spin :loading="appStore.loading" :tip="appStore.loadingTip">
<a-scrollbar class="flex h-[calc(100vh-56px)] flex-col gap-[8px] overflow-auto">
<a-scrollbar class="flex h-[calc(100vh-54px)] flex-col gap-[8px] overflow-auto">
<MsBreadCrumb />
<a-layout-content>
<slot name="page">
@ -68,13 +68,14 @@
import Footer from '@/components/pure/footer/index.vue';
import NavBar from '@/components/pure/navbar/index.vue';
import MsBreadCrumb from '@/components/business/ms-breadcrumb/index.vue';
import ExpireAlert from '@/components/business/ms-expire-alert/index.vue';
import MsMenu from '@/components/business/ms-menu/index.vue';
import PageLayout from './page-layout.vue';
import ExpireAlert from '@/views/setting/system/authorizedManagement/components/expireAlert.vue';
import { GetTitleImgUrl } from '@/api/requrls/setting/config';
import usePermission from '@/hooks/usePermission';
import { useAppStore, useUserStore } from '@/store';
import useLicenseStore from '@/store/modules/setting/license';
interface Props {
isPreview?: boolean;
@ -86,7 +87,7 @@
const props = defineProps<Props>();
const innerProps = ref<Props>(props);
const licenseStore = useLicenseStore();
watch(
() => props.logo,
() => {

View File

@ -2,7 +2,13 @@
<router-view v-slot="{ Component, route }">
<transition name="fade" mode="out-in" appear>
<!-- transition内必须有且只有一个根元素不然会导致二级路由的组件无法渲染 -->
<div v-show="true" class="page-content">
<div
v-show="true"
class="page-content"
:class="[
licenseStore.expiredDuring && route.path.includes('/setting/system') ? 'h-[calc(100%-48px)]' : 'h-full',
]"
>
<!-- TODO 实验性组件以后优化 -->
<Suspense v-if="!route.meta.isCache">
<component :is="Component" :key="route.fullPath" />
@ -15,12 +21,16 @@
</router-view>
</template>
<script lang="ts" setup></script>
<script lang="ts" setup>
import useLicenseStore from '@/store/modules/setting/license';
const licenseStore = useLicenseStore();
</script>
<style lang="less" scoped>
.page-content {
@apply h-full overflow-y-auto;
min-height: 500px;
@apply overflow-y-auto;
.ms-scroll-bar();
}
</style>

View File

@ -1,6 +1,7 @@
export default {
bugManagement: {
createBug: 'Create Bug',
copyBug: 'Copy Bug',
syncBug: 'Sync Bug',
ID: 'ID',
project: 'Project',