From bb0aeb39e302ef4d5b7142d508c8759a4a2f593f Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 29 Aug 2021 15:35:06 +0800
Subject: [PATCH] !298 修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题 Merge pull request !298 from wjtc8/N/A
---
ruoyi-ui/src/layout/components/Sidebar/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/ruoyi-ui/src/layout/components/Sidebar/index.vue
index 342dbbe..9fb23fb 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/index.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/index.vue
@@ -1,20 +1,20 @@
<template>
- <div :class="{'has-logo':showLogo}">
+ <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
<logo v-if="showLogo" :collapse="isCollapse" />
- <el-scrollbar wrap-class="scrollbar-wrapper">
+ <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
- :background-color="variables.menuBg"
- :text-color="variables.menuText"
+ :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg"
+ :text-color="settings.sideTheme === 'theme-dark' ? variables.menuText : 'rgba(0,0,0,.65)'"
:unique-opened="true"
:active-text-color="settings.theme"
:collapse-transition="false"
mode="vertical"
>
<sidebar-item
- v-for="route in permission_routes"
- :key="route.path"
+ v-for="(route, index) in sidebarRouters"
+ :key="route.path + index"
:item="route"
:base-path="route.path"
/>
@@ -33,7 +33,7 @@
components: { SidebarItem, Logo },
computed: {
...mapState(["settings"]),
- ...mapGetters(["permission_routes", "sidebar"]),
+ ...mapGetters(["sidebarRouters", "sidebar"]),
activeMenu() {
const route = this.$route;
const { meta, path } = route;
--
Gitblit v1.9.2