feat: 全局布局组件升级到3.3.5

This commit is contained in:
TsMask
2024-06-03 11:42:42 +08:00
parent 1db61a5d4e
commit 2e7514d3ca
7 changed files with 26 additions and 38 deletions

View File

@@ -4,7 +4,7 @@ import {
WaterMark,
getMenuData,
clearMenuItem,
MenuDataItem,
type MenuDataItem,
} from 'antdv-pro-layout';
import RightContent from './components/RightContent.vue';
import Tabs from './components/Tabs.vue';
@@ -224,11 +224,9 @@ onUnmounted(() => {
v-model:selectedKeys="layoutState.selectedKeys"
v-model:openKeys="layoutState.openKeys"
:menu-data="menuData"
:breadcrumb="{ routes: breadcrumb } as any"
disable-content-margin
:breadcrumb="{ routes: breadcrumb } as any"
v-bind="proConfig"
:iconfont-url="scriptUrl"
:sider-width="208"
:iconfont-url="scriptUrl"
:locale="(fnLocale as any)"
>
<!--插槽-菜单头-->
@@ -265,7 +263,7 @@ onUnmounted(() => {
<template #headerContentRender></template>
<!--插槽-顶部右侧-->
<template #rightContentRender>
<template #headerContentRightRender>
<RightContent />
</template>
@@ -360,7 +358,7 @@ onUnmounted(() => {
z-index: 16;
margin: 0px;
width: auto;
margin-top: 52px;
margin-top: 32px;
&-fixed {
position: fixed;
bottom: 0;

View File

@@ -65,12 +65,13 @@ function fnChangeLocale(e: any) {
<template>
<a-space :size="12" align="center">
<a-button type="text" @click="fnClickAlarm">
<a-button type="text" style="color: inherit" @click="fnClickAlarm">
<template #icon>
<a-badge
:count="useAlarmStore().activeAlarmTotal"
:overflow-count="99"
status="warning"
style="color: inherit"
>
<BellOutlined />
</a-badge>
@@ -79,7 +80,7 @@ function fnChangeLocale(e: any) {
<a-tooltip placement="bottom" v-if="false">
<template #title>{{ t('loayouts.rightContent.lock') }}</template>
<a-button type="text" @click="fnClickLock">
<a-button type="text" style="color: inherit" @click="fnClickLock">
<template #icon>
<LockOutlined />
</template>
@@ -88,7 +89,7 @@ function fnChangeLocale(e: any) {
<a-tooltip placement="bottom">
<template #title>{{ t('loayouts.rightContent.helpDoc') }}</template>
<a-button type="text" @click="fnClickHelpDoc()">
<a-button type="text" style="color: inherit" @click="fnClickHelpDoc()">
<template #icon>
<QuestionCircleOutlined />
</template>
@@ -97,7 +98,7 @@ function fnChangeLocale(e: any) {
<a-tooltip placement="bottom">
<template #title>{{ t('loayouts.rightContent.fullscreen') }}</template>
<a-button type="text" @click="toggle">
<a-button type="text" style="color: inherit" @click="toggle">
<template #icon>
<FullscreenExitOutlined v-if="isFullscreen" />
<FullscreenOutlined v-else />