From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/layout/components/Navbar.vue | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 7818fd4..49018ce 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,18 +1,18 @@
<template>
<div class="navbar">
- <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!settingsStore.topNav" />
- <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
+ <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggle-click="toggleSideBar" />
+ <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
+ <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />
<div class="right-menu flex align-center">
<template v-if="appStore.device !== 'mobile'">
<el-select
+ v-if="userId === 1 && tenantEnabled"
v-model="companyName"
clearable
filterable
reserve-keyword
:placeholder="$t('navbar.selectTenant')"
- v-if="userId === 1 && tenantEnabled"
@change="dynamicTenantEvent"
@clear="dynamicClearEvent"
>
@@ -63,17 +63,17 @@
</el-tooltip>
</template>
<div class="avatar-container">
- <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+ <el-dropdown class="right-menu-item hover-effect" trigger="click" @command="handleCommand">
<div class="avatar-wrapper">
<img :src="userStore.avatar" class="user-avatar" />
<el-icon><caret-bottom /></el-icon>
</div>
<template #dropdown>
<el-dropdown-menu>
- <router-link to="/user/profile" v-if="!dynamic">
+ <router-link v-if="!dynamic" to="/user/profile">
<el-dropdown-item>{{ $t('navbar.personalCenter') }}</el-dropdown-item>
</router-link>
- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
+ <el-dropdown-item v-if="settingsStore.showSettings" command="setLayout">
<span>{{ $t('navbar.layoutSetting') }}</span>
</el-dropdown-item>
<el-dropdown-item divided command="logout">
@@ -92,10 +92,9 @@
import useAppStore from '@/store/modules/app';
import useUserStore from '@/store/modules/user';
import useSettingsStore from '@/store/modules/settings';
-import { getTenantList } from "@/api/login";
-import { dynamicClear, dynamicTenant } from "@/api/system/tenant";
-import { ComponentInternalInstance } from "vue";
-import { TenantVO } from "@/api/types";
+import { getTenantList } from '@/api/login';
+import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
+import { TenantVO } from '@/api/types';
import notice from './notice/index.vue';
import useNoticeStore from '@/store/modules/notice';
@@ -119,7 +118,7 @@
const openSearchMenu = () => {
searchMenuRef.value?.openSearch();
-}
+};
// 鍔ㄦ�佸垏鎹�
const dynamicTenantEvent = async (tenantId: string) => {
@@ -129,14 +128,14 @@
proxy?.$tab.closeAllPage();
proxy?.$router.push('/');
}
-}
+};
const dynamicClearEvent = async () => {
await dynamicClear();
dynamic.value = false;
proxy?.$tab.closeAllPage();
proxy?.$router.push('/');
-}
+};
/** 绉熸埛鍒楄〃 */
const initTenantList = async () => {
@@ -145,56 +144,58 @@
if (tenantEnabled.value) {
tenantList.value = data.voList;
}
-}
+};
defineExpose({
- initTenantList,
-})
+ initTenantList
+});
const toggleSideBar = () => {
appStore.toggleSideBar(false);
-}
+};
const logout = async () => {
- await ElMessageBox.confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- })
- await userStore.logout()
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
-}
+ await ElMessageBox.confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ });
+ await userStore.logout();
+ location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+};
-const emits = defineEmits(['setLayout'])
+const emits = defineEmits(['setLayout']);
const setLayout = () => {
- emits('setLayout');
-}
+ emits('setLayout');
+};
// 瀹氫箟Command鏂规硶瀵硅薄 閫氳繃key鐩存帴璋冪敤鏂规硶
-const commandMap: {[key: string]: any} = {
- setLayout,
- logout
+const commandMap: { [key: string]: any } = {
+ setLayout,
+ logout
};
const handleCommand = (command: string) => {
- // 鍒ゆ柇鏄惁瀛樺湪璇ユ柟娉�
- if (commandMap[command]) {
- commandMap[command]();
- }
-}
-
+ // 鍒ゆ柇鏄惁瀛樺湪璇ユ柟娉�
+ if (commandMap[command]) {
+ commandMap[command]();
+ }
+};
//鐢ㄦ繁搴︾洃鍚� 娑堟伅
-watch(() => noticeStore.state.value.notices, (newVal, oldVal) => {
- newNotice.value = newVal.filter((item: any) => !item.read).length;
-}, { deep: true });
+watch(
+ () => noticeStore.state.value.notices,
+ (newVal) => {
+ newNotice.value = newVal.filter((item: any) => !item.read).length;
+ },
+ { deep: true }
+);
</script>
<style lang="scss" scoped>
-
:deep(.el-select .el-input__wrapper) {
- height:30px;
+ height: 30px;
}
-:deep(.el-badge__content.is-fixed){
- top: 12px;
+:deep(.el-badge__content.is-fixed) {
+ top: 12px;
}
.flex {
--
Gitblit v1.9.3