Skip to content

Commit c86c555

Browse files
committed
add logo text mode
1 parent c253fdf commit c86c555

4 files changed

Lines changed: 13 additions & 15 deletions

File tree

‎src/layout/components/NavHeader/index.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
<ul class="navbar-left">
4343
<li class="left-item">
4444
<div class="nav-logo">
45-
<!-- TODO 根据 INTERFACE store 的开关动态设置 -->
46-
<Logo v-if="showLogo" :collapse="true" />
45+
<Logo v-if="showLogo" />
4746
</div>
4847
</li>
4948
<li v-if="orgsShow" class="left-item" style="margin-left: 20px">

‎src/layout/components/NavLeft/Logo.vue‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<div :class="{ collapse: collapse }" class="sidebar-logo-container">
2+
<div :class="{ collapse: logoTextMode }" class="sidebar-logo-container">
33
<transition name="sidebarLogoFade">
4-
<a v-if="collapse" key="collapse" class="sidebar-logo-link" @click="handleClick">
4+
<a v-if="logoTextMode" key="collapse" class="sidebar-logo-link" @click="handleClick">
55
<img :src="logoSrc" alt="logo" class="sidebar-logo" />
66
<span :style="logoTitleStyle" class="sidebar-title">{{ logoTitle }}</span>
77
</a>
@@ -17,17 +17,8 @@ import { mapGetters } from 'vuex'
1717
1818
export default {
1919
name: 'SidebarLogo',
20-
props: {
21-
collapse: {
22-
type: Boolean,
23-
default: false
24-
}
25-
},
26-
data() {
27-
return {}
28-
},
2920
computed: {
30-
...mapGetters(['viewRoutes', 'publicSettings']),
21+
...mapGetters(['viewRoutes', 'publicSettings', 'logoTextMode']),
3122
// eslint-disable-next-line vue/return-in-computed-property
3223
logoTextSrc() {
3324
return this.publicSettings['INTERFACE']['logo_index']
@@ -61,7 +52,6 @@ export default {
6152
}
6253
}
6354
},
64-
created() {},
6555
methods: {
6656
handleClick() {
6757
const currentPath = this.$route.path

‎src/store/getters.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const getters = {
2222
currentViewRoute: state => state.permission.currentViewRoute,
2323
viewRoutes: state => state.permission.addRoutes,
2424
publicSettings: state => state.settings.publicSettings,
25+
logoTextMode: state => state.settings.logoTextMode,
2526
currentOrgRoles: state => state.users.roles,
2627
currentOrgPerms: state => state.users.perms,
2728
MFAVerifyAt: state => state.users.MFAVerifyAt,

‎src/store/modules/settings.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ import { changeMenuColor } from '@/utils/theme/color'
55
import request from '@/utils/request'
66
import { scopedLocalStorage as localStorage } from '@/utils/storage'
77

8+
const parseBooleanEnv = value => String(value).trim() === '1'
9+
810
const { showSettings, fixedHeader, sidebarLogo, tagsView } = defaultSettings
11+
const envLogoTextMode = parseBooleanEnv(process.env.VUE_APP_LOGO_TEXT_MODE)
912

1013
const state = {
1114
showSettings: showSettings,
1215
fixedHeader: fixedHeader,
1316
sidebarLogo: sidebarLogo,
1417
tagsView: tagsView,
18+
logoTextMode: envLogoTextMode,
1519
publicSettings: {},
1620
hasValidLicense: false,
1721
authMethods: {},
@@ -34,6 +38,9 @@ const mutations = {
3438
state.hasValidLicense = settings['XPACK_LICENSE_IS_VALID']
3539
}
3640
},
41+
SET_LOGO_TEXT_MODE: (state, value) => {
42+
state.logoTextMode = value
43+
},
3744
SET_SECURITY_WATERMARK_ENABLED: (state, value) => {
3845
state.publicSettings['SECURITY_WATERMARK_ENABLED'] = value
3946
},
@@ -50,6 +57,7 @@ const actions = {
5057
// get user Profile
5158
getPublicSettings({ commit, state }, isOpen) {
5259
return new Promise((resolve, reject) => {
60+
commit('SET_LOGO_TEXT_MODE', envLogoTextMode)
5361
getPublicSettings(isOpen)
5462
.then(response => {
5563
const data = response || {}

0 commit comments

Comments
 (0)