From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-ui/src/layout/index.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 4e761ea..4d6fe02 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,14 +1,14 @@
<template>
- <div :class="classObj" class="app-wrapper">
- <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
- <sidebar class="sidebar-container" />
+ <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
+ <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+ <sidebar class="sidebar-container"/>
<div :class="{hasTagsView:needTagsView}" class="main-container">
<div :class="{'fixed-header':fixedHeader}">
<navbar />
<tags-view v-if="needTagsView" />
</div>
<app-main />
- <right-panel v-if="showSettings">
+ <right-panel>
<settings />
</right-panel>
</div>
@@ -20,6 +20,7 @@
import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
import ResizeMixin from './mixin/ResizeHandler'
import { mapState } from 'vuex'
+import variables from '@/assets/styles/variables.scss'
export default {
name: 'Layout',
@@ -34,9 +35,10 @@
mixins: [ResizeMixin],
computed: {
...mapState({
+ theme: state => state.settings.theme,
+ sideTheme: state => state.settings.sideTheme,
sidebar: state => state.app.sidebar,
device: state => state.app.device,
- showSettings: state => state.settings.showSettings,
needTagsView: state => state.settings.tagsView,
fixedHeader: state => state.settings.fixedHeader
}),
@@ -47,6 +49,9 @@
withoutAnimation: this.sidebar.withoutAnimation,
mobile: this.device === 'mobile'
}
+ },
+ variables() {
+ return variables;
}
},
methods: {
@@ -88,12 +93,12 @@
top: 0;
right: 0;
z-index: 9;
- width: calc(100% - #{$sideBarWidth});
+ width: calc(100% - #{$base-sidebar-width});
transition: width 0.28s;
}
.hideSidebar .fixed-header {
- width: calc(100% - 54px)
+ width: calc(100% - 54px);
}
.mobile .fixed-header {
--
Gitblit v1.9.2