6/22完善引入,
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
<div class="avatar-container">
|
||||
<el-dropdown class="right-menu-item hover-effect" trigger="click" @command="handleCommand">
|
||||
<div class="avatar-wrapper">
|
||||
<img :src="userStore.avatar" class="user-avatar" />
|
||||
<img alt="头像" :src="userStore.avatar" class="user-avatar" />
|
||||
<el-icon><caret-bottom /></el-icon>
|
||||
</div>
|
||||
<template #dropdown>
|
||||
@@ -60,6 +60,7 @@ import { useNoticeStore } from '@/store/modules/notice';
|
||||
import notice from './notice/index.vue';
|
||||
import router from '@/router';
|
||||
import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
|
||||
import { CaretBottom } from '@element-plus/icons-vue';
|
||||
|
||||
const props = defineProps({
|
||||
Showhamburger: {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="sidebar-logo-container" :class="{ collapse: collapse }">
|
||||
<transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
|
||||
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
|
||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||
<img alt="" v-if="logo" :src="logo" class="sidebar-logo" />
|
||||
<h1 v-else class="sidebar-title">
|
||||
{{ title }}
|
||||
</h1>
|
||||
@@ -114,7 +114,7 @@ const getLogoTextColor = computed(() => {
|
||||
|
||||
&.collapse {
|
||||
.sidebar-logo {
|
||||
margin-right: 0px;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ defineExpose({
|
||||
overflow: hidden;
|
||||
width: 100%;
|
||||
:deep(.el-scrollbar__bar) {
|
||||
bottom: 0px;
|
||||
bottom: 0;
|
||||
}
|
||||
:deep(.el-scrollbar__wrap) {
|
||||
height: 49px;
|
||||
|
||||
@@ -37,6 +37,7 @@ import { useSettingsStore } from '@/store/modules/settings';
|
||||
import { usePermissionStore } from '@/store/modules/permission';
|
||||
import { useTagsViewStore } from '@/store/modules/tagsView';
|
||||
import { RouteRecordRaw, RouteLocationNormalized } from 'vue-router';
|
||||
import { Back, CircleClose, Close, RefreshRight, Right } from '@element-plus/icons-vue';
|
||||
|
||||
const visible = ref(false);
|
||||
const top = ref(0);
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
</el-menu>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import SidebarItem from '../Sidebar/SidebarItem';
|
||||
<script lang="ts" setup>
|
||||
import SidebarItem from '../Sidebar/SidebarItem.vue';
|
||||
import { useAppStore } from '@/store/modules/app';
|
||||
import { useSettingsStore } from '@/store/modules/settings';
|
||||
import { usePermissionStore } from '@/store/modules/permission';
|
||||
@@ -45,7 +45,7 @@ function setVisibleNumber() {
|
||||
if (width >= 1000) {
|
||||
width -= 500;
|
||||
}
|
||||
visibleNumber.value = parseInt(width / 3 / 85);
|
||||
visibleNumber.value = parseInt(String(width / 3 / 85));
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
@@ -95,7 +95,7 @@ onMounted(() => {
|
||||
.topbar-menu .el-sub-menu .el-sub-menu__icon-arrow {
|
||||
position: static;
|
||||
margin-left: 8px;
|
||||
margin-top: 0px;
|
||||
margin-top: 0;
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
import { ref, computed, watchEffect, onMounted, onUnmounted } from 'vue';
|
||||
import { useWindowSize } from '@vueuse/core';
|
||||
import SideBar from './components/Sidebar/index.vue';
|
||||
import { AppMain, Navbar, Settings, TagsView } from './components';
|
||||
import { AppMain, Navbar, Settings } from './components';
|
||||
import { useAppStore } from '@/store/modules/app';
|
||||
import { useSettingsStore } from '@/store/modules/settings';
|
||||
import { NavTypeEnum } from '@/enums/NavTypeEnum';
|
||||
|
||||
Reference in New Issue
Block a user