Skip to content

Commit aee4e4e

Browse files
authored
fix: adjust sidebar collapse popover (#12662)
1 parent 744c755 commit aee4e4e

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

  • frontend/src/layout/components/Sidebar/components

frontend/src/layout/components/Sidebar/components/Collapse.vue

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<template>
22
<div>
33
<el-popover
4-
ref="nodeChangeRef"
5-
v-model:visible="popoverVisible"
64
placement="right-end"
75
:show-arrow="false"
86
:offset="0"
@@ -14,7 +12,7 @@
1412
<template #reference>
1513
<div class="el-dropdown-link" v-if="!menuStore.isCollapse">
1614
<el-badge is-dot :value="taskCount" :show-zero="false" :offset="[5, 5]">
17-
<el-button link @click="openChangeNode" @mouseenter="openChangeNode">
15+
<el-button link>
1816
<SvgIcon class="icon" iconName="p-pcm" />
1917
<span class="ellipsis-text">{{ loadCurrentName() }}</span>
2018
</el-button>
@@ -28,14 +26,18 @@
2826
</template>
2927
<div class="dropdown-menu" v-loading="loading">
3028
<div class="dropdown-item" @click="openTask">
31-
<SvgIcon class="icon" iconName="p-renwuzhongxin1" />
32-
{{ $t('menu.msgCenter') }}
29+
<div class="node">
30+
<SvgIcon class="icon" iconName="p-renwuzhongxin1" />
31+
{{ $t('menu.msgCenter') }}
32+
</div>
3333
<el-tag class="msg-tag" v-if="taskCount !== 0" size="small" round>{{ taskCount }}</el-tag>
3434
</div>
3535
<el-divider v-if="showNodes()" class="divider" />
3636
<div class="dropdown-item" @click="openNodeDashboard" v-if="isMasterPro">
37-
<SvgIcon class="icon" iconName="p-gailan1" />
38-
{{ $t('xpack.node.multiOverview') }}
37+
<div class="node">
38+
<SvgIcon class="icon" iconName="p-gailan1" />
39+
{{ $t('xpack.node.multiOverview') }}
40+
</div>
3941
</div>
4042
<el-divider v-if="isMasterPro" class="divider" />
4143

@@ -89,7 +91,6 @@
8991

9092
<script setup lang="ts">
9193
import { GlobalStore, MenuStore } from '@/store';
92-
import type { PopoverInstance } from 'element-plus';
9394
import { countExecutingTask } from '@/api/modules/log';
9495
import { MsgError, MsgSuccess } from '@/utils/message';
9596
import i18n from '@/lang';
@@ -108,8 +109,6 @@ const menuStore = MenuStore();
108109
const nodes = ref([]);
109110
const nodeOptions = ref([]);
110111
const loading = ref();
111-
const popoverVisible = ref(false);
112-
const nodeChangeRef = ref<PopoverInstance>();
113112
const props = defineProps({
114113
version: String,
115114
});
@@ -128,10 +127,6 @@ bus.on('refreshTask', () => {
128127
checkTask();
129128
});
130129
131-
const openChangeNode = () => {
132-
popoverVisible.value = true;
133-
};
134-
135130
const loadCurrentName = () => {
136131
if (globalStore.currentNode) {
137132
if (globalStore.currentNode === 'local') {

0 commit comments

Comments
 (0)