refactor: ♻️ 导航栏组件代码重构优化

This commit is contained in:
ray
2024-10-30 00:32:50 +08:00
parent 9d9b0eb035
commit a2fd2b0e75
10 changed files with 227 additions and 182 deletions

View File

@@ -0,0 +1,11 @@
<template>
<div @click="toggle">
<svg-icon :icon-class="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
</div>
</template>
<script setup lang="ts">
const { isFullscreen, toggle } = useFullscreen();
</script>
<style lang="scss" scoped></style>

View File

@@ -1,15 +1,16 @@
<!-- 汉堡按钮组件展开/收缩菜单 -->
<template>
<div
class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
@click="toggleClick"
>
<svg-icon
class="hamburger"
:class="{ 'is-active': isActive }"
icon-class="collapse"
:class="{ hamburger: true, 'is-active': isActive }"
/>
</div>
</template>
<script setup lang="ts">
defineProps({
isActive: {

View File

@@ -1,254 +0,0 @@
<template>
<div>
<el-dropdown class="flex-center wh-full align-middle">
<div class="wh-full">
<el-badge
v-if="notices.length > 0"
:offset="[-10, 15]"
:value="notices.length"
:max="99"
class="wh-full"
>
<el-icon class="notification-icon h-full">
<Bell />
</el-icon>
</el-badge>
<el-badge v-else class="wh-full">
<el-icon class="notification-icon h-full">
<Bell />
</el-icon>
</el-badge>
</div>
<template #dropdown>
<div class="p-2">
<el-tabs v-model="activeTab">
<el-tab-pane label="通知" name="notice">
<template v-if="notices.length > 0">
<div
v-for="(item, index) in notices"
:key="index"
class="w400px flex-x-between p-1"
>
<div class="flex-center">
<DictLabel
v-model="item.type"
code="notice_type"
size="small"
class="mr-1"
/>
<el-text
type="primary"
size="small"
class="w200px cursor-pointer"
truncated
@click="readNotice(item.id)"
>
{{ item.title }}
</el-text>
</div>
<div>
{{ item.publishTime }}
</div>
</div>
</template>
<template v-else>
<div class="flex-center h150px w350px">
<el-empty :image-size="50" description="暂无通知" />
</div>
</template>
<el-divider />
<div class="flex-x-between">
<el-link type="primary" :underline="false" @click="viewMore">
<span class="text-xs">查看更多</span>
<el-icon class="text-xs">
<ArrowRight />
</el-icon>
</el-link>
<el-link
v-if="notices.length > 0"
type="primary"
:underline="false"
@click="markAllAsRead"
>
<span class="text-xs">全部已读</span>
</el-link>
</div>
</el-tab-pane>
<el-tab-pane label="消息" name="message">
<template v-if="messages.length > 0">
<div
v-for="(item, index) in messages"
:key="index"
class="w400px flex-x-between p-1"
>
<div>
<DictLabel
v-model="item.type"
code="notice_type"
size="small"
/>
<el-link
type="primary"
class="ml-1"
@click="readNotice(item.id)"
>
{{ item.title }}
</el-link>
</div>
<div>
{{ item.publishTime }}
</div>
</div>
</template>
<template v-else>
<div class="flex-center h150px w350px">
<el-empty :image-size="50" description="暂无消息" />
</div>
</template>
<el-divider />
<div class="flex-x-between">
<el-link type="primary" :underline="false" @click="viewMore">
<span class="text-xs">查看更多</span>
<el-icon class="text-xs">
<ArrowRight />
</el-icon>
</el-link>
<el-link
v-if="messages.length > 0"
type="primary"
:underline="false"
@click="markAllAsRead"
>
<span class="text-xs">全部已读</span>
</el-link>
</div>
</el-tab-pane>
<el-tab-pane label="待办" name="task">
<template v-if="tasks.length > 0">
<div
v-for="(item, index) in tasks"
:key="index"
class="w400px flex-x-between p-1"
>
<div>
<DictLabel
v-model="item.type"
code="notice_type"
size="small"
/>
<el-link
type="primary"
class="ml-1"
@click="readNotice(item.id)"
>
{{ item.title }}
</el-link>
</div>
<div>
{{ item.publishTime }}
</div>
</div>
</template>
<template v-else>
<div class="flex-center h150px w350px">
<el-empty :image-size="50" description="暂无待办" />
</div>
</template>
<el-divider />
<div class="flex-x-between">
<el-link type="primary" :underline="false" @click="viewMore">
<span class="text-xs">查看更多</span>
<el-icon class="text-xs">
<ArrowRight />
</el-icon>
</el-link>
<el-link
v-if="tasks.length > 0"
type="primary"
:underline="false"
@click="markAllAsRead"
>
<span class="text-xs">全部已读</span>
</el-link>
</div>
</el-tab-pane>
</el-tabs>
</div>
</template>
</el-dropdown>
<NoticeDetail ref="noticeDetailRef" />
</div>
</template>
<script setup lang="ts">
import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
import WebSocketManager from "@/utils/websocket";
import router from "@/router";
const activeTab = ref("notice");
const notices = ref<NoticePageVO[]>([]);
const messages = ref<any[]>([]);
const tasks = ref<any[]>([]);
const noticeDetailRef = ref();
// 获取未读消息列表并连接 WebSocket
onMounted(() => {
NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then(
(data) => {
notices.value = data.list;
}
);
WebSocketManager.subscribeToTopic("/user/queue/message", (message) => {
console.log("收到消息:", message);
const data = JSON.parse(message);
const id = data.id;
if (!notices.value.some((notice) => notice.id == id)) {
notices.value.unshift({
id,
title: data.title,
type: data.type,
publishTime: data.publishTime,
});
ElNotification({
title: "您收到一条新的通知消息!",
message: data.title,
type: "success",
position: "bottom-right",
});
}
});
});
// 阅读通知公告
function readNotice(id: string) {
noticeDetailRef.value.openNotice(id);
const index = notices.value.findIndex((notice) => notice.id === id);
if (index >= 0) {
notices.value.splice(index, 1); // 从消息列表中移除已读消息
}
}
// 查看更多
function viewMore() {
router.push({ path: "/myNotice" });
}
// 全部已读
function markAllAsRead() {
NoticeAPI.readAll().then(() => {
notices.value = [];
});
}
</script>
<style lang="scss" scoped>
.layout-top .notification-icon,
.layout-mix .notification-icon {
color: #fff;
}
</style>

View File

@@ -1,21 +1,28 @@
<template>
<el-dropdown trigger="click" @command="handleSizeChange">
<div>
<svg-icon icon-class="size" />
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item
v-for="item of sizeOptions"
:key="item.value"
:disabled="appStore.size == item.value"
:command="item.value"
>
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<!-- 布局大小 -->
<el-tooltip
:content="$t('sizeSelect.tooltip')"
effect="dark"
placement="bottom"
>
<el-dropdown trigger="click" @command="handleSizeChange">
<div>
<svg-icon icon-class="size" />
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item
v-for="item of sizeOptions"
:key="item.value"
:disabled="appStore.size == item.value"
:command="item.value"
>
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-tooltip>
</template>
<script setup lang="ts">