From 98bb1f00eeca2b459bd8b9fe5a745e65c6081f97 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 19 十月 2022 19:06:14 +0800
Subject: [PATCH] fix 修复 修改用户信息 校验用户名未排除当前用户问题
---
ruoyi-ui/src/layout/components/Settings/index.vue | 511 ++++++++++++++++++++++++++++---------------------------
1 files changed, 260 insertions(+), 251 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue
index eba8139..bb3c9ce 100644
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -1,251 +1,260 @@
-<template>
- <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>
-
- <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>
-
- <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>
-</template>
-
-<script>
-import ThemePicker from '@/components/ThemePicker'
-
-export default {
- components: { ThemePicker },
- data() {
- return {
- sideTheme: this.$store.state.settings.sideTheme
- };
- },
- computed: {
- theme() {
- return this.$store.state.settings.theme
- },
- fixedHeader: {
- get() {
- return this.$store.state.settings.fixedHeader
- },
- set(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'fixedHeader',
- value: val
- })
- }
- },
- topNav: {
- get() {
- return this.$store.state.settings.topNav
- },
- set(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'topNav',
- value: val
- })
- if (!val) {
- this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes);
- }
- }
- },
- tagsView: {
- get() {
- return this.$store.state.settings.tagsView
- },
- set(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'tagsView',
- value: val
- })
- }
- },
- sidebarLogo: {
- get() {
- return this.$store.state.settings.sidebarLogo
- },
- set(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'sidebarLogo',
- value: val
- })
- }
- },
- },
- methods: {
- themeChange(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'theme',
- value: val
- })
- },
- handleTheme(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'sideTheme',
- value: val
- })
- this.sideTheme = val;
- },
- saveSetting() {
- const loading = this.$loading({
- lock: true,
- fullscreen: false,
- text: "姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍚�...",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- localStorage.setItem(
- "layout-setting",
- `{
- "topNav":${this.topNav},
- "tagsView":${this.tagsView},
- "fixedHeader":${this.fixedHeader},
- "sidebarLogo":${this.sidebarLogo},
- "sideTheme":"${this.sideTheme}"
- }`
- );
- setTimeout(loading.close(), 1000)
- },
- resetSetting() {
- this.$loading({
- lock: true,
- fullscreen: false,
- text: "姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍚�...",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- localStorage.removeItem("layout-setting")
- setTimeout("window.location.reload()", 1000)
- }
- }
-}
-</script>
-
-<style lang="scss" scoped>
- .setting-drawer-content {
- .setting-drawer-title {
- margin-bottom: 12px;
- color: rgba(0, 0, 0, .85);
- font-size: 14px;
- line-height: 22px;
- font-weight: bold;
- }
-
- .setting-drawer-block-checbox {
- display: flex;
- justify-content: flex-start;
- align-items: center;
- margin-top: 10px;
- margin-bottom: 20px;
-
- .setting-drawer-block-checbox-item {
- position: relative;
- margin-right: 16px;
- border-radius: 2px;
- cursor: pointer;
-
- img {
- width: 48px;
- height: 48px;
- }
-
- .setting-drawer-block-checbox-selectIcon {
- position: absolute;
- top: 0;
- right: 0;
- width: 100%;
- height: 100%;
- padding-top: 15px;
- padding-left: 24px;
- color: #1890ff;
- font-weight: 700;
- font-size: 14px;
- }
- }
- }
- }
-
- .drawer-container {
- padding: 24px;
- font-size: 14px;
- line-height: 1.5;
- word-wrap: break-word;
-
- .drawer-title {
- margin-bottom: 12px;
- color: rgba(0, 0, 0, .85);
- font-size: 14px;
- line-height: 22px;
- }
-
- .drawer-item {
- color: rgba(0, 0, 0, .65);
- font-size: 14px;
- padding: 12px 0;
- }
-
- .drawer-switch {
- float: right
- }
- }
-</style>
+<template>
+ <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>
+
+ <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>
+import ThemePicker from '@/components/ThemePicker'
+
+export default {
+ components: { ThemePicker },
+ data() {
+ return {
+ theme: this.$store.state.settings.theme,
+ sideTheme: this.$store.state.settings.sideTheme
+ };
+ },
+ computed: {
+ visible: {
+ get() {
+ return this.$store.state.settings.showSettings
+ }
+ },
+ fixedHeader: {
+ get() {
+ return this.$store.state.settings.fixedHeader
+ },
+ set(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'fixedHeader',
+ value: val
+ })
+ }
+ },
+ topNav: {
+ get() {
+ return this.$store.state.settings.topNav
+ },
+ set(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'topNav',
+ value: val
+ })
+ if (!val) {
+ this.$store.dispatch('app/toggleSideBarHide', false);
+ this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes);
+ }
+ }
+ },
+ tagsView: {
+ get() {
+ return this.$store.state.settings.tagsView
+ },
+ set(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'tagsView',
+ value: val
+ })
+ }
+ },
+ sidebarLogo: {
+ get() {
+ return this.$store.state.settings.sidebarLogo
+ },
+ set(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'sidebarLogo',
+ value: val
+ })
+ }
+ },
+ dynamicTitle: {
+ get() {
+ return this.$store.state.settings.dynamicTitle
+ },
+ set(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'dynamicTitle',
+ value: val
+ })
+ }
+ },
+ },
+ methods: {
+ themeChange(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'theme',
+ value: val
+ })
+ this.theme = val;
+ },
+ handleTheme(val) {
+ this.$store.dispatch('settings/changeSetting', {
+ key: 'sideTheme',
+ value: val
+ })
+ this.sideTheme = val;
+ },
+ saveSetting() {
+ this.$modal.loading("姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍊�...");
+ this.$cache.local.set(
+ "layout-setting",
+ `{
+ "topNav":${this.topNav},
+ "tagsView":${this.tagsView},
+ "fixedHeader":${this.fixedHeader},
+ "sidebarLogo":${this.sidebarLogo},
+ "dynamicTitle":${this.dynamicTitle},
+ "sideTheme":"${this.sideTheme}",
+ "theme":"${this.theme}"
+ }`
+ );
+ setTimeout(this.$modal.closeLoading(), 1000)
+ },
+ resetSetting() {
+ this.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...");
+ this.$cache.local.remove("layout-setting")
+ setTimeout("window.location.reload()", 1000)
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+ .setting-drawer-content {
+ .setting-drawer-title {
+ margin-bottom: 12px;
+ color: rgba(0, 0, 0, .85);
+ font-size: 14px;
+ line-height: 22px;
+ font-weight: bold;
+ }
+
+ .setting-drawer-block-checbox {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 10px;
+ margin-bottom: 20px;
+
+ .setting-drawer-block-checbox-item {
+ position: relative;
+ margin-right: 16px;
+ border-radius: 2px;
+ cursor: pointer;
+
+ img {
+ width: 48px;
+ height: 48px;
+ }
+
+ .setting-drawer-block-checbox-selectIcon {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 100%;
+ height: 100%;
+ padding-top: 15px;
+ padding-left: 24px;
+ color: #1890ff;
+ font-weight: 700;
+ font-size: 14px;
+ }
+ }
+ }
+ }
+
+ .drawer-container {
+ padding: 20px;
+ font-size: 14px;
+ line-height: 1.5;
+ word-wrap: break-word;
+
+ .drawer-title {
+ margin-bottom: 12px;
+ color: rgba(0, 0, 0, .85);
+ font-size: 14px;
+ line-height: 22px;
+ }
+
+ .drawer-item {
+ color: rgba(0, 0, 0, .65);
+ font-size: 14px;
+ padding: 12px 0;
+ }
+
+ .drawer-switch {
+ float: right
+ }
+ }
+</style>
--
Gitblit v1.9.3