From e906b8ad0a8a0bd8112fbd63ae62993dae75ad26 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 14 八月 2023 12:56:31 +0800
Subject: [PATCH] update 优化 全局移除cookie使用 避免安全问题
---
src/layout/components/Navbar.vue | 194 ++++++++++++++++++++++++++----------------------
1 files changed, 105 insertions(+), 89 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 483800d..d001ea8 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,15 +1,90 @@
+<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" />
+
+ <div class="right-menu flex align-center">
+ <template v-if="appStore.device !== 'mobile'">
+ <el-select
+ v-model="companyName"
+ clearable
+ filterable
+ reserve-keyword
+ :placeholder="$t('navbar.selectTenant')"
+ v-if="userId === 1 && tenantEnabled"
+ @change="dynamicTenantEvent"
+ @clear="dynamicClearEvent"
+ >
+ <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+ <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+ </el-select>
+
+ <!-- <header-search id="header-search" class="right-menu-item" /> -->
+ <search-menu ref="searchMenuRef" />
+ <el-tooltip content="鎼滅储" effect="dark" placement="bottom">
+ <div class="right-menu-item hover-effect" @click="openSearchMenu">
+ <svg-icon class-name="search-icon" icon-class="search" />
+ </div>
+ </el-tooltip>
+ <el-tooltip content="Github" effect="dark" placement="bottom">
+ <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
+ </el-tooltip>
+
+ <el-tooltip :content="$t('navbar.document')" effect="dark" placement="bottom">
+ <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+ </el-tooltip>
+
+ <el-tooltip :content="$t('navbar.full')" effect="dark" placement="bottom">
+ <screenfull id="screenfull" class="right-menu-item hover-effect" />
+ </el-tooltip>
+
+ <el-tooltip :content="$t('navbar.language')" effect="dark" placement="bottom">
+ <lang-select id="lang-select" class="right-menu-item hover-effect" />
+ </el-tooltip>
+
+ <el-tooltip :content="$t('navbar.layoutSize')" effect="dark" placement="bottom">
+ <size-select id="size-select" class="right-menu-item hover-effect" />
+ </el-tooltip>
+ </template>
+ <div class="avatar-container">
+ <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+ <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">
+ <el-dropdown-item>{{ $t('navbar.personalCenter') }}</el-dropdown-item>
+ </router-link>
+ <el-dropdown-item command="setLayout">
+ <span>{{ $t('navbar.layoutSetting') }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item divided command="logout">
+ <span>{{ $t('navbar.logout') }}</span>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ </div>
+ </div>
+ </div>
+</template>
+
<script setup lang="ts">
-import useAppStore from '@/store/modules/app'
-import useUserStore from '@/store/modules/user'
-import useSettingsStore from '@/store/modules/settings'
+import SearchMenu from './topBar/search.vue';
+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";
-const appStore = useAppStore()
-const userStore = useUserStore()
-const settingsStore = useSettingsStore()
+const appStore = useAppStore();
+const userStore = useUserStore();
+const settingsStore = useSettingsStore();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -20,6 +95,12 @@
const dynamic = ref(false);
// 绉熸埛寮�鍏�
const tenantEnabled = ref(true);
+// 鎼滅储鑿滃崟
+const searchMenuRef = ref<InstanceType<typeof SearchMenu>>();
+
+const openSearchMenu = () => {
+ searchMenuRef.value?.openSearch();
+}
// 鍔ㄦ�佸垏鎹�
const dynamicTenantEvent = async (tenantId: string) => {
@@ -35,7 +116,7 @@
await dynamicClear();
dynamic.value = false;
proxy?.$tab.closeAllPage();
- proxy?.$router.push('/')
+ proxy?.$router.push('/');
}
/** 绉熸埛鍒楄〃 */
@@ -43,7 +124,7 @@
const { data } = await getTenantList();
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
- tenantList.value = data.voList;
+ tenantList.value = data.voList;
}
}
@@ -52,100 +133,35 @@
})
const toggleSideBar = () => {
- appStore.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 setLayout = () => {
- emits('setLayout');
+ emits('setLayout');
}
// 瀹氫箟Command鏂规硶瀵硅薄 閫氳繃key鐩存帴璋冪敤鏂规硶
const commandMap: {[key: string]: any} = {
- setLayout,
- logout
+ setLayout,
+ logout
};
const handleCommand = (command: string) => {
- // 鍒ゆ柇鏄惁瀛樺湪璇ユ柟娉�
- if (commandMap[command]) {
- commandMap[command]();
- }
+ // 鍒ゆ柇鏄惁瀛樺湪璇ユ柟娉�
+ if (commandMap[command]) {
+ commandMap[command]();
+ }
}
</script>
-
-<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" />
-
- <div class="right-menu flex align-center">
- <template v-if="appStore.device !== 'mobile'">
- <el-select
- v-model="companyName"
- clearable
- filterable
- reserve-keyword
- placeholder="璇烽�夋嫨绉熸埛"
- v-if="userId === 1 && tenantEnabled"
- @change="dynamicTenantEvent"
- @clear="dynamicClearEvent"
- >
- <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
- <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
- </el-select>
-
- <header-search id="header-search" class="right-menu-item" />
-
- <el-tooltip content="婧愮爜鍦板潃" effect="dark" placement="bottom">
- <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
- </el-tooltip>
-
- <el-tooltip content="鏂囨。鍦板潃" effect="dark" placement="bottom">
- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
- </el-tooltip>
-
- <el-tooltip content="鍏ㄥ睆" effect="dark" placement="bottom">
- <screenfull id="screenfull" class="right-menu-item hover-effect" />
- </el-tooltip>
-
- <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">
- <size-select id="size-select" class="right-menu-item hover-effect" />
- </el-tooltip>
- </template>
- <div class="avatar-container">
- <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
- <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">
- <el-dropdown-item>涓汉涓績</el-dropdown-item>
- </router-link>
- <el-dropdown-item command="setLayout">
- <span>甯冨眬璁剧疆</span>
- </el-dropdown-item>
- <el-dropdown-item divided command="logout">
- <span>閫�鍑虹櫥褰�</span>
- </el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- </div>
- </div>
- </div>
-</template>
<style lang="scss" scoped>
@@ -165,7 +181,7 @@
height: 50px;
overflow: hidden;
position: relative;
- background: #fff;
+ //background: #fff;
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container {
--
Gitblit v1.9.3