From e41dd8a0f1d4fd310b4e57094bed2bd85b3a22a6 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Fri, 19 Nov 2021 14:53:16 +0800
Subject: [PATCH] !370 fix 修复关闭 xss 功能导致可重复读 RepeatableFilter 失效 Merge pull request !370 from 疯狂的狮子Li/master
---
ruoyi-ui/src/layout/index.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 4e761ea..718723e 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,7 +93,7 @@
top: 0;
right: 0;
z-index: 9;
- width: calc(100% - #{$sideBarWidth});
+ width: calc(100% - #{$base-sidebar-width});
transition: width 0.28s;
}
--
Gitblit v1.9.2