From bc8b5f107906c7fd37ddbf3d20c099ee952cbd87 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 21 七月 2022 08:50:48 +0800
Subject: [PATCH] 优化布局设置使用el-drawer抽屉显示
---
ruoyi-ui/src/components/RightPanel/index.vue | 43 ----------
ruoyi-ui/src/layout/components/Settings/index.vue | 139 +++++++++++++++++-----------------
2 files changed, 74 insertions(+), 108 deletions(-)
diff --git a/ruoyi-ui/src/components/RightPanel/index.vue b/ruoyi-ui/src/components/RightPanel/index.vue
index 1534b9b..42b5a6b 100644
--- a/ruoyi-ui/src/components/RightPanel/index.vue
+++ b/ruoyi-ui/src/components/RightPanel/index.vue
@@ -1,5 +1,5 @@
<template>
- <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
+ <div ref="rightPanel" class="rightPanel-container">
<div class="rightPanel-background" />
<div class="rightPanel">
<div class="rightPanel-items">
@@ -10,18 +10,12 @@
</template>
<script>
-import { addClass, removeClass } from '@/utils'
-
export default {
name: 'RightPanel',
props: {
clickNotClose: {
default: false,
type: Boolean
- },
- buttonTop: {
- default: 250,
- type: Number
}
},
computed: {
@@ -35,20 +29,12 @@
value: val
})
}
- },
- theme() {
- return this.$store.state.settings.theme
- },
+ }
},
watch: {
show(value) {
if (value && !this.clickNotClose) {
this.addEventClick()
- }
- if (value) {
- addClass(document.body, 'showRightPanel')
- } else {
- removeClass(document.body, 'showRightPanel')
}
}
},
@@ -65,7 +51,7 @@
window.addEventListener('click', this.closeSidebar)
},
closeSidebar(evt) {
- const parent = evt.target.closest('.rightPanel')
+ const parent = evt.target.closest('.el-drawer__body')
if (!parent) {
this.show = false
window.removeEventListener('click', this.closeSidebar)
@@ -79,14 +65,6 @@
}
}
</script>
-
-<style>
-.showRightPanel {
- overflow: hidden;
- position: relative;
- width: calc(100% - 15px);
-}
-</style>
<style lang="scss" scoped>
.rightPanel-background {
@@ -111,21 +89,6 @@
transform: translate(100%);
background: #fff;
z-index: 40000;
-}
-
-.show {
- transition: all .3s cubic-bezier(.7, .3, .1, 1);
-
- .rightPanel-background {
- z-index: 20000;
- opacity: 1;
- width: 100%;
- height: 100%;
- }
-
- .rightPanel {
- transform: translate(0);
- }
}
.handle-button {
diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue
index 9986e89..6759446 100644
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -1,78 +1,76 @@
<template>
- <div class="drawer-container">
- <div>
- <div class="setting-drawer-content">
- <div class="setting-drawer-title">
- <h3 class="drawer-title">主题风格设置</h3>
+ <el-drawer size="280px" :visible="visible" :with-header="false" :append-to-body="true" :show-close="false">
+ <div class="drawer-container">
+ <div>
+ <div class="setting-drawer-content">
+ <div class="setting-drawer-title">
+ <h3 class="drawer-title">主题风格设置</h3>
+ </div>
+ <div class="setting-drawer-block-checbox">
+ <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
+ <img src="@/assets/images/dark.svg" alt="dark">
+ <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+ <i aria-label="图标: check" class="anticon anticon-check">
+ <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
+ <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
+ </svg>
+ </i>
+ </div>
+ </div>
+ <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
+ <img src="@/assets/images/light.svg" alt="light">
+ <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+ <i aria-label="图标: check" class="anticon anticon-check">
+ <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
+ <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
+ </svg>
+ </i>
+ </div>
+ </div>
+ </div>
+
+ <div class="drawer-item">
+ <span>主题颜色</span>
+ <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
+ </div>
</div>
- <div class="setting-drawer-block-checbox">
- <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
- <img src="@/assets/images/dark.svg" alt="dark">
- <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
- <i aria-label="图标: check" class="anticon anticon-check">
- <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
- focusable="false" class="">
- <path
- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
- </svg>
- </i>
- </div>
- </div>
- <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
- <img src="@/assets/images/light.svg" alt="light">
- <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
- <i aria-label="图标: check" class="anticon anticon-check">
- <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
- focusable="false" class="">
- <path
- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
- </svg>
- </i>
- </div>
- </div>
+
+ <el-divider/>
+
+ <h3 class="drawer-title">系统布局配置</h3>
+
+ <div class="drawer-item">
+ <span>开启 TopNav</span>
+ <el-switch v-model="topNav" class="drawer-switch" />
</div>
<div class="drawer-item">
- <span>主题颜色</span>
- <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
+ <span>开启 Tags-Views</span>
+ <el-switch v-model="tagsView" class="drawer-switch" />
</div>
+
+ <div class="drawer-item">
+ <span>固定 Header</span>
+ <el-switch v-model="fixedHeader" class="drawer-switch" />
+ </div>
+
+ <div class="drawer-item">
+ <span>显示 Logo</span>
+ <el-switch v-model="sidebarLogo" class="drawer-switch" />
+ </div>
+
+ <div class="drawer-item">
+ <span>动态标题</span>
+ <el-switch v-model="dynamicTitle" class="drawer-switch" />
+ </div>
+
+ <el-divider/>
+
+ <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
+ <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
</div>
-
- <el-divider/>
-
- <h3 class="drawer-title">系统布局配置</h3>
-
- <div class="drawer-item">
- <span>开启 TopNav</span>
- <el-switch v-model="topNav" class="drawer-switch" />
- </div>
-
- <div class="drawer-item">
- <span>开启 Tags-Views</span>
- <el-switch v-model="tagsView" class="drawer-switch" />
- </div>
-
- <div class="drawer-item">
- <span>固定 Header</span>
- <el-switch v-model="fixedHeader" class="drawer-switch" />
- </div>
-
- <div class="drawer-item">
- <span>显示 Logo</span>
- <el-switch v-model="sidebarLogo" class="drawer-switch" />
- </div>
-
- <div class="drawer-item">
- <span>动态标题</span>
- <el-switch v-model="dynamicTitle" class="drawer-switch" />
- </div>
-
- <el-divider/>
-
- <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
- <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
</div>
- </div>
+ </el-drawer>
</template>
<script>
@@ -87,6 +85,11 @@
};
},
computed: {
+ visible: {
+ get() {
+ return this.$store.state.settings.showSettings
+ }
+ },
fixedHeader: {
get() {
return this.$store.state.settings.fixedHeader
@@ -232,7 +235,7 @@
}
.drawer-container {
- padding: 24px;
+ padding: 20px;
font-size: 14px;
line-height: 1.5;
word-wrap: break-word;
--
Gitblit v1.9.2